Fix merge conflicts

Set shards to 12 and workers to 3
Fix pipeline errors
2025-12-23 02:41:39 +00:00 · 2025-04-30 09:11:57 -05:00 · 2025-04-30 09:11:19 -05:00 · 2025-04-30 09:10:50 -05:00 · 2025-04-30 09:10:47 -05:00 · 2025-04-30 09:09:37 -05:00
175 changed files with 43384 additions and 7749 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -164,24 +164,24 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
-        shardTotal: [8]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        shardTotal: [16]
    steps:
      - uses: actions/checkout@v4
-      - name: "Az CLI login"
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
      - name: Use Node.js 18.x
        uses: actions/setup-node@v4
        with:
          node-version: 18.x
      - run: npm ci
      - run: npx playwright install --with-deps
+      - name: "Az CLI login"
+        uses: Azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
      - name: Run test shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}}
-        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --workers=3
      - name: Upload blob report to GitHub Actions Artifacts
        if: ${{ !cancelled() }}
        uses: actions/upload-artifact@v4
--- a/images/dotnet.png
+++ b/images/dotnet.png
--- a/images/golang.svg
+++ b/images/golang.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none">
+    <path fill="#8CC5E7" d="M21.4679537,3.20617761 C22.1814672,4.67953668 20.0131274,4.83706564 20.1243243,5.49498069 C20.3281853,6.68108108 20.1891892,8.44169884 20.0316602,10.1745174 C19.7629344,13.1119691 21.9590734,20.1451737 17.3814672,22.9714286 C16.5196911,23.5088803 14.4718147,23.8054054 12.4517375,23.8517375 C12.4517375,23.8517375 12.442471,23.8517375 12.442471,23.8517375 C12.442471,23.8517375 12.4332046,23.8517375 12.4332046,23.8517375 C10.4131274,23.8054054 8.08725869,23.5088803 7.22548263,22.9714286 C2.65714286,20.1451737 4.85328185,13.1119691 4.59382239,10.1745174 C4.42702703,8.44169884 4.28803089,6.68108108 4.5011583,5.49498069 C4.61235521,4.83706564 2.44401544,4.68880309 3.15752896,3.20617761 C3.76911197,1.93667954 5.27953668,3.05791506 5.65945946,2.65945946 C7.596139,0.648648649 9.94980695,0.111196911 11.8030888,0.0648648649 C11.988417,0.0648648649 12.8223938,0.0648648649 12.8223938,0.0648648649 C14.6664093,0.157528958 17.0200772,0.657915058 18.9660232,2.65945946 C19.3459459,3.05791506 20.8471042,1.93667954 21.4679537,3.20617761 Z M11.4324324,10.9065637 C11.3490347,10.9436293 11.2100386,11.8517375 11.6362934,11.8980695 C11.9235521,11.9258687 12.7111969,12.0185328 12.8965251,11.8980695 C13.2579151,11.6664093 13.2208494,11.1104247 13.0169884,10.9714286 C12.6741313,10.7490347 11.5250965,10.8602317 11.4324324,10.9065637 Z M9.07876448,4.10501931 C8.12432432,3.99382239 6.52123552,4.88339768 6.28030888,6.77374517 C6.02084942,8.73822394 8.33745174,10.6841699 10.56139,8.73822394 C11.7567568,7.69111969 12.1737452,4.46640927 9.07876448,4.10501931 Z M15.5281853,4.10501931 C12.4332046,4.46640927 12.8501931,7.69111969 14.0455598,8.73822394 C16.2694981,10.6841699 18.5861004,8.73822394 18.3266409,6.77374517 C18.0949807,4.88339768 16.4918919,3.99382239 15.5281853,4.10501931 Z"/>
+    <path fill="#B8937F" d="M12.3127413,8.98841699 C12.8965251,8.90501931 14.2957529,9.57220077 14.2030888,10.3598456 C14.0918919,11.2772201 10.5984556,11.3976834 10.4131274,10.3042471 C10.3019305,9.63706564 10.8301158,9.21081081 12.3127413,8.98841699 Z M20.1984556,16.3737452 C19.9111969,16.3644788 19.7258687,15.984556 19.7258687,15.7528958 C19.7258687,15.3359073 19.7814672,14.8447876 20.0872587,14.6316602 C20.7173745,14.196139 21.2177606,16.3830116 20.1984556,16.3737452 Z M4.41776062,16.3737452 C3.3984556,16.3830116 3.8988417,14.196139 4.52895753,14.6316602 C4.83474903,14.8447876 4.89034749,15.3359073 4.89034749,15.7528958 C4.89034749,15.984556 4.70501931,16.3644788 4.41776062,16.3737452 Z M18.2617761,23.0918919 C18.4471042,23.3606178 18.4563707,23.5459459 18.1598456,23.6849421 C17.0293436,24.203861 16.019305,23.5088803 16.3992278,23.3142857 C17.2054054,22.9065637 17.7057915,22.2671815 18.2617761,23.0918919 Z M6.35444015,23.184556 C6.91042471,22.3598456 7.41081081,22.9992278 8.21698842,23.4069498 C8.5969112,23.6015444 7.58687259,24.2965251 6.45637066,23.7776062 C6.15984556,23.63861 6.16911197,23.4532819 6.35444015,23.184556 Z"/>
+    <path fill="#000000" d="M19.7351351,3.42857143 C19.7814672,3.23397683 20.2633205,3.14131274 20.5320463,3.47490347 C20.8563707,3.87335907 20.0594595,4.42007722 20.0223938,4.1976834 C19.9297297,3.5953668 19.6795367,3.62316602 19.7351351,3.42857143 Z M4.88108108,3.42857143 C4.93667954,3.62316602 4.68648649,3.5953668 4.59382239,4.1976834 C4.55675676,4.42007722 3.75984556,3.87335907 4.08416988,3.47490347 C4.34362934,3.14131274 4.82548263,3.23397683 4.88108108,3.42857143 Z M15.7413127,7.94131274 C15.1578953,7.94131274 14.6849421,7.46835949 14.6849421,6.88494208 C14.6849421,6.30152468 15.1578953,5.82857143 15.7413127,5.82857143 C16.3247301,5.82857143 16.7976834,6.30152468 16.7976834,6.88494208 C16.7976834,7.46835949 16.3247301,7.94131274 15.7413127,7.94131274 Z M15.4633205,6.76447876 C15.6475575,6.76447876 15.7969112,6.61512511 15.7969112,6.43088803 C15.7969112,6.24665096 15.6475575,6.0972973 15.4633205,6.0972973 C15.2790834,6.0972973 15.1297297,6.24665096 15.1297297,6.43088803 C15.1297297,6.61512511 15.2790834,6.76447876 15.4633205,6.76447876 Z M11.3583012,9.43320463 C11.4694981,9.00694981 11.8586873,8.86795367 12.1737452,8.85868726 C12.9799228,8.84015444 13.2857143,9.27567568 13.3135135,9.61853282 C13.369112,10.2023166 11.1081081,10.3413127 11.3583012,9.43320463 Z M8.87490347,7.94131274 C8.29148607,7.94131274 7.81853282,7.46835949 7.81853282,6.88494208 C7.81853282,6.30152468 8.29148607,5.82857143 8.87490347,5.82857143 C9.45832088,5.82857143 9.93127413,6.30152468 9.93127413,6.88494208 C9.93127413,7.46835949 9.45832088,7.94131274 8.87490347,7.94131274 Z M9.15289575,6.76447876 C9.33713283,6.76447876 9.48648649,6.61512511 9.48648649,6.43088803 C9.48648649,6.24665096 9.33713283,6.0972973 9.15289575,6.0972973 C8.96865868,6.0972973 8.81930502,6.24665096 8.81930502,6.43088803 C8.81930502,6.61512511 8.96865868,6.76447876 9.15289575,6.76447876 Z"/>
+  </g>
+</svg>
--- a/images/springboot.svg
+++ b/images/springboot.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <g>
+        <path d="M38.9437824,35.879008 C89.5234256,-13.1200214 170.398168,-11.8028432 219.397197,39.0402357 C224.929346,31.6640377 229.671187,23.4975328 233.095851,15.0675923 C249.165425,64.0666217 258.912543,105.162582 255.224444,137.038295 C253.380395,163.90873 242.842969,189.725423 225.456217,210.273403 C180.145286,264.014274 99.53398,270.863601 45.7931091,225.55267 L45.7931091,225.55267 L44.765,224.638 L44.7103323,224.601984 C44.5420247,224.484832 44.376007,224.362668 44.2124952,224.235492 C43.7219599,223.853965 43.2765312,223.438607 42.8762093,222.995252 L42.732,222.831 L41.0512675,221.3377 C39.4121124,219.93271 37.7729573,218.52772 36.3188215,216.93771 L35.7825547,216.332423 C-13.2164747,165.752779 -11.6358609,84.8780374 38.9437824,35.879008 Z M57.9111486,207.375611 C53.169307,203.687512 46.3199803,204.214383 42.6318814,208.956225 C39.3888978,213.125775 39.4048731,218.924805 42.6798072,222.771269 L42.732,222.831 L44.765,224.638 L44.9644841,224.773953 C49.5691585,227.80174 55.7644273,227.175885 59.2982065,222.896387 L59.4917624,222.654878 C63.1798614,217.913037 62.3895545,211.06371 57.9111486,207.375611 Z M231.778672,28.2393744 C218.60689,55.9001168 185.940871,76.9749681 157.753257,83.5608592 C131.146257,89.8833146 107.963921,84.6146018 83.4644059,94.0982849 C27.6160498,115.436572 28.6697923,181.822354 59.2283268,196.838185 L59.2283268,196.838185 L61.0723763,197.891928 C61.0723763,197.891928 83.1456487,193.50309 104.973663,187.707242 L106.843514,187.207079 C115.561826,184.857554 124.138869,182.296538 131.146257,179.714869 C167.500376,166.279651 207.542593,133.08676 220.714375,94.6251562 C213.865049,134.667374 179.35498,173.392413 144.84491,191.042601 C126.404416,200.526284 112.178891,202.633769 81.883792,213.171195 C78.195693,214.488373 75.297901,215.805551 75.297901,215.805551 C75.6675607,215.754564 76.0372203,215.70481 76.4060145,215.65629 L77.1421925,215.560893 L77.1421925,215.560893 L77.8745239,215.468787 C84.5652297,214.639554 90.5771682,214.224938 90.5771682,214.224938 C133.517178,212.117452 200.956702,226.342977 232.305544,184.45671 C264.444692,141.780136 246.531068,72.7599979 231.778672,28.2393744 Z" fill="#6DB33F">
+
+</path>
+        <path d="M57.9111486,207.375611 C62.3895545,211.06371 63.1798614,217.913037 59.4917624,222.654878 C55.8036635,227.39672 48.9543368,227.923591 44.2124952,224.235492 C39.4706537,220.547393 38.9437824,213.698066 42.6318814,208.956225 C46.3199803,204.214383 53.169307,203.687512 57.9111486,207.375611 Z M231.778672,28.2393744 C246.531068,72.7599979 264.444692,141.780136 232.305544,184.45671 C200.956702,226.342977 133.517178,212.117452 90.5771682,214.224938 C90.5771682,214.224938 84.5652297,214.639554 77.8745239,215.468787 L77.1421925,215.560893 C76.5300999,215.63902 75.9140004,215.720572 75.297901,215.805551 C75.297901,215.805551 78.195693,214.488373 81.883792,213.171195 C112.178891,202.633769 126.404416,200.526284 144.84491,191.042601 C179.35498,173.392413 213.865049,134.667374 220.714375,94.6251562 C207.542593,133.08676 167.500376,166.279651 131.146257,179.714869 C106.119871,188.935116 61.0723763,197.891928 61.0723763,197.891928 L59.2283268,196.838185 C28.6697923,181.822354 27.6160498,115.436572 83.4644059,94.0982849 C107.963921,84.6146018 131.146257,89.8833146 157.753257,83.5608592 C185.940871,76.9749681 218.60689,55.9001168 231.778672,28.2393744 Z" fill="#FFFFFF">
+
+</path>
--- a/less/Common/Constants.less
+++ b/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
 *************************************************************************************************/
--- a/less/documentDB.less
+++ b/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;
+    }
  }
 }

--- a/less/quickstart.less
+++ b/less/quickstart.less
--- a/package-lock.json
+++ b/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,
--- a/package.json
+++ b/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",
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,5 +1,4 @@
 import { defineConfig, devices } from "@playwright/test";
-
 /**
 * See https://playwright.dev/docs/test-configuration.
 */
@@ -29,24 +28,60 @@ export default defineConfig({
  projects: [
    {
      name: "chromium",
-      use: { ...devices["Desktop Chrome"] },
+      use: {
+        ...devices["Desktop Chrome"],
+        launchOptions: {
+          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
+        },
+      },
    },
    {
      name: "firefox",
-      use: { ...devices["Desktop Firefox"] },
+      use: {
+        ...devices["Desktop Firefox"],
+        launchOptions: {
+          firefoxUserPrefs: {
+            "security.fileuri.strict_origin_policy": false,
+            "network.http.referer.XOriginPolicy": 0,
+            "network.http.referer.trimmingPolicy": 0,
+            "privacy.file_unique_origin": false,
+            "security.csp.enable": false,
+            "network.cors_preflight.allow_client_cert": true,
+            "dom.security.https_first": false,
+            "network.http.cross-origin-embedder-policy": false,
+            "network.http.cross-origin-opener-policy": false,
+            "browser.tabs.remote.useCrossOriginPolicy": false,
+            "browser.tabs.remote.useCORP": false,
+          },
+          args: ["--disable-web-security"],
+        },
+      },
    },
    {
      name: "webkit",
-      use: { ...devices["Desktop Safari"] },
+      use: {
+        ...devices["Desktop Safari"],
+      },
    },
-    /* Test against branded browsers. */
    {
      name: "Google Chrome",
-      use: { ...devices["Desktop Chrome"], channel: "chrome" }, // or 'chrome-beta'
+      use: {
+        ...devices["Desktop Chrome"],
+        channel: "chrome",
+        launchOptions: {
+          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
+        },
+      },
    },
    {
      name: "Microsoft Edge",
-      use: { ...devices["Desktop Edge"], channel: "msedge" }, // or 'msedge-dev'
+      use: {
+        ...devices["Desktop Edge"],
+        channel: "msedge",
+        launchOptions: {
+          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
+        },
+      },
    },
  ],

--- a/preview/package-lock.json
+++ b/preview/package-lock.json
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -530,6 +530,13 @@ export class ariaLabelForLearnMoreLink {
  public static readonly AzureSynapseLink = "Learn more about Azure Synapse Link.";
 }

+export class GlobalSecondaryIndexLabels {
+  public static readonly NewGlobalSecondaryIndex: string = "New Global Secondary Index";
+}
+export class FeedbackLabels {
+  public static readonly provideFeedback: string = "Provide feedback";
+}
+
 export const QueryCopilotSampleDatabaseId = "CopilotSampleDB";
 export const QueryCopilotSampleContainerId = "SampleContainer";

--- a/src/Common/CosmosClient.ts
+++ b/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 **************
@@ -116,7 +125,11 @@ export const endpoint = () => {
    const location = _global.parent ? _global.parent.location : _global.location;
    return configContext.EMULATOR_ENDPOINT || location.origin;
  }
-  return userContext.endpoint || userContext?.databaseAccount?.properties?.documentEndpoint;
+  return (
+    userContext.selectedRegionalEndpoint ||
+    userContext.endpoint ||
+    userContext?.databaseAccount?.properties?.documentEndpoint
+  );
 };

 export async function getTokenFromAuthService(
@@ -194,6 +207,7 @@ export function client(): Cosmos.CosmosClient {
    userAgentSuffix: "Azure Portal",
    defaultHeaders: _defaultHeaders,
    connectionPolicy: {
+      enableEndpointDiscovery: !userContext.selectedRegionalEndpoint,
      retryOptions: {
        maxRetryAttemptCount: LocalStorageUtility.getEntryNumber(StorageKey.RetryAttempts),
        fixedRetryIntervalInMilliseconds: LocalStorageUtility.getEntryNumber(StorageKey.RetryInterval),
--- a/src/Common/DatabaseAccountUtility.ts
+++ b/src/Common/DatabaseAccountUtility.ts
@@ -1,5 +1,6 @@
 import { TagNames, WorkloadType } from "Common/Constants";
 import { Tags } from "Contracts/DataModels";
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { userContext } from "../UserContext";

 function isVirtualNetworkFilterEnabled() {
@@ -26,3 +27,9 @@ export function getWorkloadType(): WorkloadType {
  }
  return workloadType;
 }
+
+export function isGlobalSecondaryIndexEnabled(): boolean {
+  return (
+    !isFabric() && userContext.apiType === "SQL" && userContext.databaseAccount?.properties?.enableMaterializedViews
+  );
+}
--- a/src/Common/IteratorUtilities.ts
+++ b/src/Common/IteratorUtilities.ts
@@ -1,5 +1,8 @@
 import { QueryOperationOptions } from "@azure/cosmos";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import * as Constants from "../Common/Constants";
 import { QueryResults } from "../Contracts/ViewModels";
+import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";

 interface QueryResponse {
  // [Todo] remove any
@@ -21,7 +24,9 @@ export function nextPage(
  firstItemIndex: number,
  queryOperationOptions?: QueryOperationOptions,
 ): Promise<QueryResults> {
+  TelemetryProcessor.traceStart(Action.ExecuteQuery);
  return documentsIterator.fetchNext(queryOperationOptions).then((response) => {
+    TelemetryProcessor.traceSuccess(Action.ExecuteQuery, { dataExplorerArea: Constants.Areas.Tab });
    const documents = response.resources;
    // eslint-disable-next-line @typescript-eslint/no-explicit-any
    const headers = (response as any).headers || {}; // TODO this is a private key. Remove any
--- a/src/Common/StyleConstants.ts
+++ b/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;
--- a/src/Common/dataAccess/createCollection.ts
+++ b/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,
--- a/src/Common/dataAccess/createMaterializedView.ts
+++ b/src/Common/dataAccess/createMaterializedView.ts
@@ -0,0 +1,74 @@
+import { constructRpOptions } from "Common/dataAccess/createCollection";
+import { handleError } from "Common/ErrorHandlingUtils";
+import { Collection, CreateMaterializedViewsParams as CreateGlobalSecondaryIndexParams } from "Contracts/DataModels";
+import { userContext } from "UserContext";
+import { createUpdateSqlContainer } from "Utils/arm/generatedClients/cosmos/sqlResources";
+import {
+  CreateUpdateOptions,
+  SqlContainerResource,
+  SqlDatabaseCreateUpdateParameters,
+} from "Utils/arm/generatedClients/cosmos/types";
+import { logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";
+
+export const createGlobalSecondaryIndex = async (params: CreateGlobalSecondaryIndexParams): Promise<Collection> => {
+  const clearMessage = logConsoleProgress(
+    `Creating a new global secondary index ${params.materializedViewId} for database ${params.databaseId}`,
+  );
+
+  const options: CreateUpdateOptions = constructRpOptions(params);
+
+  const resource: SqlContainerResource = {
+    id: params.materializedViewId,
+  };
+  if (params.materializedViewDefinition) {
+    resource.materializedViewDefinition = params.materializedViewDefinition;
+  }
+  if (params.analyticalStorageTtl) {
+    resource.analyticalStorageTtl = params.analyticalStorageTtl;
+  }
+  if (params.indexingPolicy) {
+    resource.indexingPolicy = params.indexingPolicy;
+  }
+  if (params.partitionKey) {
+    resource.partitionKey = params.partitionKey;
+  }
+  if (params.uniqueKeyPolicy) {
+    resource.uniqueKeyPolicy = params.uniqueKeyPolicy;
+  }
+  if (params.vectorEmbeddingPolicy) {
+    resource.vectorEmbeddingPolicy = params.vectorEmbeddingPolicy;
+  }
+  if (params.fullTextPolicy) {
+    resource.fullTextPolicy = params.fullTextPolicy;
+  }
+
+  const rpPayload: SqlDatabaseCreateUpdateParameters = {
+    properties: {
+      resource,
+      options,
+    },
+  };
+
+  try {
+    const createResponse = await createUpdateSqlContainer(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
+      userContext.databaseAccount.name,
+      params.databaseId,
+      params.materializedViewId,
+      rpPayload,
+    );
+    logConsoleInfo(`Successfully created global secondary index ${params.materializedViewId}`);
+
+    return createResponse && (createResponse.properties.resource as Collection);
+  } catch (error) {
+    handleError(
+      error,
+      "CreateGlobalSecondaryIndex",
+      `Error while creating global secondary index ${params.materializedViewId}`,
+    );
+    throw error;
+  } finally {
+    clearMessage();
+  }
+};
--- a/src/Common/dataAccess/deleteCollection.ts
+++ b/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();
--- a/src/Common/dataAccess/readCollectionOffer.ts
+++ b/src/Common/dataAccess/readCollectionOffer.ts
@@ -1,3 +1,4 @@
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { Offer, ReadCollectionOfferParams } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -13,6 +14,11 @@ import { readOfferWithSDK } from "./readOfferWithSDK";
 export const readCollectionOffer = async (params: ReadCollectionOfferParams): Promise<Offer> => {
  const clearMessage = logConsoleProgress(`Querying offer for collection ${params.collectionId}`);

+  if (isFabric()) {
+    // Not exposing offers in Fabric
+    return undefined;
+  }
+
  try {
    if (
      userContext.authType === AuthType.AAD &&
--- a/src/Common/dataAccess/readCollections.ts
+++ b/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);
    }
@@ -126,5 +126,12 @@ async function readCollectionsWithARM(databaseId: string): Promise<DataModels.Co
      throw new Error(`Unsupported default experience type: ${apiType}`);
  }

-  return rpResponse?.value?.map((collection) => collection.properties?.resource as DataModels.Collection);
+  // TO DO: Remove when we get RP API Spec with materializedViews
+  /* eslint-disable @typescript-eslint/no-explicit-any */
+  return rpResponse?.value?.map((collection: any) => {
+    const collectionDataModel: DataModels.Collection = collection.properties?.resource as DataModels.Collection;
+    collectionDataModel.materializedViews = collection.properties?.resource?.materializedViews;
+    collectionDataModel.materializedViewDefinition = collection.properties?.resource?.materializedViewDefinition;
+    return collectionDataModel;
+  });
 }
--- a/src/Common/dataAccess/readDatabaseOffer.ts
+++ b/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);
    }
--- a/src/Common/dataAccess/readDatabases.ts
+++ b/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 {
--- a/src/Common/dataAccess/updateCollection.ts
+++ b/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 {
--- a/src/Common/dataAccess/updateOffer.ts
+++ b/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") {
--- a/src/Contracts/DataExplorerMessagesContract.ts
+++ b/src/Contracts/DataExplorerMessagesContract.ts
@@ -18,10 +18,13 @@ export type DataExploreMessageV3 =
  | {
      type: FabricMessageTypes.GetAllResourceTokens;
      id: string;
+    }
+  | {
+      type: FabricMessageTypes.OpenSettings;
+      settingsId: string;
    };
-
-export type GetCosmosTokenMessageOptions = {
+export interface GetCosmosTokenMessageOptions {
  verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";
  resourceType: "" | "dbs" | "colls" | "docs" | "sprocs" | "pkranges";
  resourceId: string;
-};
+}
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -32,6 +32,7 @@ export interface DatabaseAccountExtendedProperties {
  writeLocations?: DatabaseAccountResponseLocation[];
  enableFreeTier?: boolean;
  enableAnalyticalStorage?: boolean;
+  enableMaterializedViews?: boolean;
  isVirtualNetworkFilterEnabled?: boolean;
  ipRules?: IpRule[];
  privateEndpointConnections?: unknown[];
@@ -42,11 +43,6 @@ export interface DatabaseAccountExtendedProperties {
  publicNetworkAccess?: string;
  enablePriorityBasedExecution?: boolean;
  vcoreMongoEndpoint?: string;
-  virtualNetworkRules?: VNetRule[];
-}
-
-export interface VNetRule {
-  id: string;
 }

 export interface DatabaseAccountResponseLocation {
@@ -169,6 +165,8 @@ export interface Collection extends Resource {
  schema?: ISchema;
  requestSchema?: () => void;
  computedProperties?: ComputedProperties;
+  materializedViews?: MaterializedView[];
+  materializedViewDefinition?: MaterializedViewDefinition;
 }

 export interface CollectionsWithPagination {
@@ -228,6 +226,17 @@ export interface ComputedProperty {

 export type ComputedProperties = ComputedProperty[];

+export interface MaterializedView {
+  id: string;
+  _rid: string;
+}
+
+export interface MaterializedViewDefinition {
+  definition: string;
+  sourceCollectionId: string;
+  sourceCollectionRid?: string;
+}
+
 export interface PartitionKey {
  paths: string[];
  kind: "Hash" | "Range" | "MultiHash";
@@ -350,9 +359,7 @@ export interface CreateDatabaseParams {
  offerThroughput?: number;
 }

-export interface CreateCollectionParams {
-  createNewDatabase: boolean;
-  collectionId: string;
+export interface CreateCollectionParamsBase {
  databaseId: string;
  databaseLevelThroughput: boolean;
  offerThroughput?: number;
@@ -366,6 +373,16 @@ export interface CreateCollectionParams {
  fullTextPolicy?: FullTextPolicy;
 }

+export interface CreateCollectionParams extends CreateCollectionParamsBase {
+  createNewDatabase: boolean;
+  collectionId: string;
+}
+
+export interface CreateMaterializedViewsParams extends CreateCollectionParamsBase {
+  materializedViewId: string;
+  materializedViewDefinition: MaterializedViewDefinition;
+}
+
 export interface VectorEmbeddingPolicy {
  vectorEmbeddings: VectorEmbedding[];
 }
--- a/src/Contracts/FabricMessageTypes.ts
+++ b/src/Contracts/FabricMessageTypes.ts
@@ -4,7 +4,9 @@
 export enum FabricMessageTypes {
  GetAuthorizationToken = "GetAuthorizationToken",
  GetAllResourceTokens = "GetAllResourceTokens",
+  GetAccessToken = "GetAccessToken",
  Ready = "Ready",
+  OpenSettings = "OpenSettings",
 }

 export interface AuthorizationToken {
--- a/src/Contracts/FabricMessagesContract.ts
+++ b/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,88 @@ 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 };
+      };
+    }
+  | {
+      type: "refreshResourceTree";
+      message: {
+        id: string;
+        error: string | undefined;
+      };
+    };

-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;
 }
--- a/src/Contracts/ViewModels.ts
+++ b/src/Contracts/ViewModels.ts
@@ -1,4 +1,5 @@
 import {
+  JSONObject,
  QueryMetrics,
  Resource,
  StoredProcedureDefinition,
@@ -143,6 +144,8 @@ export interface Collection extends CollectionBase {
  geospatialConfig: ko.Observable<DataModels.GeospatialConfig>;
  documentIds: ko.ObservableArray<DocumentId>;
  computedProperties: ko.Observable<DataModels.ComputedProperties>;
+  materializedViews: ko.Observable<DataModels.MaterializedView[]>;
+  materializedViewDefinition: ko.Observable<DataModels.MaterializedViewDefinition>;

  cassandraKeys: CassandraTableKeys;
  cassandraSchema: CassandraTableKey[];
@@ -204,6 +207,12 @@ export interface Collection extends CollectionBase {
  onDragOver(source: Collection, event: { originalEvent: DragEvent }): void;
  onDrop(source: Collection, event: { originalEvent: DragEvent }): void;
  uploadFiles(fileList: FileList): Promise<{ data: UploadDetailsRecord[] }>;
+  bulkInsertDocuments(documents: JSONObject[]): Promise<{
+    numSucceeded: number;
+    numFailed: number;
+    numThrottled: number;
+    errors: string[];
+  }>;
 }

 /**
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -1,5 +1,13 @@
+import { GlobalSecondaryIndexLabels } from "Common/Constants";
+import { isGlobalSecondaryIndexEnabled } from "Common/DatabaseAccountUtility";
+import { configContext, Platform } from "ConfigContext";
 import { TreeNodeMenuItem } from "Explorer/Controls/TreeComponent/TreeNodeComponent";
+import {
+  AddGlobalSecondaryIndexPanel,
+  AddGlobalSecondaryIndexPanelProps,
+} from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
 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 +27,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 +48,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 +60,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 +103,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 +152,7 @@ export const createCollectionContextMenuButton = (
    });
  }

-  if (configContext.platform !== Platform.Fabric) {
+  if (!isFabric() || (isFabric() && !userContext.fabricContext?.isReadOnly)) {
    items.push({
      iconSrc: DeleteCollectionIcon,
      onClick: (lastFocusedElement?: React.RefObject<HTMLElement>) => {
@@ -163,6 +170,24 @@ export const createCollectionContextMenuButton = (
    });
  }

+  if (isGlobalSecondaryIndexEnabled() && !selectedCollection.materializedViewDefinition()) {
+    items.push({
+      label: GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+      onClick: () => {
+        const addMaterializedViewPanelProps: AddGlobalSecondaryIndexPanelProps = {
+          explorer: container,
+          sourceContainer: selectedCollection,
+        };
+        useSidePanel
+          .getState()
+          .openSidePanel(
+            GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+            <AddGlobalSecondaryIndexPanel {...addMaterializedViewPanelProps} />,
+          );
+      },
+    });
+  }
+
  return items;
 };

--- a/src/Explorer/Controls/Dialog.tsx
+++ b/src/Explorer/Controls/Dialog.tsx
@@ -214,8 +214,10 @@ export const Dialog: FC = () => {
      {contentHtml}
      {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
      <DialogFooter>
-        <PrimaryButton {...primaryButtonProps} />
-        {secondaryButtonProps && <DefaultButton {...secondaryButtonProps} />}
+        <PrimaryButton {...primaryButtonProps} data-test={`DialogButton:${primaryButtonText}`} />
+        {secondaryButtonProps && (
+          <DefaultButton {...secondaryButtonProps} data-test={`DialogButton:${secondaryButtonText}`} />
+        )}
      </DialogFooter>
    </FluentDialog>
  ) : (
--- a/src/Explorer/Controls/InputDataList/InputDataList.tsx
+++ b/src/Explorer/Controls/InputDataList/InputDataList.tsx
@@ -193,6 +193,7 @@ export const InputDataList: FC<InputDataListProps> = ({
    <>
      <Input
        id="filterInput"
+        data-test={"DocumentsTab/FilterInput"}
        ref={inputRef}
        type="text"
        size="small"
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -12,6 +12,7 @@ import {
  ThroughputBucketsComponentProps,
 } from "Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent";
 import { useDatabases } from "Explorer/useDatabases";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import { isFullTextSearchEnabled, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { isRunningOnPublicCloud } from "Utils/CloudUtils";
 import * as React from "react";
@@ -44,6 +45,10 @@ import {
  ConflictResolutionComponent,
  ConflictResolutionComponentProps,
 } from "./SettingsSubComponents/ConflictResolutionComponent";
+import {
+  GlobalSecondaryIndexComponent,
+  GlobalSecondaryIndexComponentProps,
+} from "./SettingsSubComponents/GlobalSecondaryIndexComponent";
 import { IndexingPolicyComponent, IndexingPolicyComponentProps } from "./SettingsSubComponents/IndexingPolicyComponent";
 import {
  MongoIndexingPolicyComponent,
@@ -162,6 +167,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
  private shouldShowComputedPropertiesEditor: boolean;
  private shouldShowIndexingPolicyEditor: boolean;
  private shouldShowPartitionKeyEditor: boolean;
+  private isGlobalSecondaryIndex: boolean;
  private isVectorSearchEnabled: boolean;
  private isFullTextSearchEnabled: boolean;
  private totalThroughputUsed: number;
@@ -179,6 +185,8 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      this.shouldShowComputedPropertiesEditor = userContext.apiType === "SQL";
      this.shouldShowIndexingPolicyEditor = userContext.apiType !== "Cassandra" && userContext.apiType !== "Mongo";
      this.shouldShowPartitionKeyEditor = userContext.apiType === "SQL" && isRunningOnPublicCloud();
+      this.isGlobalSecondaryIndex =
+        !!this.collection?.materializedViewDefinition() || !!this.collection?.materializedViews();
      this.isVectorSearchEnabled = isVectorSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);
      this.isFullTextSearchEnabled = isFullTextSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);

@@ -1141,6 +1149,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      collection: this.collection,
      database: this.database,
      isFixedContainer: this.isFixedContainer,
+      isGlobalSecondaryIndex: this.isGlobalSecondaryIndex,
      onThroughputChange: this.onThroughputChange,
      throughput: this.state.throughput,
      throughputBaseline: this.state.throughputBaseline,
@@ -1270,6 +1279,12 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      database: useDatabases.getState().findDatabaseWithId(this.collection.databaseId),
      collection: this.collection,
      explorer: this.props.settingsTab.getContainer(),
+      isReadOnly: isFabricNative(),
+    };
+
+    const globalSecondaryIndexComponentProps: GlobalSecondaryIndexComponentProps = {
+      collection: this.collection,
+      explorer: this.props.settingsTab.getContainer(),
    };

    const tabs: SettingsV2TabInfo[] = [];
@@ -1335,6 +1350,13 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      });
    }

+    if (this.isGlobalSecondaryIndex) {
+      tabs.push({
+        tab: SettingsV2TabTypes.GlobalSecondaryIndexTab,
+        content: <GlobalSecondaryIndexComponent {...globalSecondaryIndexComponentProps} />,
+      });
+    }
+
    const pivotProps: IPivotProps = {
      onLinkClick: this.onPivotChange,
      selectedKey: SettingsV2TabTypes[this.state.selectedTab],
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.test.tsx
@@ -0,0 +1,46 @@
+import { shallow } from "enzyme";
+import React from "react";
+import { collection, container } from "../TestUtils";
+import { GlobalSecondaryIndexComponent } from "./GlobalSecondaryIndexComponent";
+import { GlobalSecondaryIndexSourceComponent } from "./GlobalSecondaryIndexSourceComponent";
+import { GlobalSecondaryIndexTargetComponent } from "./GlobalSecondaryIndexTargetComponent";
+
+describe("GlobalSecondaryIndexComponent", () => {
+  let testCollection: typeof collection;
+  let testExplorer: typeof container;
+
+  beforeEach(() => {
+    testCollection = { ...collection };
+  });
+
+  it("renders only the source component when materializedViewDefinition is missing", () => {
+    testCollection.materializedViews([
+      { id: "view1", _rid: "rid1" },
+      { id: "view2", _rid: "rid2" },
+    ]);
+    testCollection.materializedViewDefinition(null);
+    const wrapper = shallow(<GlobalSecondaryIndexComponent collection={testCollection} explorer={testExplorer} />);
+    expect(wrapper.find(GlobalSecondaryIndexSourceComponent).exists()).toBe(true);
+    expect(wrapper.find(GlobalSecondaryIndexTargetComponent).exists()).toBe(false);
+  });
+
+  it("renders only the target component when materializedViews is missing", () => {
+    testCollection.materializedViews(null);
+    testCollection.materializedViewDefinition({
+      definition: "SELECT * FROM c WHERE c.id = 1",
+      sourceCollectionId: "source1",
+      sourceCollectionRid: "rid123",
+    });
+    const wrapper = shallow(<GlobalSecondaryIndexComponent collection={testCollection} explorer={testExplorer} />);
+    expect(wrapper.find(GlobalSecondaryIndexSourceComponent).exists()).toBe(false);
+    expect(wrapper.find(GlobalSecondaryIndexTargetComponent).exists()).toBe(true);
+  });
+
+  it("renders neither component when both are missing", () => {
+    testCollection.materializedViews(null);
+    testCollection.materializedViewDefinition(null);
+    const wrapper = shallow(<GlobalSecondaryIndexComponent collection={testCollection} explorer={testExplorer} />);
+    expect(wrapper.find(GlobalSecondaryIndexSourceComponent).exists()).toBe(false);
+    expect(wrapper.find(GlobalSecondaryIndexTargetComponent).exists()).toBe(false);
+  });
+});
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.tsx
@@ -0,0 +1,41 @@
+import { FontIcon, Link, Stack, Text } from "@fluentui/react";
+import Explorer from "Explorer/Explorer";
+import React from "react";
+import * as ViewModels from "../../../../Contracts/ViewModels";
+import { GlobalSecondaryIndexSourceComponent } from "./GlobalSecondaryIndexSourceComponent";
+import { GlobalSecondaryIndexTargetComponent } from "./GlobalSecondaryIndexTargetComponent";
+
+export interface GlobalSecondaryIndexComponentProps {
+  collection: ViewModels.Collection;
+  explorer: Explorer;
+}
+
+export const GlobalSecondaryIndexComponent: React.FC<GlobalSecondaryIndexComponentProps> = ({
+  collection,
+  explorer,
+}) => {
+  const isTargetContainer = !!collection?.materializedViewDefinition();
+  const isSourceContainer = !!collection?.materializedViews();
+
+  return (
+    <Stack tokens={{ childrenGap: 8 }} styles={{ root: { maxWidth: 600 } }}>
+      <Stack horizontal verticalAlign="center" wrap tokens={{ childrenGap: 8 }}>
+        {isSourceContainer && (
+          <Text styles={{ root: { fontWeight: 600 } }}>This container has the following indexes defined for it.</Text>
+        )}
+        <Text>
+          <Link
+            target="_blank"
+            href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/materialized-views#defining-materialized-views"
+          >
+            Learn more
+            <FontIcon iconName="NavigateExternalInline" style={{ marginLeft: "4px" }} />
+          </Link>{" "}
+          about how to define global secondary indexes and how to use them.
+        </Text>
+      </Stack>
+      {isSourceContainer && <GlobalSecondaryIndexSourceComponent collection={collection} explorer={explorer} />}
+      {isTargetContainer && <GlobalSecondaryIndexTargetComponent collection={collection} />}
+    </Stack>
+  );
+};
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.test.tsx
@@ -0,0 +1,42 @@
+import { PrimaryButton } from "@fluentui/react";
+import { shallow } from "enzyme";
+import React from "react";
+import { collection, container } from "../TestUtils";
+import { GlobalSecondaryIndexSourceComponent } from "./GlobalSecondaryIndexSourceComponent";
+
+describe("GlobalSecondaryIndexSourceComponent", () => {
+  let testCollection: typeof collection;
+  let testExplorer: typeof container;
+
+  beforeEach(() => {
+    testCollection = { ...collection };
+  });
+
+  it("renders without crashing", () => {
+    const wrapper = shallow(
+      <GlobalSecondaryIndexSourceComponent collection={testCollection} explorer={testExplorer} />,
+    );
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  it("renders the PrimaryButton", () => {
+    const wrapper = shallow(
+      <GlobalSecondaryIndexSourceComponent collection={testCollection} explorer={testExplorer} />,
+    );
+    expect(wrapper.find(PrimaryButton).exists()).toBe(true);
+  });
+
+  it("updates when new global secondary indexes are provided", () => {
+    const wrapper = shallow(
+      <GlobalSecondaryIndexSourceComponent collection={testCollection} explorer={testExplorer} />,
+    );
+
+    // Simulating an update by modifying the observable directly
+    testCollection.materializedViews([{ id: "view3", _rid: "rid3" }]);
+
+    wrapper.setProps({ collection: testCollection });
+    wrapper.update();
+
+    expect(wrapper.find(PrimaryButton).exists()).toBe(true);
+  });
+});
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.tsx
@@ -0,0 +1,114 @@
+import { PrimaryButton } from "@fluentui/react";
+import { GlobalSecondaryIndexLabels } from "Common/Constants";
+import { MaterializedView } from "Contracts/DataModels";
+import Explorer from "Explorer/Explorer";
+import { loadMonaco } from "Explorer/LazyMonaco";
+import { AddGlobalSecondaryIndexPanel } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
+import { useDatabases } from "Explorer/useDatabases";
+import { useSidePanel } from "hooks/useSidePanel";
+import * as monaco from "monaco-editor";
+import React, { useEffect, useRef } from "react";
+import * as ViewModels from "../../../../Contracts/ViewModels";
+
+export interface GlobalSecondaryIndexSourceComponentProps {
+  collection: ViewModels.Collection;
+  explorer: Explorer;
+}
+
+export const GlobalSecondaryIndexSourceComponent: React.FC<GlobalSecondaryIndexSourceComponentProps> = ({
+  collection,
+  explorer,
+}) => {
+  const editorContainerRef = useRef<HTMLDivElement>(null);
+  const editorRef = useRef<monaco.editor.IStandaloneCodeEditor>(null);
+
+  const globalSecondaryIndexes: MaterializedView[] = collection?.materializedViews() ?? [];
+
+  // Helper function to fetch the definition and partition key of targetContainer by traversing through all collections and matching id from MaterializedView[] with collection id.
+  const getViewDetails = (viewId: string): { definition: string; partitionKey: string[] } => {
+    let definition = "";
+    let partitionKey: string[] = [];
+
+    useDatabases.getState().databases.find((database) => {
+      const collection = database.collections().find((collection) => collection.id() === viewId);
+      if (collection) {
+        const globalSecondaryIndexDefinition = collection.materializedViewDefinition();
+        globalSecondaryIndexDefinition && (definition = globalSecondaryIndexDefinition.definition);
+        collection.partitionKey?.paths && (partitionKey = collection.partitionKey.paths);
+      }
+    });
+
+    return { definition, partitionKey };
+  };
+
+  //JSON value for the editor using the fetched id and definitions.
+  const jsonValue = JSON.stringify(
+    globalSecondaryIndexes.map((view) => {
+      const { definition, partitionKey } = getViewDetails(view.id);
+      return {
+        name: view.id,
+        partitionKey: partitionKey.join(", "),
+        definition,
+      };
+    }),
+    null,
+    2,
+  );
+
+  // Initialize Monaco editor with the computed JSON value.
+  useEffect(() => {
+    let disposed = false;
+    const initMonaco = async () => {
+      const monacoInstance = await loadMonaco();
+      if (disposed || !editorContainerRef.current) {
+        return;
+      }
+
+      editorRef.current = monacoInstance.editor.create(editorContainerRef.current, {
+        value: jsonValue,
+        language: "json",
+        ariaLabel: "Global Secondary Index JSON",
+        readOnly: true,
+      });
+    };
+
+    initMonaco();
+    return () => {
+      disposed = true;
+      editorRef.current?.dispose();
+    };
+  }, [jsonValue]);
+
+  // Update the editor when the jsonValue changes.
+  useEffect(() => {
+    if (editorRef.current) {
+      editorRef.current.setValue(jsonValue);
+    }
+  }, [jsonValue]);
+
+  return (
+    <div>
+      <div
+        ref={editorContainerRef}
+        style={{
+          height: 250,
+          border: "1px solid #ccc",
+          borderRadius: 4,
+          overflow: "hidden",
+        }}
+      />
+      <PrimaryButton
+        text="Add index"
+        styles={{ root: { width: "fit-content", marginTop: 12 } }}
+        onClick={() =>
+          useSidePanel
+            .getState()
+            .openSidePanel(
+              GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+              <AddGlobalSecondaryIndexPanel explorer={explorer} sourceContainer={collection} />,
+            )
+        }
+      />
+    </div>
+  );
+};
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexTargetComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexTargetComponent.test.tsx
@@ -0,0 +1,32 @@
+import { Text } from "@fluentui/react";
+import { Collection } from "Contracts/ViewModels";
+import { shallow } from "enzyme";
+import React from "react";
+import { collection } from "../TestUtils";
+import { GlobalSecondaryIndexTargetComponent } from "./GlobalSecondaryIndexTargetComponent";
+
+describe("GlobalSecondaryIndexTargetComponent", () => {
+  let testCollection: Collection;
+
+  beforeEach(() => {
+    testCollection = {
+      ...collection,
+      materializedViewDefinition: collection.materializedViewDefinition,
+    };
+  });
+
+  it("renders without crashing", () => {
+    const wrapper = shallow(<GlobalSecondaryIndexTargetComponent collection={testCollection} />);
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  it("displays the source container ID", () => {
+    const wrapper = shallow(<GlobalSecondaryIndexTargetComponent collection={testCollection} />);
+    expect(wrapper.find(Text).at(2).dive().text()).toBe("source1");
+  });
+
+  it("displays the global secondary index definition", () => {
+    const wrapper = shallow(<GlobalSecondaryIndexTargetComponent collection={testCollection} />);
+    expect(wrapper.find(Text).at(4).dive().text()).toBe("SELECT * FROM c WHERE c.id = 1");
+  });
+});
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexTargetComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexTargetComponent.tsx
@@ -0,0 +1,45 @@
+import { Stack, Text } from "@fluentui/react";
+import * as React from "react";
+import * as ViewModels from "../../../../Contracts/ViewModels";
+
+export interface GlobalSecondaryIndexTargetComponentProps {
+  collection: ViewModels.Collection;
+}
+
+export const GlobalSecondaryIndexTargetComponent: React.FC<GlobalSecondaryIndexTargetComponentProps> = ({
+  collection,
+}) => {
+  const globalSecondaryIndexDefinition = collection?.materializedViewDefinition();
+
+  const textHeadingStyle = {
+    root: { fontWeight: "600", fontSize: 16 },
+  };
+
+  const valueBoxStyle = {
+    root: {
+      backgroundColor: "#f3f3f3",
+      padding: "5px 10px",
+      borderRadius: "4px",
+    },
+  };
+
+  return (
+    <Stack tokens={{ childrenGap: 15 }} styles={{ root: { maxWidth: 600 } }}>
+      <Text styles={textHeadingStyle}>Global Secondary Index Settings</Text>
+
+      <Stack tokens={{ childrenGap: 5 }}>
+        <Text styles={{ root: { fontWeight: "600" } }}>Source container</Text>
+        <Stack styles={valueBoxStyle}>
+          <Text>{globalSecondaryIndexDefinition?.sourceCollectionId}</Text>
+        </Stack>
+      </Stack>
+
+      <Stack tokens={{ childrenGap: 5 }}>
+        <Text styles={{ root: { fontWeight: "600" } }}>Global secondary index definition</Text>
+        <Stack styles={valueBoxStyle}>
+          <Text>{globalSecondaryIndexDefinition?.definition}</Text>
+        </Stack>
+      </Stack>
+    </Stack>
+  );
+};
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.test.tsx
@@ -0,0 +1,41 @@
+import { shallow } from "enzyme";
+import {
+  PartitionKeyComponent,
+  PartitionKeyComponentProps,
+} from "Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent";
+import Explorer from "Explorer/Explorer";
+import React from "react";
+
+describe("PartitionKeyComponent", () => {
+  // Create a test setup function to get fresh instances for each test
+  const setupTest = () => {
+    // Create an instance of the mocked Explorer
+    const explorer = new Explorer();
+    // Create minimal mock objects for database and collection
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const mockDatabase = {} as any as import("../../../../Contracts/ViewModels").Database;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const mockCollection = {} as any as import("../../../../Contracts/ViewModels").Collection;
+
+    // Create props with the mocked Explorer instance
+    const props: PartitionKeyComponentProps = {
+      database: mockDatabase,
+      collection: mockCollection,
+      explorer,
+    };
+
+    return { explorer, props };
+  };
+
+  it("renders default component and matches snapshot", () => {
+    const { props } = setupTest();
+    const wrapper = shallow(<PartitionKeyComponent {...props} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("renders read-only component and matches snapshot", () => {
+    const { props } = setupTest();
+    const wrapper = shallow(<PartitionKeyComponent {...props} isReadOnly={true} />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.tsx
@@ -29,16 +29,26 @@ export interface PartitionKeyComponentProps {
  database: ViewModels.Database;
  collection: ViewModels.Collection;
  explorer: Explorer;
+  isReadOnly?: boolean; // true: cannot change partition key
 }

-export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({ database, collection, explorer }) => {
+export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({
+  database,
+  collection,
+  explorer,
+  isReadOnly,
+}) => {
  const { dataTransferJobs } = useDataTransferJobs();
  const [portalDataTransferJob, setPortalDataTransferJob] = React.useState<DataTransferJobGetResults>(null);

  React.useEffect(() => {
+    if (isReadOnly) {
+      return;
+    }
+
    const loadDataTransferJobs = refreshDataTransferOperations;
    loadDataTransferJobs();
-  }, []);
+  }, [isReadOnly]);

  React.useEffect(() => {
    const currentJob = findPortalDataTransferJob();
@@ -151,7 +161,7 @@ export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({ da
  return (
    <Stack tokens={{ childrenGap: 20 }} styles={{ root: { maxWidth: 600 } }}>
      <Stack tokens={{ childrenGap: 10 }}>
-        <Text styles={textHeadingStyle}>Change {partitionKeyName.toLowerCase()}</Text>
+        {!isReadOnly && <Text styles={textHeadingStyle}>Change {partitionKeyName.toLowerCase()}</Text>}
        <Stack horizontal tokens={{ childrenGap: 20 }}>
          <Stack tokens={{ childrenGap: 5 }}>
            <Text styles={textSubHeadingStyle}>Current {partitionKeyName.toLowerCase()}</Text>
@@ -163,56 +173,61 @@ export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({ da
          </Stack>
        </Stack>
      </Stack>
-      <MessageBar messageBarType={MessageBarType.warning}>
-        To safeguard the integrity of the data being copied to the new container, ensure that no updates are made to the
-        source container for the entire duration of the partition key change process.
-        <Link
-          href="https://learn.microsoft.com/azure/cosmos-db/container-copy#how-does-container-copy-work"
-          target="_blank"
-          underline
-        >
-          Learn more
-        </Link>
-      </MessageBar>
-      <Text>
-        To change the partition key, a new destination container must be created or an existing destination container
-        selected. Data will then be copied to the destination container.
-      </Text>
-      {configContext.platform !== Platform.Emulator && (
-        <PrimaryButton
-          styles={{ root: { width: "fit-content" } }}
-          text="Change"
-          onClick={startPartitionkeyChangeWorkflow}
-          disabled={isCurrentJobInProgress(portalDataTransferJob)}
-        />
-      )}
-      {portalDataTransferJob && (
-        <Stack>
-          <Text styles={textHeadingStyle}>{partitionKeyName} change job</Text>
-          <Stack
-            horizontal
-            tokens={{ childrenGap: 20 }}
-            styles={{
-              root: {
-                alignItems: "center",
-              },
-            }}
-          >
-            <ProgressIndicator
-              label={portalDataTransferJob?.properties?.jobName}
-              description={getProgressDescription()}
-              percentComplete={getPercentageComplete()}
-              styles={{
-                root: {
-                  width: "85%",
-                },
-              }}
-            ></ProgressIndicator>
-            {isCurrentJobInProgress(portalDataTransferJob) && (
-              <DefaultButton text="Cancel" onClick={() => cancelRunningDataTransferJob(portalDataTransferJob)} />
-            )}
-          </Stack>
-        </Stack>
+
+      {!isReadOnly && (
+        <>
+          <MessageBar messageBarType={MessageBarType.warning}>
+            To safeguard the integrity of the data being copied to the new container, ensure that no updates are made to
+            the source container for the entire duration of the partition key change process.
+            <Link
+              href="https://learn.microsoft.com/azure/cosmos-db/container-copy#how-does-container-copy-work"
+              target="_blank"
+              underline
+            >
+              Learn more
+            </Link>
+          </MessageBar>
+          <Text>
+            To change the partition key, a new destination container must be created or an existing destination
+            container selected. Data will then be copied to the destination container.
+          </Text>
+          {configContext.platform !== Platform.Emulator && (
+            <PrimaryButton
+              styles={{ root: { width: "fit-content" } }}
+              text="Change"
+              onClick={startPartitionkeyChangeWorkflow}
+              disabled={isCurrentJobInProgress(portalDataTransferJob)}
+            />
+          )}
+          {portalDataTransferJob && (
+            <Stack>
+              <Text styles={textHeadingStyle}>{partitionKeyName} change job</Text>
+              <Stack
+                horizontal
+                tokens={{ childrenGap: 20 }}
+                styles={{
+                  root: {
+                    alignItems: "center",
+                  },
+                }}
+              >
+                <ProgressIndicator
+                  label={portalDataTransferJob?.properties?.jobName}
+                  description={getProgressDescription()}
+                  percentComplete={getPercentageComplete()}
+                  styles={{
+                    root: {
+                      width: "85%",
+                    },
+                  }}
+                ></ProgressIndicator>
+                {isCurrentJobInProgress(portalDataTransferJob) && (
+                  <DefaultButton text="Cancel" onClick={() => cancelRunningDataTransferJob(portalDataTransferJob)} />
+                )}
+              </Stack>
+            </Stack>
+          )}
+        </>
      )}
    </Stack>
  );
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.test.tsx
@@ -9,6 +9,7 @@ describe("ScaleComponent", () => {
    collection: collection,
    database: undefined,
    isFixedContainer: false,
+    isGlobalSecondaryIndex: false,
    onThroughputChange: () => {
      return;
    },
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
@@ -22,6 +22,7 @@ export interface ScaleComponentProps {
  collection: ViewModels.Collection;
  database: ViewModels.Database;
  isFixedContainer: boolean;
+  isGlobalSecondaryIndex: boolean;
  onThroughputChange: (newThroughput: number) => void;
  throughput: number;
  throughputBaseline: number;
@@ -143,6 +144,7 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
      throughputError={this.props.throughputError}
      instantMaximumThroughput={this.offer?.instantMaximumThroughput}
      softAllowedMaximumThroughput={this.offer?.softAllowedMaximumThroughput}
+      isGlobalSecondaryIndex={this.props.isGlobalSecondaryIndex}
    />
  );

--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.test.tsx
@@ -44,6 +44,7 @@ describe("ThroughputInputAutoPilotV3Component", () => {
    },
    instantMaximumThroughput: 5000,
    softAllowedMaximumThroughput: 1000000,
+    isGlobalSecondaryIndex: false,
  };

  it("throughput input visible", () => {
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -80,6 +80,7 @@ export interface ThroughputInputAutoPilotV3Props {
  throughputError?: string;
  instantMaximumThroughput: number;
  softAllowedMaximumThroughput: number;
+  isGlobalSecondaryIndex: boolean;
 }

 interface ThroughputInputAutoPilotV3State {
@@ -375,22 +376,26 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
            toolTipElement={getToolTipContainer(this.props.infoBubbleText)}
          />
        </Label>
-        {this.overrideWithProvisionedThroughputSettings() && (
-          <MessageBar
-            messageBarIconProps={{ iconName: "InfoSolid", className: "messageBarInfoIcon" }}
-            styles={messageBarStyles}
-          >
-            {manualToAutoscaleDisclaimerElement}
-          </MessageBar>
+        {!this.props.isGlobalSecondaryIndex && (
+          <>
+            {this.overrideWithProvisionedThroughputSettings() && (
+              <MessageBar
+                messageBarIconProps={{ iconName: "InfoSolid", className: "messageBarInfoIcon" }}
+                styles={messageBarStyles}
+              >
+                {manualToAutoscaleDisclaimerElement}
+              </MessageBar>
+            )}
+            <ChoiceGroup
+              selectedKey={this.props.isAutoPilotSelected.toString()}
+              options={this.options}
+              onChange={this.onChoiceGroupChange}
+              required={this.props.showAsMandatory}
+              ariaLabelledBy={labelId}
+              styles={getChoiceGroupStyles(this.props.wasAutopilotOriginallySet, this.props.isAutoPilotSelected, true)}
+            />
+          </>
        )}
-        <ChoiceGroup
-          selectedKey={this.props.isAutoPilotSelected.toString()}
-          options={this.options}
-          onChange={this.onChoiceGroupChange}
-          required={this.props.showAsMandatory}
-          ariaLabelledBy={labelId}
-          styles={getChoiceGroupStyles(this.props.wasAutopilotOriginallySet, this.props.isAutoPilotSelected, true)}
-        />
      </Stack>
    );
  };
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/PartitionKeyComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/PartitionKeyComponent.test.tsx.snap
@@ -0,0 +1,196 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PartitionKeyComponent renders default component and matches snapshot 1`] = `
+<Stack
+  styles={
+    {
+      "root": {
+        "maxWidth": 600,
+      },
+    }
+  }
+  tokens={
+    {
+      "childrenGap": 20,
+    }
+  }
+>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 10,
+      }
+    }
+  >
+    <Text
+      styles={
+        {
+          "root": {
+            "fontSize": 16,
+            "fontWeight": 600,
+          },
+        }
+      }
+    >
+      Change 
+      partition key
+    </Text>
+    <Stack
+      horizontal={true}
+      tokens={
+        {
+          "childrenGap": 20,
+        }
+      }
+    >
+      <Stack
+        tokens={
+          {
+            "childrenGap": 5,
+          }
+        }
+      >
+        <Text
+          styles={
+            {
+              "root": {
+                "fontWeight": 600,
+              },
+            }
+          }
+        >
+          Current 
+          partition key
+        </Text>
+        <Text
+          styles={
+            {
+              "root": {
+                "fontWeight": 600,
+              },
+            }
+          }
+        >
+          Partitioning
+        </Text>
+      </Stack>
+      <Stack
+        tokens={
+          {
+            "childrenGap": 5,
+          }
+        }
+      >
+        <Text />
+        <Text>
+          Non-hierarchical
+        </Text>
+      </Stack>
+    </Stack>
+  </Stack>
+  <StyledMessageBar
+    messageBarType={5}
+  >
+    To safeguard the integrity of the data being copied to the new container, ensure that no updates are made to the source container for the entire duration of the partition key change process.
+    <StyledLinkBase
+      href="https://learn.microsoft.com/azure/cosmos-db/container-copy#how-does-container-copy-work"
+      target="_blank"
+      underline={true}
+    >
+      Learn more
+    </StyledLinkBase>
+  </StyledMessageBar>
+  <Text>
+    To change the partition key, a new destination container must be created or an existing destination container selected. Data will then be copied to the destination container.
+  </Text>
+  <CustomizedPrimaryButton
+    onClick={[Function]}
+    styles={
+      {
+        "root": {
+          "width": "fit-content",
+        },
+      }
+    }
+    text="Change"
+  />
+</Stack>
+`;
+
+exports[`PartitionKeyComponent renders read-only component and matches snapshot 1`] = `
+<Stack
+  styles={
+    {
+      "root": {
+        "maxWidth": 600,
+      },
+    }
+  }
+  tokens={
+    {
+      "childrenGap": 20,
+    }
+  }
+>
+  <Stack
+    tokens={
+      {
+        "childrenGap": 10,
+      }
+    }
+  >
+    <Stack
+      horizontal={true}
+      tokens={
+        {
+          "childrenGap": 20,
+        }
+      }
+    >
+      <Stack
+        tokens={
+          {
+            "childrenGap": 5,
+          }
+        }
+      >
+        <Text
+          styles={
+            {
+              "root": {
+                "fontWeight": 600,
+              },
+            }
+          }
+        >
+          Current 
+          partition key
+        </Text>
+        <Text
+          styles={
+            {
+              "root": {
+                "fontWeight": 600,
+              },
+            }
+          }
+        >
+          Partitioning
+        </Text>
+      </Stack>
+      <Stack
+        tokens={
+          {
+            "childrenGap": 5,
+          }
+        }
+      >
+        <Text />
+        <Text>
+          Non-hierarchical
+        </Text>
+      </Stack>
+    </Stack>
+  </Stack>
+</Stack>
+`;
--- a/src/Explorer/Controls/Settings/SettingsUtils.tsx
+++ b/src/Explorer/Controls/Settings/SettingsUtils.tsx
@@ -1,6 +1,7 @@
 import * as Constants from "../../../Common/Constants";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
+import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";
 import { MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";

 const zeroValue = 0;
@@ -57,6 +58,7 @@ export enum SettingsV2TabTypes {
  ComputedPropertiesTab,
  ContainerVectorPolicyTab,
  ThroughputBucketsTab,
+  GlobalSecondaryIndexTab,
 }

 export enum ContainerPolicyTabTypes {
@@ -164,13 +166,15 @@ export const getTabTitle = (tab: SettingsV2TabTypes): string => {
    case SettingsV2TabTypes.IndexingPolicyTab:
      return "Indexing Policy";
    case SettingsV2TabTypes.PartitionKeyTab:
-      return "Partition Keys (preview)";
+      return isFabricNative() ? "Partition Keys" : "Partition Keys (preview)";
    case SettingsV2TabTypes.ComputedPropertiesTab:
      return "Computed Properties";
    case SettingsV2TabTypes.ContainerVectorPolicyTab:
      return "Container Policies";
    case SettingsV2TabTypes.ThroughputBucketsTab:
      return "Throughput Buckets";
+    case SettingsV2TabTypes.GlobalSecondaryIndexTab:
+      return "Global Secondary Index (Preview)";
    default:
      throw new Error(`Unknown tab ${tab}`);
  }
--- a/src/Explorer/Controls/Settings/TestUtils.tsx
+++ b/src/Explorer/Controls/Settings/TestUtils.tsx
@@ -48,6 +48,15 @@ export const collection = {
  ]),
  vectorEmbeddingPolicy: ko.observable<DataModels.VectorEmbeddingPolicy>({} as DataModels.VectorEmbeddingPolicy),
  fullTextPolicy: ko.observable<DataModels.FullTextPolicy>({} as DataModels.FullTextPolicy),
+  materializedViews: ko.observable<DataModels.MaterializedView[]>([
+    { id: "view1", _rid: "rid1" },
+    { id: "view2", _rid: "rid2" },
+  ]),
+  materializedViewDefinition: ko.observable<DataModels.MaterializedViewDefinition>({
+    definition: "SELECT * FROM c WHERE c.id = 1",
+    sourceCollectionId: "source1",
+    sourceCollectionRid: "rid123",
+  }),
  readSettings: () => {
    return;
  },
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -60,6 +60,8 @@ exports[`SettingsComponent renders 1`] = `
              "getDatabase": [Function],
              "id": [Function],
              "indexingPolicy": [Function],
+              "materializedViewDefinition": [Function],
+              "materializedViews": [Function],
              "offer": [Function],
              "partitionKey": {
                "kind": "hash",
@@ -77,6 +79,7 @@ exports[`SettingsComponent renders 1`] = `
          }
          isAutoPilotSelected={false}
          isFixedContainer={false}
+          isGlobalSecondaryIndex={true}
          onAutoPilotSelected={[Function]}
          onMaxAutoPilotThroughputChange={[Function]}
          onScaleDiscardableChange={[Function]}
@@ -139,6 +142,8 @@ exports[`SettingsComponent renders 1`] = `
              "getDatabase": [Function],
              "id": [Function],
              "indexingPolicy": [Function],
+              "materializedViewDefinition": [Function],
+              "materializedViews": [Function],
              "offer": [Function],
              "partitionKey": {
                "kind": "hash",
@@ -258,6 +263,138 @@ exports[`SettingsComponent renders 1`] = `
              "getDatabase": [Function],
              "id": [Function],
              "indexingPolicy": [Function],
+              "materializedViewDefinition": [Function],
+              "materializedViews": [Function],
+              "offer": [Function],
+              "partitionKey": {
+                "kind": "hash",
+                "paths": [],
+                "version": 2,
+              },
+              "partitionKeyProperties": [
+                "partitionKey",
+              ],
+              "readSettings": [Function],
+              "uniqueKeyPolicy": {},
+              "usageSizeInKB": [Function],
+              "vectorEmbeddingPolicy": [Function],
+            }
+          }
+          explorer={
+            Explorer {
+              "_isInitializingNotebooks": false,
+              "isFixedCollectionWithSharedThroughputSupported": [Function],
+              "isTabsContentExpanded": [Function],
+              "onRefreshDatabasesKeyPress": [Function],
+              "onRefreshResourcesClick": [Function],
+              "phoenixClient": PhoenixClient {
+                "armResourceId": undefined,
+                "retryOptions": {
+                  "maxTimeout": 5000,
+                  "minTimeout": 5000,
+                  "retries": 3,
+                },
+              },
+              "provideFeedbackEmail": [Function],
+              "queriesClient": QueriesClient {
+                "container": [Circular],
+              },
+              "refreshNotebookList": [Function],
+              "resourceTree": ResourceTreeAdapter {
+                "container": [Circular],
+                "copyNotebook": [Function],
+                "parameters": [Function],
+              },
+            }
+          }
+          isReadOnly={false}
+        />
+      </PivotItem>
+      <PivotItem
+        headerText="Computed Properties"
+        itemKey="ComputedPropertiesTab"
+        key="ComputedPropertiesTab"
+        style={
+          {
+            "marginTop": 20,
+          }
+        }
+      >
+        <ComputedPropertiesComponent
+          computedPropertiesContent={
+            [
+              {
+                "name": "queryName",
+                "query": "query",
+              },
+            ]
+          }
+          computedPropertiesContentBaseline={
+            [
+              {
+                "name": "queryName",
+                "query": "query",
+              },
+            ]
+          }
+          logComputedPropertiesSuccessMessage={[Function]}
+          onComputedPropertiesContentChange={[Function]}
+          onComputedPropertiesDirtyChange={[Function]}
+          resetShouldDiscardComputedProperties={[Function]}
+          shouldDiscardComputedProperties={false}
+        />
+      </PivotItem>
+      <PivotItem
+        headerText="Global Secondary Index (Preview)"
+        itemKey="GlobalSecondaryIndexTab"
+        key="GlobalSecondaryIndexTab"
+        style={
+          {
+            "marginTop": 20,
+          }
+        }
+      >
+        <GlobalSecondaryIndexComponent
+          collection={
+            {
+              "analyticalStorageTtl": [Function],
+              "changeFeedPolicy": [Function],
+              "computedProperties": [Function],
+              "conflictResolutionPolicy": [Function],
+              "container": Explorer {
+                "_isInitializingNotebooks": false,
+                "isFixedCollectionWithSharedThroughputSupported": [Function],
+                "isTabsContentExpanded": [Function],
+                "onRefreshDatabasesKeyPress": [Function],
+                "onRefreshResourcesClick": [Function],
+                "phoenixClient": PhoenixClient {
+                  "armResourceId": undefined,
+                  "retryOptions": {
+                    "maxTimeout": 5000,
+                    "minTimeout": 5000,
+                    "retries": 3,
+                  },
+                },
+                "provideFeedbackEmail": [Function],
+                "queriesClient": QueriesClient {
+                  "container": [Circular],
+                },
+                "refreshNotebookList": [Function],
+                "resourceTree": ResourceTreeAdapter {
+                  "container": [Circular],
+                  "copyNotebook": [Function],
+                  "parameters": [Function],
+                },
+              },
+              "databaseId": "test",
+              "defaultTtl": [Function],
+              "fullTextPolicy": [Function],
+              "geospatialConfig": [Function],
+              "getDatabase": [Function],
+              "id": [Function],
+              "indexingPolicy": [Function],
+              "materializedViewDefinition": [Function],
+              "materializedViews": [Function],
              "offer": [Function],
              "partitionKey": {
                "kind": "hash",
@@ -302,40 +439,6 @@ exports[`SettingsComponent renders 1`] = `
          }
        />
      </PivotItem>
-      <PivotItem
-        headerText="Computed Properties"
-        itemKey="ComputedPropertiesTab"
-        key="ComputedPropertiesTab"
-        style={
-          {
-            "marginTop": 20,
-          }
-        }
-      >
-        <ComputedPropertiesComponent
-          computedPropertiesContent={
-            [
-              {
-                "name": "queryName",
-                "query": "query",
-              },
-            ]
-          }
-          computedPropertiesContentBaseline={
-            [
-              {
-                "name": "queryName",
-                "query": "query",
-              },
-            ]
-          }
-          logComputedPropertiesSuccessMessage={[Function]}
-          onComputedPropertiesContentChange={[Function]}
-          onComputedPropertiesDirtyChange={[Function]}
-          resetShouldDiscardComputedProperties={[Function]}
-          shouldDiscardComputedProperties={false}
-        />
-      </PivotItem>
    </StyledPivot>
  </div>
 </div>
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -18,6 +18,7 @@ export interface ThroughputInputProps {
  isFreeTier: boolean;
  showFreeTierExceedThroughputTooltip: boolean;
  isQuickstart?: boolean;
+  isGlobalSecondaryIndex?: boolean;
  setThroughputValue: (throughput: number) => void;
  setIsAutoscale: (isAutoscale: boolean) => void;
  setIsThroughputCapExceeded: (isThroughputCapExceeded: boolean) => void;
@@ -30,17 +31,26 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  isFreeTier,
  showFreeTierExceedThroughputTooltip,
  isQuickstart,
+  isGlobalSecondaryIndex,
  setThroughputValue,
  setIsAutoscale,
  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);
@@ -185,41 +195,41 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
        </Text>
        <InfoTooltip>{PricingUtils.getRuToolTipText()}</InfoTooltip>
      </Stack>
+      {!isGlobalSecondaryIndex && (
+        <Stack horizontal verticalAlign="center">
+          <div role="radiogroup">
+            <input
+              id="Autoscale-input"
+              className="throughputInputRadioBtn"
+              aria-label={`${getThroughputLabelText()} Autoscale`}
+              aria-required={true}
+              checked={isAutoscaleSelected}
+              type="radio"
+              role="radio"
+              tabIndex={0}
+              onChange={(e) => handleOnChangeMode(e, "Autoscale")}
+            />
+            <label htmlFor="Autoscale-input" className="throughputInputRadioBtnLabel">
+              Autoscale
+            </label>

-      <Stack horizontal verticalAlign="center">
-        <div role="radiogroup">
-          <input
-            id="Autoscale-input"
-            className="throughputInputRadioBtn"
-            aria-label={`${getThroughputLabelText()} Autoscale`}
-            aria-required={true}
-            checked={isAutoscaleSelected}
-            type="radio"
-            role="radio"
-            tabIndex={0}
-            onChange={(e) => handleOnChangeMode(e, "Autoscale")}
-          />
-          <label htmlFor="Autoscale-input" className="throughputInputRadioBtnLabel">
-            Autoscale
-          </label>
-
-          <input
-            id="Manual-input"
-            className="throughputInputRadioBtn"
-            aria-label={`${getThroughputLabelText()} Manual`}
-            checked={!isAutoscaleSelected}
-            type="radio"
-            aria-required={true}
-            role="radio"
-            tabIndex={0}
-            onChange={(e) => handleOnChangeMode(e, "Manual")}
-          />
-          <label className="throughputInputRadioBtnLabel" htmlFor="Manual-input">
-            Manual
-          </label>
-        </div>
-      </Stack>
-
+            <input
+              id="Manual-input"
+              className="throughputInputRadioBtn"
+              aria-label={`${getThroughputLabelText()} Manual`}
+              checked={!isAutoscaleSelected}
+              type="radio"
+              aria-required={true}
+              role="radio"
+              tabIndex={0}
+              onChange={(e) => handleOnChangeMode(e, "Manual")}
+            />
+            <label className="throughputInputRadioBtnLabel" htmlFor="Manual-input">
+              Manual
+            </label>
+          </div>
+        </Stack>
+      )}
      {isAutoscaleSelected && (
        <Stack className="throughputInputSpacing">
          <Text variant="small" aria-label="capacity calculator of azure cosmos db">
--- a/src/Explorer/DataSamples/DataSamplesUtil.ts
+++ b/src/Explorer/DataSamples/DataSamplesUtil.ts
@@ -6,6 +6,7 @@ import Explorer from "../Explorer";
 import { useDatabases } from "../useDatabases";
 import { ContainerSampleGenerator } from "./ContainerSampleGenerator";

+// TODO: this does not seem to be used. Remove?
 export class DataSamplesUtil {
  private static readonly DialogTitle = "Create Sample Container";
  constructor(private container: Explorer) {}
--- a/src/Explorer/Explorer.tsx
+++ b/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";
@@ -55,7 +55,7 @@ import type NotebookManager from "./Notebook/NotebookManager";
 import { NotebookPaneContent } from "./Notebook/NotebookManager";
 import { NotebookUtil } from "./Notebook/NotebookUtil";
 import { useNotebook } from "./Notebook/useNotebook";
-import { AddCollectionPanel } from "./Panes/AddCollectionPanel";
+import { AddCollectionPanel } from "./Panes/AddCollectionPanel/AddCollectionPanel";
 import { CassandraAddCollectionPane } from "./Panes/CassandraAddCollectionPane/CassandraAddCollectionPane";
 import { ExecuteSprocParamsPane } from "./Panes/ExecuteSprocParamsPane/ExecuteSprocParamsPane";
 import { StringInputPane } from "./Panes/StringInputPane/StringInputPane";
@@ -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) {
--- a/src/Explorer/Graph/NewVertexComponent/NewVertexComponent.less
+++ b/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;
  }
--- a/src/Explorer/Graph/NewVertexComponent/NewVertexComponent.tsx
+++ b/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}`}
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
+++ b/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);
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts
+++ b/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({
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/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"
  ) {
--- a/src/Explorer/Menus/NotificationConsole/NotificationConsole.less
+++ b/src/Explorer/Menus/NotificationConsole/NotificationConsole.less
@@ -36,6 +36,10 @@
        &:active {
                background-color:@NotificationHigh;
        }
+        
+        &:focus {
+            .focusedBorder();
+        }

        .statusBar {
            .dataTypeIcons {
--- a/src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
+++ b/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);
  };

--- a/src/Explorer/Menus/NotificationConsole/snapshots/NotificationConsoleComponent.test.tsx.snap
+++ b/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>
--- a/src/Explorer/Notebook/NotebookContainerClient.ts
+++ b/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) {
--- a/src/Explorer/OpenActions/OpenActions.tsx
+++ b/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
--- a/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.test.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.test.tsx
@@ -1,6 +1,6 @@
 import { shallow } from "enzyme";
 import React from "react";
-import Explorer from "../Explorer";
+import Explorer from "../../Explorer";
 import { AddCollectionPanel } from "./AddCollectionPanel";

 const props = {
--- a/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx
@@ -21,13 +21,28 @@ import { getNewDatabaseSharedThroughputDefault } from "Common/DatabaseUtility";
 import { getErrorMessage, getErrorStack } from "Common/ErrorHandlingUtils";
 import { configContext, Platform } from "ConfigContext";
 import * as DataModels from "Contracts/DataModels";
-import {
-  FullTextPoliciesComponent,
-  getFullTextLanguageOptions,
-} from "Explorer/Controls/FullTextSeach/FullTextPoliciesComponent";
+import { FullTextPoliciesComponent } from "Explorer/Controls/FullTextSeach/FullTextPoliciesComponent";
 import { VectorEmbeddingPoliciesComponent } from "Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent";
+import {
+  AllPropertiesIndexed,
+  AnalyticalStorageContent,
+  ContainerVectorPolicyTooltipContent,
+  FullTextPolicyDefault,
+  getPartitionKey,
+  getPartitionKeyName,
+  getPartitionKeyPlaceHolder,
+  getPartitionKeyTooltipText,
+  isFreeTierAccount,
+  isSynapseLinkEnabled,
+  parseUniqueKeys,
+  scrollToSection,
+  SharedDatabaseDefault,
+  shouldShowAnalyticalStoreOptions,
+  UniqueKeysHeader,
+} from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 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";
@@ -41,15 +56,15 @@ import {
  isVectorSearchEnabled,
 } from "Utils/CapabilityUtils";
 import { getUpsellMessage } from "Utils/PricingUtils";
-import { CollapsibleSectionComponent } from "../Controls/CollapsiblePanel/CollapsibleSectionComponent";
-import { ThroughputInput } from "../Controls/ThroughputInput/ThroughputInput";
-import "../Controls/ThroughputInput/ThroughputInput.less";
-import { ContainerSampleGenerator } from "../DataSamples/ContainerSampleGenerator";
-import Explorer from "../Explorer";
-import { useDatabases } from "../useDatabases";
-import { PanelFooterComponent } from "./PanelFooterComponent";
-import { PanelInfoErrorComponent } from "./PanelInfoErrorComponent";
-import { PanelLoadingScreen } from "./PanelLoadingScreen";
+import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
+import { CollapsibleSectionComponent } from "../../Controls/CollapsiblePanel/CollapsibleSectionComponent";
+import { ThroughputInput } from "../../Controls/ThroughputInput/ThroughputInput";
+import { ContainerSampleGenerator } from "../../DataSamples/ContainerSampleGenerator";
+import Explorer from "../../Explorer";
+import { useDatabases } from "../../useDatabases";
+import { PanelFooterComponent } from "../PanelFooterComponent";
+import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
+import { PanelLoadingScreen } from "../PanelLoadingScreen";

 export interface AddCollectionPanelProps {
  explorer: Explorer;
@@ -57,40 +72,6 @@ export interface AddCollectionPanelProps {
  isQuickstart?: boolean;
 }

-const SharedDatabaseDefault: DataModels.IndexingPolicy = {
-  indexingMode: "consistent",
-  automatic: true,
-  includedPaths: [],
-  excludedPaths: [
-    {
-      path: "/*",
-    },
-  ],
-};
-
-export const AllPropertiesIndexed: DataModels.IndexingPolicy = {
-  indexingMode: "consistent",
-  automatic: true,
-  includedPaths: [
-    {
-      path: "/*",
-      indexes: [
-        {
-          kind: "Range",
-          dataType: "Number",
-          precision: -1,
-        },
-        {
-          kind: "Range",
-          dataType: "String",
-          precision: -1,
-        },
-      ],
-    },
-  ],
-  excludedPaths: [],
-};
-
 export const DefaultVectorEmbeddingPolicy: DataModels.VectorEmbeddingPolicy = {
  vectorEmbeddings: [],
 };
@@ -143,7 +124,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      collectionId: props.isQuickstart ? `Sample${getCollectionName()}` : "",
      enableIndexing: true,
      isSharded: userContext.apiType !== "Tables",
-      partitionKey: this.getPartitionKey(),
+      partitionKey: getPartitionKey(props.isQuickstart),
      subPartitionKeys: [],
      enableDedicatedThroughput: false,
      createMongoWildCardIndex:
@@ -159,7 +140,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      vectorEmbeddingPolicy: [],
      vectorIndexingPolicy: [],
      vectorPolicyValidated: true,
-      fullTextPolicy: { defaultLanguage: getFullTextLanguageOptions()[0].key as never, fullTextPaths: [] },
+      fullTextPolicy: FullTextPolicyDefault,
      fullTextIndexes: [],
      fullTextPolicyValidated: true,
    };
@@ -173,7 +154,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,

  componentDidUpdate(_prevProps: AddCollectionPanelProps, prevState: AddCollectionPanelState): void {
    if (this.state.errorMessage && this.state.errorMessage !== prevState.errorMessage) {
-      this.scrollToSection("panelContainer");
+      scrollToSection("panelContainer");
    }
  }

@@ -190,7 +171,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
          />
        )}

-        {!this.state.errorMessage && this.isFreeTierAccount() && (
+        {!this.state.errorMessage && isFreeTierAccount() && (
          <PanelInfoErrorComponent
            message={getUpsellMessage(userContext.portalEnv, true, isFirstResourceCreated, true)}
            messageType="info"
@@ -284,150 +265,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={ValidCosmosDbIdInputPattern.source}
+                    title={ValidCosmosDbIdDescription}
+                    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={isFreeTierAccount() && !isFirstResourceCreated}
+                      isDatabase={true}
+                      isSharded={this.state.isSharded}
+                      isFreeTier={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>
@@ -456,8 +439,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              aria-required
              required
              autoComplete="off"
-              pattern="[^/?#\\]*[^/?# \\]"
-              title="May not end with space nor contain characters '\' '/' '#' '?'"
+              pattern={ValidCosmosDbIdInputPattern.source}
+              title={ValidCosmosDbIdDescription}
              placeholder={`e.g., ${getCollectionName()}1`}
              size={40}
              className="panelTextField"
@@ -576,17 +559,14 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              <Stack horizontal>
                <span className="mandatoryStar">*&nbsp;</span>
                <Text className="panelTextBold" variant="small">
-                  {this.getPartitionKeyName()}
+                  {getPartitionKeyName()}
                </Text>
-                <TooltipHost
-                  directionalHint={DirectionalHint.bottomLeftEdge}
-                  content={this.getPartitionKeyTooltipText()}
-                >
+                <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={getPartitionKeyTooltipText()}>
                  <Icon
                    iconName="Info"
                    className="panelInfoIcon"
                    tabIndex={0}
-                    ariaLabel={this.getPartitionKeyTooltipText()}
+                    ariaLabel={getPartitionKeyTooltipText()}
                  />
                </TooltipHost>
              </Stack>
@@ -600,8 +580,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                required
                size={40}
                className="panelTextField"
-                placeholder={this.getPartitionKeyPlaceHolder()}
-                aria-label={this.getPartitionKeyName()}
+                placeholder={getPartitionKeyPlaceHolder()}
+                aria-label={getPartitionKeyName()}
                pattern={userContext.apiType === "Gremlin" ? "^/[^/]*" : ".*"}
                title={userContext.apiType === "Gremlin" ? "May not use composite partition key" : ""}
                value={this.state.partitionKey}
@@ -639,8 +619,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                        tabIndex={index > 0 ? 1 : 0}
                        className="panelTextField"
                        autoComplete="off"
-                        placeholder={this.getPartitionKeyPlaceHolder(index)}
-                        aria-label={this.getPartitionKeyName()}
+                        placeholder={getPartitionKeyPlaceHolder(index)}
+                        aria-label={getPartitionKeyName()}
                        pattern={".*"}
                        title={""}
                        value={subPartitionKey}
@@ -666,7 +646,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 } }}
@@ -731,10 +711,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,

          {this.shouldShowCollectionThroughputInput() && (
            <ThroughputInput
-              showFreeTierExceedThroughputTooltip={this.isFreeTierAccount() && !isFirstResourceCreated}
+              showFreeTierExceedThroughputTooltip={isFreeTierAccount() && !isFirstResourceCreated}
              isDatabase={false}
              isSharded={this.state.isSharded}
-              isFreeTier={this.isFreeTierAccount()}
+              isFreeTier={isFreeTierAccount()}
              isQuickstart={this.props.isQuickstart}
              setThroughputValue={(throughput: number) => (this.collectionThroughput = throughput)}
              setIsAutoscale={(isAutoscale: boolean) => (this.isCollectionAutoscale = isAutoscale)}
@@ -747,29 +727,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
            />
          )}

-          {userContext.apiType === "SQL" && (
+          {!isFabricNative() && userContext.apiType === "SQL" && (
            <Stack>
-              <Stack horizontal>
-                <Text className="panelTextBold" variant="small">
-                  Unique keys
-                </Text>
-                <TooltipHost
-                  directionalHint={DirectionalHint.bottomLeftEdge}
-                  content={
-                    "Unique keys provide developers with the ability to add a layer of data integrity to their database. By creating a unique key policy when a container is created, you ensure the uniqueness of one or more values per partition key."
-                  }
-                >
-                  <Icon
-                    iconName="Info"
-                    className="panelInfoIcon"
-                    tabIndex={0}
-                    ariaLabel={
-                      "Unique keys provide developers with the ability to add a layer of data integrity to their database. By creating a unique key policy when a container is created, you ensure the uniqueness of one or more values per partition key."
-                    }
-                  />
-                </TooltipHost>
-              </Stack>
-
+              {UniqueKeysHeader()}
              {this.state.uniqueKeys.map((uniqueKey: string, i: number): JSX.Element => {
                return (
                  <Stack style={{ marginBottom: 8 }} key={`uniqueKey${i}`} horizontal>
@@ -817,10 +777,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
            </Stack>
          )}

-          {this.shouldShowAnalyticalStoreOptions() && (
+          {shouldShowAnalyticalStoreOptions() && (
            <Stack className="panelGroupSpacing">
              <Text className="panelTextBold" variant="small">
-                {this.getAnalyticalStorageContent()}
+                {AnalyticalStorageContent()}
              </Text>

              <Stack horizontal verticalAlign="center">
@@ -828,7 +788,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                  <input
                    className="panelRadioBtn"
                    checked={this.state.enableAnalyticalStore}
-                    disabled={!this.isSynapseLinkEnabled()}
+                    disabled={!isSynapseLinkEnabled()}
                    aria-label="Enable analytical store"
                    aria-checked={this.state.enableAnalyticalStore}
                    name="analyticalStore"
@@ -843,7 +803,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                  <input
                    className="panelRadioBtn"
                    checked={!this.state.enableAnalyticalStore}
-                    disabled={!this.isSynapseLinkEnabled()}
+                    disabled={!isSynapseLinkEnabled()}
                    aria-label="Disable analytical store"
                    aria-checked={!this.state.enableAnalyticalStore}
                    name="analyticalStore"
@@ -857,7 +817,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                </div>
              </Stack>

-              {!this.isSynapseLinkEnabled() && (
+              {!isSynapseLinkEnabled() && (
                <Stack className="panelGroupSpacing">
                  <Text variant="small">
                    Azure Synapse Link is required for creating an analytical store{" "}
@@ -887,9 +847,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                title="Container Vector Policy"
                isExpandedByDefault={false}
                onExpand={() => {
-                  this.scrollToSection("collapsibleVectorPolicySectionContent");
+                  scrollToSection("collapsibleVectorPolicySectionContent");
                }}
-                tooltipContent={this.getContainerVectorPolicyTooltipContent()}
+                tooltipContent={ContainerVectorPolicyTooltipContent()}
              >
                <Stack id="collapsibleVectorPolicySectionContent" styles={{ root: { position: "relative" } }}>
                  <Stack styles={{ root: { paddingLeft: 40 } }}>
@@ -915,7 +875,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                title="Container Full Text Search Policy"
                isExpandedByDefault={false}
                onExpand={() => {
-                  this.scrollToSection("collapsibleFullTextPolicySectionContent");
+                  scrollToSection("collapsibleFullTextPolicySectionContent");
                }}
                //TODO: uncomment when learn more text becomes available
                // tooltipContent={this.getContainerFullTextPolicyTooltipContent()}
@@ -937,13 +897,13 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              </CollapsibleSectionComponent>
            </Stack>
          )}
-          {userContext.apiType !== "Tables" && (
+          {!isFabricNative() && userContext.apiType !== "Tables" && (
            <CollapsibleSectionComponent
              title="Advanced"
              isExpandedByDefault={false}
              onExpand={() => {
                TelemetryProcessor.traceOpen(Action.ExpandAddCollectionPaneAdvancedSection);
-                this.scrollToSection("collapsibleAdvancedSectionContent");
+                scrollToSection("collapsibleAdvancedSectionContent");
              }}
            >
              <Stack className="panelGroupSpacing" id="collapsibleAdvancedSectionContent">
@@ -1053,31 +1013,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    }));
  }

-  private getPartitionKeyName(isLowerCase?: boolean): string {
-    const partitionKeyName = userContext.apiType === "Mongo" ? "Shard key" : "Partition key";
-
-    return isLowerCase ? partitionKeyName.toLocaleLowerCase() : partitionKeyName;
-  }
-
-  private getPartitionKeyPlaceHolder(index?: number): string {
-    switch (userContext.apiType) {
-      case "Mongo":
-        return "e.g., categoryId";
-      case "Gremlin":
-        return "e.g., /address";
-      case "SQL":
-        return `${
-          index === undefined
-            ? "Required - first partition key e.g., /TenantId"
-            : index === 0
-            ? "second partition key e.g., /UserId"
-            : "third partition key e.g., /SessionId"
-        }`;
-      default:
-        return "e.g., /address/zipCode";
-    }
-  }
-
  private onCreateNewDatabaseRadioBtnChange(event: React.ChangeEvent<HTMLInputElement>): void {
    if (event.target.checked && !this.state.createNewDatabase) {
      this.setState({
@@ -1165,48 +1100,12 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    return !!selectedDatabase?.offer();
  }

-  private isFreeTierAccount(): boolean {
-    return userContext.databaseAccount?.properties?.enableFreeTier;
-  }
-
  private getFreeTierIndexingText(): string {
    return this.state.enableIndexing
      ? "All properties in your documents will be indexed by default for flexible and efficient queries."
      : "Indexing will be turned off. Recommended if you don't need to run queries or only have key value operations.";
  }

-  private getPartitionKeyTooltipText(): string {
-    if (userContext.apiType === "Mongo") {
-      return "The shard key (field) is used to split your data across many replica sets (shards) to achieve unlimited scalability. It’s critical to choose a field that will evenly distribute your data.";
-    }
-
-    let tooltipText = `The ${this.getPartitionKeyName(
-      true,
-    )} is used to automatically distribute data across partitions for scalability. Choose a property in your JSON document that has a wide range of values and evenly distributes request volume.`;
-
-    if (userContext.apiType === "SQL") {
-      tooltipText += " For small read-heavy workloads or write-heavy workloads of any size, id is often a good choice.";
-    }
-
-    return tooltipText;
-  }
-
-  private getPartitionKey(): string {
-    if (userContext.apiType !== "SQL" && userContext.apiType !== "Mongo") {
-      return "";
-    }
-    if (userContext.features.partitionKeyDefault) {
-      return userContext.apiType === "SQL" ? "/id" : "_id";
-    }
-    if (userContext.features.partitionKeyDefault2) {
-      return userContext.apiType === "SQL" ? "/pk" : "pk";
-    }
-    if (this.props.isQuickstart) {
-      return userContext.apiType === "SQL" ? "/categoryId" : "categoryId";
-    }
-    return "";
-  }
-
  private getPartitionKeySubtext(): string {
    if (
      userContext.features.partitionKeyDefault &&
@@ -1218,34 +1117,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    return "";
  }

-  private getAnalyticalStorageContent(): JSX.Element {
-    return (
-      <Text variant="small">
-        Enable analytical store capability to perform near real-time analytics on your operational data, without
-        impacting the performance of transactional workloads.{" "}
-        <Link
-          aria-label={Constants.ariaLabelForLearnMoreLink.AnalyticalStore}
-          target="_blank"
-          href="https://aka.ms/analytical-store-overview"
-        >
-          Learn more
-        </Link>
-      </Text>
-    );
-  }
-
-  private getContainerVectorPolicyTooltipContent(): JSX.Element {
-    return (
-      <Text variant="small">
-        Describe any properties in your data that contain vectors, so that they can be made available for similarity
-        queries.{" "}
-        <Link target="_blank" href="https://aka.ms/CosmosDBVectorSetup">
-          Learn more
-        </Link>
-      </Text>
-    );
-  }
-
  //TODO: uncomment when learn more text becomes available
  // private getContainerFullTextPolicyTooltipContent(): JSX.Element {
  //   return (
@@ -1260,7 +1131,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
  // }

  private shouldShowCollectionThroughputInput(): boolean {
-    if (isServerlessAccount()) {
+    if (isFabricNative() || isServerlessAccount()) {
      return false;
    }

@@ -1276,7 +1147,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
  }

  private shouldShowIndexingOptionsForFreeTierAccount(): boolean {
-    if (!this.isFreeTierAccount()) {
+    if (!isFreeTierAccount()) {
      return false;
    }

@@ -1285,39 +1156,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      : this.isSelectedDatabaseSharedThroughput();
  }

-  private shouldShowAnalyticalStoreOptions(): boolean {
-    if (configContext.platform === Platform.Emulator) {
-      return false;
-    }
-
-    switch (userContext.apiType) {
-      case "SQL":
-      case "Mongo":
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  private isSynapseLinkEnabled(): boolean {
-    if (!userContext.databaseAccount) {
-      return false;
-    }
-
-    const { properties } = userContext.databaseAccount;
-    if (!properties) {
-      return false;
-    }
-
-    if (properties.enableAnalyticalStorage) {
-      return true;
-    }
-
-    return properties.capabilities?.some(
-      (capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics,
-    );
-  }
-
  private shouldShowVectorSearchParameters() {
    return isVectorSearchEnabled() && (isServerlessAccount() || this.shouldShowCollectionThroughputInput());
  }
@@ -1398,11 +1236,11 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
  }

  private getAnalyticalStorageTtl(): number {
-    if (!this.isSynapseLinkEnabled()) {
+    if (!isSynapseLinkEnabled()) {
      return undefined;
    }

-    if (!this.shouldShowAnalyticalStoreOptions()) {
+    if (!shouldShowAnalyticalStoreOptions()) {
      return undefined;
    }

@@ -1416,10 +1254,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
    return Constants.AnalyticalStorageTtl.Disabled;
  }

-  private scrollToSection(id: string): void {
-    document.getElementById(id)?.scrollIntoView();
-  }
-
  private getSampleDBName(): string {
    const existingSampleDBs = useDatabases
      .getState()
@@ -1454,7 +1288,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      partitionKeyString = "/'$pk'";
    }

-    const uniqueKeyPolicy: DataModels.UniqueKeyPolicy = this.parseUniqueKeys();
+    const uniqueKeyPolicy: DataModels.UniqueKeyPolicy = parseUniqueKeys(this.state.uniqueKeys);
    const partitionKeyVersion = this.state.useHashV1 ? undefined : 2;
    const partitionKey: DataModels.PartitionKey = partitionKeyString
      ? {
--- a/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility.tsx
@@ -0,0 +1,217 @@
+import { DirectionalHint, Icon, Link, Stack, Text, TooltipHost } from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import { configContext, Platform } from "ConfigContext";
+import * as DataModels from "Contracts/DataModels";
+import { getFullTextLanguageOptions } from "Explorer/Controls/FullTextSeach/FullTextPoliciesComponent";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
+import React from "react";
+import { userContext } from "UserContext";
+
+export function getPartitionKeyTooltipText(): string {
+  if (userContext.apiType === "Mongo") {
+    return "The shard key (field) is used to split your data across many replica sets (shards) to achieve unlimited scalability. It’s critical to choose a field that will evenly distribute your data.";
+  }
+
+  let tooltipText = `The ${getPartitionKeyName(
+    true,
+  )} is used to automatically distribute data across partitions for scalability. Choose a property in your JSON document that has a wide range of values and evenly distributes request volume.`;
+
+  if (userContext.apiType === "SQL") {
+    tooltipText += " For small read-heavy workloads or write-heavy workloads of any size, id is often a good choice.";
+  }
+
+  return tooltipText;
+}
+
+export function getPartitionKeyName(isLowerCase?: boolean): string {
+  const partitionKeyName = userContext.apiType === "Mongo" ? "Shard key" : "Partition key";
+
+  return isLowerCase ? partitionKeyName.toLocaleLowerCase() : partitionKeyName;
+}
+
+export function getPartitionKeyPlaceHolder(index?: number): string {
+  switch (userContext.apiType) {
+    case "Mongo":
+      return "e.g., categoryId";
+    case "Gremlin":
+      return "e.g., /address";
+    case "SQL":
+      return `${
+        index === undefined
+          ? "Required - first partition key e.g., /TenantId"
+          : index === 0
+          ? "second partition key e.g., /UserId"
+          : "third partition key e.g., /SessionId"
+      }`;
+    default:
+      return "e.g., /address/zipCode";
+  }
+}
+
+export function getPartitionKey(isQuickstart?: boolean): string {
+  if (userContext.apiType !== "SQL" && userContext.apiType !== "Mongo") {
+    return "";
+  }
+  if (userContext.features.partitionKeyDefault) {
+    return userContext.apiType === "SQL" ? "/id" : "_id";
+  }
+  if (userContext.features.partitionKeyDefault2) {
+    return userContext.apiType === "SQL" ? "/pk" : "pk";
+  }
+  if (isQuickstart) {
+    return userContext.apiType === "SQL" ? "/categoryId" : "categoryId";
+  }
+  return "";
+}
+
+export function isFreeTierAccount(): boolean {
+  return userContext.databaseAccount?.properties?.enableFreeTier;
+}
+
+export function UniqueKeysHeader(): JSX.Element {
+  const tooltipContent =
+    "Unique keys provide developers with the ability to add a layer of data integrity to their database. By creating a unique key policy when a container is created, you ensure the uniqueness of one or more values per partition key.";
+
+  return (
+    <Stack horizontal>
+      <Text className="panelTextBold" variant="small">
+        Unique keys
+      </Text>
+      <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={tooltipContent}>
+        <Icon iconName="Info" className="panelInfoIcon" tabIndex={0} ariaLabel={tooltipContent} />
+      </TooltipHost>
+    </Stack>
+  );
+}
+
+export function shouldShowAnalyticalStoreOptions(): boolean {
+  if (isFabricNative() || configContext.platform === Platform.Emulator) {
+    return false;
+  }
+
+  switch (userContext.apiType) {
+    case "SQL":
+    case "Mongo":
+      return true;
+    default:
+      return false;
+  }
+}
+
+export function AnalyticalStorageContent(): JSX.Element {
+  return (
+    <Text variant="small">
+      Enable analytical store capability to perform near real-time analytics on your operational data, without impacting
+      the performance of transactional workloads.{" "}
+      <Link
+        aria-label={Constants.ariaLabelForLearnMoreLink.AnalyticalStore}
+        target="_blank"
+        href="https://aka.ms/analytical-store-overview"
+      >
+        Learn more
+      </Link>
+    </Text>
+  );
+}
+
+export function isSynapseLinkEnabled(): boolean {
+  if (!userContext.databaseAccount) {
+    return false;
+  }
+
+  const { properties } = userContext.databaseAccount;
+  if (!properties) {
+    return false;
+  }
+
+  if (properties.enableAnalyticalStorage) {
+    return true;
+  }
+
+  return properties.capabilities?.some(
+    (capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics,
+  );
+}
+
+export function scrollToSection(id: string): void {
+  document.getElementById(id)?.scrollIntoView();
+}
+
+export function ContainerVectorPolicyTooltipContent(): JSX.Element {
+  return (
+    <Text variant="small">
+      Describe any properties in your data that contain vectors, so that they can be made available for similarity
+      queries.{" "}
+      <Link target="_blank" href="https://aka.ms/CosmosDBVectorSetup">
+        Learn more
+      </Link>
+    </Text>
+  );
+}
+
+export function parseUniqueKeys(uniqueKeys: string[]): DataModels.UniqueKeyPolicy {
+  if (uniqueKeys?.length === 0) {
+    return undefined;
+  }
+
+  const uniqueKeyPolicy: DataModels.UniqueKeyPolicy = { uniqueKeys: [] };
+  uniqueKeys.forEach((uniqueKey: string) => {
+    if (uniqueKey) {
+      const validPaths: string[] = uniqueKey.split(",")?.filter((path) => path?.length > 0);
+      const trimmedPaths: string[] = validPaths?.map((path) => path.trim());
+      if (trimmedPaths?.length > 0) {
+        if (userContext.apiType === "Mongo") {
+          trimmedPaths.map((path) => {
+            const transformedPath = path.split(".").join("/");
+            if (transformedPath[0] !== "/") {
+              return "/" + transformedPath;
+            }
+            return transformedPath;
+          });
+        }
+        uniqueKeyPolicy.uniqueKeys.push({ paths: trimmedPaths });
+      }
+    }
+  });
+
+  return uniqueKeyPolicy;
+}
+
+export const SharedDatabaseDefault: DataModels.IndexingPolicy = {
+  indexingMode: "consistent",
+  automatic: true,
+  includedPaths: [],
+  excludedPaths: [
+    {
+      path: "/*",
+    },
+  ],
+};
+
+export const FullTextPolicyDefault: DataModels.FullTextPolicy = {
+  defaultLanguage: getFullTextLanguageOptions()[0].key as never,
+  fullTextPaths: [],
+};
+
+export const AllPropertiesIndexed: DataModels.IndexingPolicy = {
+  indexingMode: "consistent",
+  automatic: true,
+  includedPaths: [
+    {
+      path: "/*",
+      indexes: [
+        {
+          kind: "Range",
+          dataType: "Number",
+          precision: -1,
+        },
+        {
+          kind: "Range",
+          dataType: "String",
+          precision: -1,
+        },
+      ],
+    },
+  ],
+  excludedPaths: [],
+};
--- a/src/Explorer/Panes/AddCollectionPanel/snapshots/AddCollectionPanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddCollectionPanel/snapshots/AddCollectionPanel.test.tsx.snap
@@ -93,7 +93,7 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          id="newDatabaseId"
          name="newDatabaseId"
          onChange={[Function]}
-          pattern="[^/?#\\\\]*[^/?# \\\\]"
+          pattern="[^\\/?#\\\\]*[^\\/?# \\\\]"
          placeholder="Type a new database id"
          required={true}
          size={40}
@@ -178,7 +178,7 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
        id="collectionId"
        name="collectionId"
        onChange={[Function]}
-        pattern="[^/?#\\\\]*[^/?# \\\\]"
+        pattern="[^\\/?#\\\\]*[^\\/?# \\\\]"
        placeholder="e.g., Container1"
        required={true}
        size={40}
--- a/src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx
+++ b/src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx
@@ -1,5 +1,6 @@
 import { Checkbox, Stack, Text, TextField } from "@fluentui/react";
 import { getNewDatabaseSharedThroughputDefault } from "Common/DatabaseUtility";
+import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as Constants from "../../../Common/Constants";
 import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
@@ -204,8 +205,8 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
            type="text"
            aria-required="true"
            autoComplete="off"
-            pattern="[^/?#\\]*[^/?# \\]"
-            title="May not end with space nor contain characters '\' '/' '#' '?'"
+            pattern={ValidCosmosDbIdInputPattern.source}
+            title={ValidCosmosDbIdDescription}
            size={40}
            aria-label={databaseIdLabel}
            placeholder={databaseIdPlaceHolder}
--- a/src/Explorer/Panes/AddDatabasePanel/snapshots/AddDatabasePanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddDatabasePanel/snapshots/AddDatabasePanel.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`AddDatabasePane Pane should render Default properly 1`] = `
        data-lpignore={true}
        id="database-id"
        onChange={[Function]}
-        pattern="[^/?#\\\\]*[^/?# \\\\]"
+        pattern="[^\\/?#\\\\]*[^\\/?# \\\\]"
        placeholder="Type a new database id"
        size={40}
        styles={
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.test.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.test.tsx
@@ -0,0 +1,28 @@
+import { shallow, ShallowWrapper } from "enzyme";
+import Explorer from "Explorer/Explorer";
+import {
+  AddGlobalSecondaryIndexPanel,
+  AddGlobalSecondaryIndexPanelProps,
+} from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
+import React, { Component } from "react";
+
+const props: AddGlobalSecondaryIndexPanelProps = {
+  explorer: new Explorer(),
+};
+
+describe("AddGlobalSecondaryIndexPanel", () => {
+  it("render default panel", () => {
+    const wrapper: ShallowWrapper<AddGlobalSecondaryIndexPanelProps, object, Component> = shallow(
+      <AddGlobalSecondaryIndexPanel {...props} />,
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should render form", () => {
+    const wrapper: ShallowWrapper<AddGlobalSecondaryIndexPanelProps, object, Component> = shallow(
+      <AddGlobalSecondaryIndexPanel {...props} />,
+    );
+    const form = wrapper.find("form").first();
+    expect(form).toBeDefined();
+  });
+});
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
@@ -0,0 +1,406 @@
+import {
+  DirectionalHint,
+  Dropdown,
+  DropdownMenuItemType,
+  Icon,
+  IDropdownOption,
+  Link,
+  Separator,
+  Stack,
+  Text,
+  TooltipHost,
+} from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import { createGlobalSecondaryIndex } from "Common/dataAccess/createMaterializedView";
+import { getErrorMessage, getErrorStack } from "Common/ErrorHandlingUtils";
+import * as DataModels from "Contracts/DataModels";
+import { FullTextIndex, FullTextPolicy, VectorEmbedding, VectorIndex } from "Contracts/DataModels";
+import { Collection, Database } from "Contracts/ViewModels";
+import Explorer from "Explorer/Explorer";
+import {
+  AllPropertiesIndexed,
+  FullTextPolicyDefault,
+  getPartitionKey,
+  isSynapseLinkEnabled,
+  scrollToSection,
+  shouldShowAnalyticalStoreOptions,
+} from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import {
+  chooseSourceContainerStyle,
+  chooseSourceContainerStyles,
+} from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanelStyles";
+import { AdvancedComponent } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AdvancedComponent";
+import { AnalyticalStoreComponent } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AnalyticalStoreComponent";
+import { FullTextSearchComponent } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/FullTextSearchComponent";
+import { PartitionKeyComponent } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/PartitionKeyComponent";
+import { ThroughputComponent } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent";
+import { VectorSearchComponent } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent";
+import { PanelFooterComponent } from "Explorer/Panes/PanelFooterComponent";
+import { PanelInfoErrorComponent } from "Explorer/Panes/PanelInfoErrorComponent";
+import { PanelLoadingScreen } from "Explorer/Panes/PanelLoadingScreen";
+import { useDatabases } from "Explorer/useDatabases";
+import { useSidePanel } from "hooks/useSidePanel";
+import React, { useEffect, useState } from "react";
+import { CollectionCreation } from "Shared/Constants";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "UserContext";
+import { isFullTextSearchEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
+
+export interface AddGlobalSecondaryIndexPanelProps {
+  explorer: Explorer;
+  sourceContainer?: Collection;
+}
+export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanelProps): JSX.Element => {
+  const { explorer, sourceContainer } = props;
+
+  const [sourceContainerOptions, setSourceContainerOptions] = useState<IDropdownOption[]>();
+  const [selectedSourceContainer, setSelectedSourceContainer] = useState<Collection>(sourceContainer);
+  const [globalSecondaryIndexId, setGlobalSecondaryIndexId] = useState<string>();
+  const [definition, setDefinition] = useState<string>();
+  const [partitionKey, setPartitionKey] = useState<string>(getPartitionKey());
+  const [subPartitionKeys, setSubPartitionKeys] = useState<string[]>([]);
+  const [useHashV1, setUseHashV1] = useState<boolean>();
+  const [enableDedicatedThroughput, setEnabledDedicatedThroughput] = useState<boolean>();
+  const [isThroughputCapExceeded, setIsThroughputCapExceeded] = useState<boolean>();
+  const [enableAnalyticalStore, setEnableAnalyticalStore] = useState<boolean>();
+  const [vectorEmbeddingPolicy, setVectorEmbeddingPolicy] = useState<VectorEmbedding[]>([]);
+  const [vectorIndexingPolicy, setVectorIndexingPolicy] = useState<VectorIndex[]>([]);
+  const [vectorPolicyValidated, setVectorPolicyValidated] = useState<boolean>(true);
+  const [fullTextPolicy, setFullTextPolicy] = useState<FullTextPolicy>(FullTextPolicyDefault);
+  const [fullTextIndexes, setFullTextIndexes] = useState<FullTextIndex[]>([]);
+  const [fullTextPolicyValidated, setFullTextPolicyValidated] = useState<boolean>(true);
+  const [errorMessage, setErrorMessage] = useState<string>();
+  const [showErrorDetails, setShowErrorDetails] = useState<boolean>();
+  const [isExecuting, setIsExecuting] = useState<boolean>();
+
+  useEffect(() => {
+    const sourceContainerOptions: IDropdownOption[] = [];
+    useDatabases.getState().databases.forEach((database: Database) => {
+      sourceContainerOptions.push({
+        key: database.rid,
+        text: database.id(),
+        itemType: DropdownMenuItemType.Header,
+      });
+
+      database.collections().forEach((collection: Collection) => {
+        const isGlobalSecondaryIndex: boolean = !!collection.materializedViewDefinition();
+        sourceContainerOptions.push({
+          key: collection.rid,
+          text: collection.id(),
+          disabled: isGlobalSecondaryIndex,
+          ...(isGlobalSecondaryIndex && {
+            title: "This is a global secondary index.",
+          }),
+          data: collection,
+        });
+      });
+    });
+
+    setSourceContainerOptions(sourceContainerOptions);
+  }, []);
+
+  useEffect(() => {
+    scrollToSection("panelContainer");
+  }, [errorMessage]);
+
+  let globalSecondaryIndexThroughput: number;
+  let isCostAcknowledged: boolean;
+
+  const globalSecondaryIndexThroughputOnChange = (globalSecondaryIndexThroughputValue: number): void => {
+    globalSecondaryIndexThroughput = globalSecondaryIndexThroughputValue;
+  };
+
+  const isCostAknowledgedOnChange = (isCostAcknowledgedValue: boolean): void => {
+    isCostAcknowledged = isCostAcknowledgedValue;
+  };
+
+  const isSelectedSourceContainerSharedThroughput = (): boolean => {
+    if (!selectedSourceContainer) {
+      return false;
+    }
+
+    return !!selectedSourceContainer.getDatabase().offer();
+  };
+
+  const showCollectionThroughputInput = (): boolean => {
+    if (isServerlessAccount()) {
+      return false;
+    }
+
+    if (enableDedicatedThroughput) {
+      return true;
+    }
+
+    return !!selectedSourceContainer && !isSelectedSourceContainerSharedThroughput();
+  };
+
+  const showVectorSearchParameters = (): boolean => {
+    return isVectorSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
+  };
+
+  const showFullTextSearchParameters = (): boolean => {
+    return isFullTextSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
+  };
+
+  const getAnalyticalStorageTtl = (): number => {
+    if (!isSynapseLinkEnabled()) {
+      return undefined;
+    }
+
+    if (!shouldShowAnalyticalStoreOptions()) {
+      return undefined;
+    }
+
+    if (enableAnalyticalStore) {
+      // TODO: always default to 90 days once the backend hotfix is deployed
+      return userContext.features.ttl90Days
+        ? Constants.AnalyticalStorageTtl.Days90
+        : Constants.AnalyticalStorageTtl.Infinite;
+    }
+
+    return Constants.AnalyticalStorageTtl.Disabled;
+  };
+
+  const validateInputs = (): boolean => {
+    if (!selectedSourceContainer) {
+      setErrorMessage("Please select a source container");
+      return false;
+    }
+
+    if (globalSecondaryIndexThroughput > CollectionCreation.DefaultCollectionRUs100K && !isCostAcknowledged) {
+      const errorMessage: string = "Please acknowledge the estimated monthly spend.";
+      setErrorMessage(errorMessage);
+      return false;
+    }
+
+    if (globalSecondaryIndexThroughput > CollectionCreation.MaxRUPerPartition) {
+      setErrorMessage("Unsharded collections support up to 10,000 RUs");
+      return false;
+    }
+
+    if (showVectorSearchParameters()) {
+      if (!vectorPolicyValidated) {
+        setErrorMessage("Please fix errors in container vector policy");
+        return false;
+      }
+
+      if (!fullTextPolicyValidated) {
+        setErrorMessage("Please fix errors in container full text search policy");
+        return false;
+      }
+    }
+
+    return true;
+  };
+
+  const submit = async (event?: React.FormEvent<HTMLFormElement>): Promise<void> => {
+    event?.preventDefault();
+
+    if (!validateInputs()) {
+      return;
+    }
+
+    const globalSecondaryIdTrimmed: string = globalSecondaryIndexId.trim();
+
+    const globalSecondaryIndexDefinition: DataModels.MaterializedViewDefinition = {
+      sourceCollectionId: selectedSourceContainer.id(),
+      definition: definition,
+    };
+
+    const partitionKeyTrimmed: string = partitionKey.trim();
+
+    const partitionKeyVersion = useHashV1 ? undefined : 2;
+    const partitionKeyPaths: DataModels.PartitionKey = partitionKeyTrimmed
+      ? {
+          paths: [
+            partitionKeyTrimmed,
+            ...(userContext.apiType === "SQL" && subPartitionKeys.length > 0 ? subPartitionKeys : []),
+          ],
+          kind: userContext.apiType === "SQL" && subPartitionKeys.length > 0 ? "MultiHash" : "Hash",
+          version: partitionKeyVersion,
+        }
+      : undefined;
+
+    const indexingPolicy: DataModels.IndexingPolicy = AllPropertiesIndexed;
+    let vectorEmbeddingPolicyFinal: DataModels.VectorEmbeddingPolicy;
+
+    if (showVectorSearchParameters()) {
+      indexingPolicy.vectorIndexes = vectorIndexingPolicy;
+      vectorEmbeddingPolicyFinal = {
+        vectorEmbeddings: vectorEmbeddingPolicy,
+      };
+    }
+
+    if (showFullTextSearchParameters()) {
+      indexingPolicy.fullTextIndexes = fullTextIndexes;
+    }
+
+    const telemetryData: TelemetryProcessor.TelemetryData = {
+      database: {
+        id: selectedSourceContainer.databaseId,
+        shared: isSelectedSourceContainerSharedThroughput(),
+      },
+      collection: {
+        id: globalSecondaryIdTrimmed,
+        throughput: globalSecondaryIndexThroughput,
+        isAutoscale: true,
+        partitionKeyPaths,
+        collectionWithDedicatedThroughput: enableDedicatedThroughput,
+      },
+      subscriptionQuotaId: userContext.quotaId,
+      dataExplorerArea: Constants.Areas.ContextualPane,
+    };
+
+    const startKey: number = TelemetryProcessor.traceStart(Action.CreateCollection, telemetryData);
+    const databaseLevelThroughput: boolean = isSelectedSourceContainerSharedThroughput() && !enableDedicatedThroughput;
+
+    const createGlobalSecondaryIndexParams: DataModels.CreateMaterializedViewsParams = {
+      materializedViewId: globalSecondaryIdTrimmed,
+      materializedViewDefinition: globalSecondaryIndexDefinition,
+      databaseId: selectedSourceContainer.databaseId,
+      databaseLevelThroughput: databaseLevelThroughput,
+      ...(!databaseLevelThroughput && {
+        autoPilotMaxThroughput: globalSecondaryIndexThroughput,
+      }),
+      analyticalStorageTtl: getAnalyticalStorageTtl(),
+      indexingPolicy: indexingPolicy,
+      partitionKey: partitionKeyPaths,
+      vectorEmbeddingPolicy: vectorEmbeddingPolicyFinal,
+      fullTextPolicy: fullTextPolicy,
+    };
+
+    setIsExecuting(true);
+
+    try {
+      await createGlobalSecondaryIndex(createGlobalSecondaryIndexParams);
+      await explorer.refreshAllDatabases();
+      TelemetryProcessor.traceSuccess(Action.CreateGlobalSecondaryIndex, telemetryData, startKey);
+      useSidePanel.getState().closeSidePanel();
+    } catch (error) {
+      const errorMessage: string = getErrorMessage(error);
+      setErrorMessage(errorMessage);
+      setShowErrorDetails(true);
+      const failureTelemetryData = { ...telemetryData, error: errorMessage, errorStack: getErrorStack(error) };
+      TelemetryProcessor.traceFailure(Action.CreateGlobalSecondaryIndex, failureTelemetryData, startKey);
+    } finally {
+      setIsExecuting(false);
+    }
+  };
+
+  return (
+    <form className="panelFormWrapper" id="panelGlobalSecondaryIndex" onSubmit={submit}>
+      {errorMessage && (
+        <PanelInfoErrorComponent message={errorMessage} messageType="error" showErrorDetails={showErrorDetails} />
+      )}
+      <div className="panelMainContent">
+        <Stack>
+          <Stack horizontal>
+            <span className="mandatoryStar">*&nbsp;</span>
+            <Text className="panelTextBold" variant="small">
+              Source container id
+            </Text>
+          </Stack>
+          <Dropdown
+            placeholder="Choose source container"
+            options={sourceContainerOptions}
+            defaultSelectedKey={selectedSourceContainer?.rid}
+            styles={chooseSourceContainerStyles()}
+            style={chooseSourceContainerStyle()}
+            onChange={(_, options: IDropdownOption) => setSelectedSourceContainer(options.data as Collection)}
+          />
+          <Separator className="panelSeparator" />
+          <Stack horizontal>
+            <span className="mandatoryStar">*&nbsp;</span>
+            <Text className="panelTextBold" variant="small">
+              Global secondary index container id
+            </Text>
+          </Stack>
+          <input
+            id="globalSecondaryIndexId"
+            type="text"
+            aria-required
+            required
+            autoComplete="off"
+            pattern={ValidCosmosDbIdInputPattern.source}
+            title={ValidCosmosDbIdDescription}
+            placeholder={`e.g., indexbyEmailId`}
+            size={40}
+            className="panelTextField"
+            value={globalSecondaryIndexId}
+            onChange={(event: React.ChangeEvent<HTMLInputElement>) => setGlobalSecondaryIndexId(event.target.value)}
+          />
+          <Stack horizontal>
+            <span className="mandatoryStar">*&nbsp;</span>
+            <Text className="panelTextBold" variant="small">
+              Global secondary index definition
+            </Text>
+            <TooltipHost
+              directionalHint={DirectionalHint.bottomLeftEdge}
+              content={
+                <Link
+                  href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/materialized-views#defining-materialized-views"
+                  target="blank"
+                >
+                  Learn more about defining global secondary indexes.
+                </Link>
+              }
+            >
+              <Icon role="button" iconName="Info" className="panelInfoIcon" tabIndex={0} />
+            </TooltipHost>
+          </Stack>
+          <input
+            id="globalSecondaryIndexDefinition"
+            type="text"
+            aria-required
+            required
+            autoComplete="off"
+            placeholder={"SELECT c.email, c.accountId FROM c"}
+            size={40}
+            className="panelTextField"
+            value={definition || ""}
+            onChange={(event: React.ChangeEvent<HTMLInputElement>) => setDefinition(event.target.value)}
+          />
+          <PartitionKeyComponent
+            {...{ partitionKey, setPartitionKey, subPartitionKeys, setSubPartitionKeys, useHashV1 }}
+          />
+          <ThroughputComponent
+            {...{
+              enableDedicatedThroughput,
+              setEnabledDedicatedThroughput,
+              isSelectedSourceContainerSharedThroughput,
+              showCollectionThroughputInput,
+              globalSecondaryIndexThroughputOnChange,
+              setIsThroughputCapExceeded,
+              isCostAknowledgedOnChange,
+            }}
+          />
+          {shouldShowAnalyticalStoreOptions() && (
+            <AnalyticalStoreComponent {...{ explorer, enableAnalyticalStore, setEnableAnalyticalStore }} />
+          )}
+          {showVectorSearchParameters() && (
+            <VectorSearchComponent
+              {...{
+                vectorEmbeddingPolicy,
+                setVectorEmbeddingPolicy,
+                vectorIndexingPolicy,
+                setVectorIndexingPolicy,
+                vectorPolicyValidated,
+                setVectorPolicyValidated,
+              }}
+            />
+          )}
+          {showFullTextSearchParameters() && (
+            <FullTextSearchComponent
+              {...{ fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated }}
+            />
+          )}
+          <AdvancedComponent {...{ useHashV1, setUseHashV1, setSubPartitionKeys }} />
+        </Stack>
+      </div>
+      <PanelFooterComponent buttonLabel="OK" isButtonDisabled={isThroughputCapExceeded} />
+      {isExecuting && <PanelLoadingScreen />}
+    </form>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanelStyles.ts
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanelStyles.ts
@@ -0,0 +1,15 @@
+import { IDropdownStyleProps, IDropdownStyles, IStyleFunctionOrObject } from "@fluentui/react";
+import { CSSProperties } from "react";
+
+export function chooseSourceContainerStyles(): IStyleFunctionOrObject<IDropdownStyleProps, IDropdownStyles> {
+  return {
+    title: { height: 27, lineHeight: 27 },
+    dropdownItem: { fontSize: 12 },
+    dropdownItemDisabled: { fontSize: 12 },
+    dropdownItemSelected: { fontSize: 12 },
+  };
+}
+
+export function chooseSourceContainerStyle(): CSSProperties {
+  return { width: 300, fontSize: 12 };
+}
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AdvancedComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AdvancedComponent.tsx
@@ -0,0 +1,54 @@
+import { Checkbox, Icon, Link, Stack, Text } from "@fluentui/react";
+import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
+import { scrollToSection } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import React from "react";
+import { Action } from "Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
+
+export interface AdvancedComponentProps {
+  useHashV1: boolean;
+  setUseHashV1: React.Dispatch<React.SetStateAction<boolean>>;
+  setSubPartitionKeys: React.Dispatch<React.SetStateAction<string[]>>;
+}
+export const AdvancedComponent = (props: AdvancedComponentProps): JSX.Element => {
+  const { useHashV1, setUseHashV1, setSubPartitionKeys } = props;
+
+  const useHashV1CheckboxOnChange = (isChecked: boolean): void => {
+    setUseHashV1(isChecked);
+    setSubPartitionKeys([]);
+  };
+
+  return (
+    <CollapsibleSectionComponent
+      title="Advanced"
+      isExpandedByDefault={false}
+      onExpand={() => {
+        TelemetryProcessor.traceOpen(Action.ExpandAddGlobalSecondaryIndexPaneAdvancedSection);
+        scrollToSection("collapsibleAdvancedSectionContent");
+      }}
+    >
+      <Stack className="panelGroupSpacing" id="collapsibleAdvancedSectionContent">
+        <Checkbox
+          label="My application uses an older Cosmos .NET or Java SDK version (.NET V1 or Java V2)"
+          checked={useHashV1}
+          styles={{
+            text: { fontSize: 12 },
+            checkbox: { width: 12, height: 12 },
+            label: { padding: 0, alignItems: "center", wordWrap: "break-word", whiteSpace: "break-spaces" },
+          }}
+          onChange={(ev: React.FormEvent<HTMLElement>, isChecked: boolean) => {
+            useHashV1CheckboxOnChange(isChecked);
+          }}
+        />
+        <Text variant="small">
+          <Icon iconName="InfoSolid" className="removeIcon" /> To ensure compatibility with older SDKs, the created
+          container will use a legacy partitioning scheme that supports partition key values of size only up to 101
+          bytes. If this is enabled, you will not be able to use hierarchical partition keys.{" "}
+          <Link href="https://aka.ms/cosmos-large-pk" target="_blank">
+            Learn more
+          </Link>
+        </Text>
+      </Stack>
+    </CollapsibleSectionComponent>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AnalyticalStoreComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AnalyticalStoreComponent.tsx
@@ -0,0 +1,99 @@
+import { DefaultButton, Link, Stack, Text } from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import Explorer from "Explorer/Explorer";
+import {
+  AnalyticalStorageContent,
+  isSynapseLinkEnabled,
+} from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import React from "react";
+import { getCollectionName } from "Utils/APITypeUtils";
+
+export interface AnalyticalStoreComponentProps {
+  explorer: Explorer;
+  enableAnalyticalStore: boolean;
+  setEnableAnalyticalStore: React.Dispatch<React.SetStateAction<boolean>>;
+}
+export const AnalyticalStoreComponent = (props: AnalyticalStoreComponentProps): JSX.Element => {
+  const { explorer, enableAnalyticalStore, setEnableAnalyticalStore } = props;
+
+  const onEnableAnalyticalStoreRadioButtonChange = (checked: boolean): void => {
+    if (checked && !enableAnalyticalStore) {
+      setEnableAnalyticalStore(true);
+    }
+  };
+
+  const onDisableAnalyticalStoreRadioButtonnChange = (checked: boolean): void => {
+    if (checked && enableAnalyticalStore) {
+      setEnableAnalyticalStore(false);
+    }
+  };
+
+  return (
+    <Stack className="panelGroupSpacing">
+      <Text className="panelTextBold" variant="small">
+        {AnalyticalStorageContent()}
+      </Text>
+
+      <Stack horizontal verticalAlign="center">
+        <div role="radiogroup">
+          <input
+            className="panelRadioBtn"
+            checked={enableAnalyticalStore}
+            disabled={!isSynapseLinkEnabled()}
+            aria-label="Enable analytical store"
+            aria-checked={enableAnalyticalStore}
+            name="analyticalStore"
+            type="radio"
+            role="radio"
+            id="enableAnalyticalStoreBtn"
+            tabIndex={0}
+            onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+              onEnableAnalyticalStoreRadioButtonChange(event.target.checked);
+            }}
+          />
+          <span className="panelRadioBtnLabel">On</span>
+
+          <input
+            className="panelRadioBtn"
+            checked={!enableAnalyticalStore}
+            disabled={!isSynapseLinkEnabled()}
+            aria-label="Disable analytical store"
+            aria-checked={!enableAnalyticalStore}
+            name="analyticalStore"
+            type="radio"
+            role="radio"
+            id="disableAnalyticalStoreBtn"
+            tabIndex={0}
+            onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+              onDisableAnalyticalStoreRadioButtonnChange(event.target.checked);
+            }}
+          />
+          <span className="panelRadioBtnLabel">Off</span>
+        </div>
+      </Stack>
+
+      {!isSynapseLinkEnabled() && (
+        <Stack className="panelGroupSpacing">
+          <Text variant="small">
+            Azure Synapse Link is required for creating an analytical store {getCollectionName().toLocaleLowerCase()}.
+            Enable Synapse Link for this Cosmos DB account.{" "}
+            <Link
+              href="https://aka.ms/cosmosdb-synapselink"
+              target="_blank"
+              aria-label={Constants.ariaLabelForLearnMoreLink.AzureSynapseLink}
+              className="capacitycalculator-link"
+            >
+              Learn more
+            </Link>
+          </Text>
+          <DefaultButton
+            text="Enable"
+            onClick={() => explorer.openEnableSynapseLinkDialog()}
+            style={{ height: 27, width: 80 }}
+            styles={{ label: { fontSize: 12 } }}
+          />
+        </Stack>
+      )}
+    </Stack>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/FullTextSearchComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/FullTextSearchComponent.tsx
@@ -0,0 +1,45 @@
+import { Stack } from "@fluentui/react";
+import { FullTextIndex, FullTextPolicy } from "Contracts/DataModels";
+import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
+import { FullTextPoliciesComponent } from "Explorer/Controls/FullTextSeach/FullTextPoliciesComponent";
+import { scrollToSection } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import React from "react";
+
+export interface FullTextSearchComponentProps {
+  fullTextPolicy: FullTextPolicy;
+  setFullTextPolicy: React.Dispatch<React.SetStateAction<FullTextPolicy>>;
+  setFullTextIndexes: React.Dispatch<React.SetStateAction<FullTextIndex[]>>;
+  setFullTextPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
+}
+export const FullTextSearchComponent = (props: FullTextSearchComponentProps): JSX.Element => {
+  const { fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated } = props;
+
+  return (
+    <Stack>
+      <CollapsibleSectionComponent
+        title="Container Full Text Search Policy"
+        isExpandedByDefault={false}
+        onExpand={() => {
+          scrollToSection("collapsibleFullTextPolicySectionContent");
+        }}
+      >
+        <Stack id="collapsibleFullTextPolicySectionContent" styles={{ root: { position: "relative" } }}>
+          <Stack styles={{ root: { paddingLeft: 40 } }}>
+            <FullTextPoliciesComponent
+              fullTextPolicy={fullTextPolicy}
+              onFullTextPathChange={(
+                fullTextPolicy: FullTextPolicy,
+                fullTextIndexes: FullTextIndex[],
+                fullTextPolicyValidated: boolean,
+              ) => {
+                setFullTextPolicy(fullTextPolicy);
+                setFullTextIndexes(fullTextIndexes);
+                setFullTextPolicyValidated(fullTextPolicyValidated);
+              }}
+            />
+          </Stack>
+        </Stack>
+      </CollapsibleSectionComponent>
+    </Stack>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/PartitionKeyComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/PartitionKeyComponent.tsx
@@ -0,0 +1,132 @@
+import { DefaultButton, DirectionalHint, Icon, IconButton, Link, Stack, Text, TooltipHost } from "@fluentui/react";
+import * as Constants from "Common/Constants";
+import {
+  getPartitionKeyName,
+  getPartitionKeyPlaceHolder,
+  getPartitionKeyTooltipText,
+} from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import React from "react";
+
+export interface PartitionKeyComponentProps {
+  partitionKey?: string;
+  setPartitionKey: React.Dispatch<React.SetStateAction<string>>;
+  subPartitionKeys: string[];
+  setSubPartitionKeys: React.Dispatch<React.SetStateAction<string[]>>;
+  useHashV1: boolean;
+}
+
+export const PartitionKeyComponent = (props: PartitionKeyComponentProps): JSX.Element => {
+  const { partitionKey, setPartitionKey, subPartitionKeys, setSubPartitionKeys, useHashV1 } = props;
+
+  const partitionKeyValueOnChange = (value: string): void => {
+    if (!partitionKey && !value.startsWith("/")) {
+      setPartitionKey("/" + value);
+    } else {
+      setPartitionKey(value);
+    }
+  };
+
+  const subPartitionKeysValueOnChange = (value: string, index: number): void => {
+    const updatedSubPartitionKeys: string[] = [...subPartitionKeys];
+    if (!updatedSubPartitionKeys[index] && !value.startsWith("/")) {
+      updatedSubPartitionKeys[index] = "/" + value.trim();
+    } else {
+      updatedSubPartitionKeys[index] = value.trim();
+    }
+    setSubPartitionKeys(updatedSubPartitionKeys);
+  };
+
+  return (
+    <Stack>
+      <Stack horizontal>
+        <span className="mandatoryStar">*&nbsp;</span>
+        <Text className="panelTextBold" variant="small">
+          Partition key
+        </Text>
+        <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={getPartitionKeyTooltipText()}>
+          <Icon iconName="Info" className="panelInfoIcon" tabIndex={0} />
+        </TooltipHost>
+      </Stack>
+
+      <input
+        type="text"
+        id="addGlobalSecondaryIndex-partitionKeyValue"
+        aria-required
+        required
+        size={40}
+        className="panelTextField"
+        placeholder={getPartitionKeyPlaceHolder()}
+        aria-label={getPartitionKeyName()}
+        pattern=".*"
+        value={partitionKey}
+        style={{ marginBottom: 8 }}
+        onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+          partitionKeyValueOnChange(event.target.value);
+        }}
+      />
+      {subPartitionKeys.map((subPartitionKey: string, subPartitionKeyIndex: number) => {
+        return (
+          <Stack style={{ marginBottom: 8 }} key={`uniqueKey${subPartitionKeyIndex}`} horizontal>
+            <div
+              style={{
+                width: "20px",
+                border: "solid",
+                borderWidth: "0px 0px 1px 1px",
+                marginRight: "5px",
+              }}
+            ></div>
+            <input
+              type="text"
+              id="addGlobalSecondaryIndex-partitionKeyValue"
+              key={`addGlobalSecondaryIndex-partitionKeyValue_${subPartitionKeyIndex}`}
+              aria-required
+              required
+              size={40}
+              tabIndex={subPartitionKeyIndex > 0 ? 1 : 0}
+              className="panelTextField"
+              autoComplete="off"
+              placeholder={getPartitionKeyPlaceHolder(subPartitionKeyIndex)}
+              aria-label={getPartitionKeyName()}
+              pattern={".*"}
+              title={""}
+              value={subPartitionKey}
+              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                subPartitionKeysValueOnChange(event.target.value, subPartitionKeyIndex);
+              }}
+            />
+            <IconButton
+              iconProps={{ iconName: "Delete" }}
+              style={{ height: 27 }}
+              onClick={() => {
+                const updatedSubPartitionKeys = subPartitionKeys.filter(
+                  (_, subPartitionKeyIndexToRemove) => subPartitionKeyIndex !== subPartitionKeyIndexToRemove,
+                );
+                setSubPartitionKeys(updatedSubPartitionKeys);
+              }}
+            />
+          </Stack>
+        );
+      })}
+      <Stack className="panelGroupSpacing">
+        <DefaultButton
+          styles={{ root: { padding: 0, width: 200, height: 30 }, label: { fontSize: 12 } }}
+          hidden={useHashV1}
+          disabled={subPartitionKeys.length >= Constants.BackendDefaults.maxNumMultiHashPartition}
+          onClick={() => setSubPartitionKeys([...subPartitionKeys, ""])}
+        >
+          Add hierarchical partition key
+        </DefaultButton>
+        {subPartitionKeys.length > 0 && (
+          <Text variant="small">
+            <Icon iconName="InfoSolid" className="removeIcon" tabIndex={0} /> This feature allows you to partition your
+            data with up to three levels of keys for better data distribution. Requires .NET V3, Java V4 SDK, or preview
+            JavaScript V3 SDK.{" "}
+            <Link href="https://aka.ms/cosmos-hierarchical-partitioning" target="_blank">
+              Learn more
+            </Link>
+          </Text>
+        )}
+      </Stack>
+    </Stack>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx
@@ -0,0 +1,68 @@
+import { Checkbox, Stack } from "@fluentui/react";
+import { ThroughputInput } from "Explorer/Controls/ThroughputInput/ThroughputInput";
+import { isFreeTierAccount } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import { useDatabases } from "Explorer/useDatabases";
+import React from "react";
+import { getCollectionName } from "Utils/APITypeUtils";
+import { isServerlessAccount } from "Utils/CapabilityUtils";
+
+export interface ThroughputComponentProps {
+  enableDedicatedThroughput: boolean;
+  setEnabledDedicatedThroughput: React.Dispatch<React.SetStateAction<boolean>>;
+  isSelectedSourceContainerSharedThroughput: () => boolean;
+  showCollectionThroughputInput: () => boolean;
+  globalSecondaryIndexThroughputOnChange: (globalSecondaryIndexThroughputValue: number) => void;
+  setIsThroughputCapExceeded: React.Dispatch<React.SetStateAction<boolean>>;
+  isCostAknowledgedOnChange: (isCostAknowledgedValue: boolean) => void;
+}
+
+export const ThroughputComponent = (props: ThroughputComponentProps): JSX.Element => {
+  const {
+    enableDedicatedThroughput,
+    setEnabledDedicatedThroughput,
+    isSelectedSourceContainerSharedThroughput,
+    showCollectionThroughputInput,
+    globalSecondaryIndexThroughputOnChange,
+    setIsThroughputCapExceeded,
+    isCostAknowledgedOnChange,
+  } = props;
+
+  return (
+    <Stack>
+      {!isServerlessAccount() && isSelectedSourceContainerSharedThroughput() && (
+        <Stack horizontal verticalAlign="center">
+          <Checkbox
+            label={`Provision dedicated throughput for this ${getCollectionName().toLocaleLowerCase()}`}
+            checked={enableDedicatedThroughput}
+            styles={{
+              text: { fontSize: 12 },
+              checkbox: { width: 12, height: 12 },
+              label: { padding: 0, alignItems: "center" },
+            }}
+            onChange={(_, isChecked: boolean) => setEnabledDedicatedThroughput(isChecked)}
+          />
+        </Stack>
+      )}
+      {showCollectionThroughputInput() && (
+        <ThroughputInput
+          showFreeTierExceedThroughputTooltip={isFreeTierAccount() && !useDatabases.getState().isFirstResourceCreated()}
+          isDatabase={false}
+          isSharded={false}
+          isFreeTier={isFreeTierAccount()}
+          isQuickstart={false}
+          isGlobalSecondaryIndex={true}
+          setThroughputValue={(throughput: number) => {
+            globalSecondaryIndexThroughputOnChange(throughput);
+          }}
+          setIsAutoscale={() => {}}
+          setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) => {
+            setIsThroughputCapExceeded(isThroughputCapExceeded);
+          }}
+          onCostAcknowledgeChange={(isAcknowledged: boolean) => {
+            isCostAknowledgedOnChange(isAcknowledged);
+          }}
+        />
+      )}
+    </Stack>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
@@ -0,0 +1,58 @@
+import { Stack } from "@fluentui/react";
+import { VectorEmbedding, VectorIndex } from "Contracts/DataModels";
+import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
+import { VectorEmbeddingPoliciesComponent } from "Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent";
+import {
+  ContainerVectorPolicyTooltipContent,
+  scrollToSection,
+} from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import React from "react";
+
+export interface VectorSearchComponentProps {
+  vectorEmbeddingPolicy: VectorEmbedding[];
+  setVectorEmbeddingPolicy: React.Dispatch<React.SetStateAction<VectorEmbedding[]>>;
+  vectorIndexingPolicy: VectorIndex[];
+  setVectorIndexingPolicy: React.Dispatch<React.SetStateAction<VectorIndex[]>>;
+  setVectorPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.Element => {
+  const {
+    vectorEmbeddingPolicy,
+    setVectorEmbeddingPolicy,
+    vectorIndexingPolicy,
+    setVectorIndexingPolicy,
+    setVectorPolicyValidated,
+  } = props;
+
+  return (
+    <Stack>
+      <CollapsibleSectionComponent
+        title="Container Vector Policy"
+        isExpandedByDefault={false}
+        onExpand={() => {
+          scrollToSection("collapsibleVectorPolicySectionContent");
+        }}
+        tooltipContent={ContainerVectorPolicyTooltipContent()}
+      >
+        <Stack id="collapsibleVectorPolicySectionContent" styles={{ root: { position: "relative" } }}>
+          <Stack styles={{ root: { paddingLeft: 40 } }}>
+            <VectorEmbeddingPoliciesComponent
+              vectorEmbeddings={vectorEmbeddingPolicy}
+              vectorIndexes={vectorIndexingPolicy}
+              onVectorEmbeddingChange={(
+                vectorEmbeddingPolicy: VectorEmbedding[],
+                vectorIndexingPolicy: VectorIndex[],
+                vectorPolicyValidated: boolean,
+              ) => {
+                setVectorEmbeddingPolicy(vectorEmbeddingPolicy);
+                setVectorIndexingPolicy(vectorIndexingPolicy);
+                setVectorPolicyValidated(vectorPolicyValidated);
+              }}
+            />
+          </Stack>
+        </Stack>
+      </CollapsibleSectionComponent>
+    </Stack>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/snapshots/AddGlobalSecondaryIndexPanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/snapshots/AddGlobalSecondaryIndexPanel.test.tsx.snap
@@ -0,0 +1,185 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
+<form
+  className="panelFormWrapper"
+  id="panelGlobalSecondaryIndex"
+  onSubmit={[Function]}
+>
+  <div
+    className="panelMainContent"
+  >
+    <Stack>
+      <Stack
+        horizontal={true}
+      >
+        <span
+          className="mandatoryStar"
+        >
+          * 
+        </span>
+        <Text
+          className="panelTextBold"
+          variant="small"
+        >
+          Source container id
+        </Text>
+      </Stack>
+      <Dropdown
+        onChange={[Function]}
+        placeholder="Choose source container"
+        style={
+          {
+            "fontSize": 12,
+            "width": 300,
+          }
+        }
+        styles={
+          {
+            "dropdownItem": {
+              "fontSize": 12,
+            },
+            "dropdownItemDisabled": {
+              "fontSize": 12,
+            },
+            "dropdownItemSelected": {
+              "fontSize": 12,
+            },
+            "title": {
+              "height": 27,
+              "lineHeight": 27,
+            },
+          }
+        }
+      />
+      <Separator
+        className="panelSeparator"
+      />
+      <Stack
+        horizontal={true}
+      >
+        <span
+          className="mandatoryStar"
+        >
+          * 
+        </span>
+        <Text
+          className="panelTextBold"
+          variant="small"
+        >
+          Global secondary index container id
+        </Text>
+      </Stack>
+      <input
+        aria-required={true}
+        autoComplete="off"
+        className="panelTextField"
+        id="globalSecondaryIndexId"
+        onChange={[Function]}
+        pattern="[^\\/?#\\\\]*[^\\/?# \\\\]"
+        placeholder="e.g., indexbyEmailId"
+        required={true}
+        size={40}
+        title="May not end with space nor contain characters '\\' '/' '#' '?'"
+        type="text"
+      />
+      <Stack
+        horizontal={true}
+      >
+        <span
+          className="mandatoryStar"
+        >
+          * 
+        </span>
+        <Text
+          className="panelTextBold"
+          variant="small"
+        >
+          Global secondary index definition
+        </Text>
+        <StyledTooltipHostBase
+          content={
+            <StyledLinkBase
+              href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/materialized-views#defining-materialized-views"
+              target="blank"
+            >
+              Learn more about defining global secondary indexes.
+            </StyledLinkBase>
+          }
+          directionalHint={4}
+        >
+          <Icon
+            className="panelInfoIcon"
+            iconName="Info"
+            role="button"
+            tabIndex={0}
+          />
+        </StyledTooltipHostBase>
+      </Stack>
+      <input
+        aria-required={true}
+        autoComplete="off"
+        className="panelTextField"
+        id="globalSecondaryIndexDefinition"
+        onChange={[Function]}
+        placeholder="SELECT c.email, c.accountId FROM c"
+        required={true}
+        size={40}
+        type="text"
+        value=""
+      />
+      <PartitionKeyComponent
+        partitionKey=""
+        setPartitionKey={[Function]}
+        setSubPartitionKeys={[Function]}
+        subPartitionKeys={[]}
+      />
+      <ThroughputComponent
+        globalSecondaryIndexThroughputOnChange={[Function]}
+        isCostAknowledgedOnChange={[Function]}
+        isSelectedSourceContainerSharedThroughput={[Function]}
+        setEnabledDedicatedThroughput={[Function]}
+        setIsThroughputCapExceeded={[Function]}
+        showCollectionThroughputInput={[Function]}
+      />
+      <AnalyticalStoreComponent
+        explorer={
+          Explorer {
+            "_isInitializingNotebooks": false,
+            "isFixedCollectionWithSharedThroughputSupported": [Function],
+            "isTabsContentExpanded": [Function],
+            "onRefreshDatabasesKeyPress": [Function],
+            "onRefreshResourcesClick": [Function],
+            "phoenixClient": PhoenixClient {
+              "armResourceId": undefined,
+              "retryOptions": {
+                "maxTimeout": 5000,
+                "minTimeout": 5000,
+                "retries": 3,
+              },
+            },
+            "provideFeedbackEmail": [Function],
+            "queriesClient": QueriesClient {
+              "container": [Circular],
+            },
+            "refreshNotebookList": [Function],
+            "resourceTree": ResourceTreeAdapter {
+              "container": [Circular],
+              "copyNotebook": [Function],
+              "parameters": [Function],
+            },
+          }
+        }
+        setEnableAnalyticalStore={[Function]}
+      />
+      <AdvancedComponent
+        setSubPartitionKeys={[Function]}
+        setUseHashV1={[Function]}
+      />
+    </Stack>
+  </div>
+  <PanelFooterComponent
+    buttonLabel="OK"
+  />
+</form>
+`;
--- a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
+++ b/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
@@ -7,6 +7,7 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
 import { isServerlessAccount } from "Utils/CapabilityUtils";
+import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import { useSidePanel } from "hooks/useSidePanel";
 import React, { FunctionComponent, useState } from "react";
 import { ThroughputInput } from "../../Controls/ThroughputInput/ThroughputInput";
@@ -202,8 +203,8 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
                required={true}
                autoComplete="off"
                styles={getTextFieldStyles()}
-                pattern="[^/?#\\-]*[^/?#- \\]"
-                title="May not end with space nor contain characters '\' '/' '#' '?' '-'"
+                pattern={ValidCosmosDbIdInputPattern.source}
+                title={ValidCosmosDbIdDescription}
                placeholder="Type a new keyspace id"
                size={40}
                value={newKeyspaceId}
@@ -292,8 +293,8 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
              required={true}
              ariaLabel="addCollection-table Id Create table"
              autoComplete="off"
-              pattern="[^/?#\\-]*[^/?#- \\]"
-              title="May not end with space nor contain characters '\' '/' '#' '?' '-'"
+              pattern={ValidCosmosDbIdInputPattern.source}
+              title={ValidCosmosDbIdDescription}
              placeholder="Enter table Id"
              size={20}
              value={tableId}
--- a/src/Explorer/Panes/ChangePartitionKeyPane/ChangePartitionKeyPane.tsx
+++ b/src/Explorer/Panes/ChangePartitionKeyPane/ChangePartitionKeyPane.tsx
@@ -28,6 +28,7 @@ import { RightPaneForm } from "Explorer/Panes/RightPaneForm/RightPaneForm";
 import { useDatabases } from "Explorer/useDatabases";
 import { userContext } from "UserContext";
 import { getCollectionName } from "Utils/APITypeUtils";
+import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import { useSidePanel } from "hooks/useSidePanel";
 import * as React from "react";

@@ -235,8 +236,8 @@ export const ChangePartitionKeyPane: React.FC<ChangePartitionKeyPaneProps> = ({
                aria-required
                required
                autoComplete="off"
-                pattern="[^/?#\\]*[^/?# \\]"
-                title="May not end with space nor contain characters '\' '/' '#' '?'"
+                pattern={ValidCosmosDbIdInputPattern.source}
+                title={ValidCosmosDbIdDescription}
                placeholder={`e.g., ${getCollectionName()}1`}
                size={40}
                className="panelTextField"
--- a/src/Explorer/Panes/PanelComponent.less
+++ b/src/Explorer/Panes/PanelComponent.less
@@ -94,6 +94,7 @@
    padding-left: @MediumSpace;

    .paneErrorLink {
+      color: @LinkColor;
      cursor: pointer;
      font-size: @mediumFontSize;
    }
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -107,7 +107,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="3"
+        value="4"
      >
        <AccordionHeader>
          <div
@@ -148,7 +148,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="4"
+        value="5"
      >
        <AccordionHeader>
          <div
@@ -219,7 +219,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="5"
+        value="6"
      >
        <AccordionHeader>
          <div
@@ -281,7 +281,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="6"
+        value="7"
      >
        <AccordionHeader>
          <div
@@ -423,7 +423,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="7"
+        value="8"
      >
        <AccordionHeader>
          <div
@@ -459,7 +459,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="8"
+        value="9"
      >
        <AccordionHeader>
          <div
@@ -495,7 +495,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="9"
+        value="10"
      >
        <AccordionHeader>
          <div
@@ -575,7 +575,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
      className="customAccordion ___1uf6361_0000000 fz7g6wx"
    >
      <AccordionItem
-        value="6"
+        value="7"
      >
        <AccordionHeader>
          <div
@@ -717,7 +717,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="7"
+        value="8"
      >
        <AccordionHeader>
          <div
@@ -753,7 +753,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="11"
+        value="12"
      >
        <AccordionHeader>
          <div
--- a/src/Explorer/QueryCopilot/CopilotCarousel.tsx
+++ b/src/Explorer/QueryCopilot/CopilotCarousel.tsx
@@ -18,7 +18,7 @@ import { createCollection } from "Common/dataAccess/createCollection";
 import * as DataModels from "Contracts/DataModels";
 import { ContainerSampleGenerator } from "Explorer/DataSamples/ContainerSampleGenerator";
 import Explorer from "Explorer/Explorer";
-import { AllPropertiesIndexed } from "Explorer/Panes/AddCollectionPanel";
+import { AllPropertiesIndexed } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 import { PromptCard } from "Explorer/QueryCopilot/PromptCard";
 import { useDatabases } from "Explorer/useDatabases";
 import { useCarousel } from "hooks/useCarousel";
--- a/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
+++ b/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
@@ -22,12 +22,17 @@ export const DeletePopup = ({
  };

  return (
-    <Modal isOpen={showDeletePopup} styles={{ main: { minHeight: "122px", minWidth: "880px" } }}>
+    <Modal
+      isOpen={showDeletePopup}
+      styles={{ main: { minHeight: "122px", minWidth: "880px" } }}
+      titleAriaId="deleteDialogTitle"
+      subtitleAriaId="deleteDialogSubTitle"
+    >
      <Stack style={{ padding: "16px 24px", height: "auto" }}>
-        <Text style={{ height: 24, fontSize: "18px" }}>
+        <Text id="deleteDialogTitle" style={{ height: 24, fontSize: "18px" }}>
          <b>Delete code?</b>
        </Text>
-        <Text style={{ marginTop: 10, marginBottom: 20 }}>
+        <Text id="deleteDialogSubTitle" style={{ marginTop: 10, marginBottom: 20 }}>
          This will clear the query from the query builder pane along with all comments and also reset the prompt pane
        </Text>
        <Stack horizontal tokens={{ childrenGap: 10 }} horizontalAlign="start">
--- a/src/Explorer/QueryCopilot/Popup/snapshots/DeletePopup.test.tsx.snap
+++ b/src/Explorer/QueryCopilot/Popup/snapshots/DeletePopup.test.tsx.snap
@@ -11,6 +11,8 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
      },
    }
  }
+  subtitleAriaId="deleteDialogSubTitle"
+  titleAriaId="deleteDialogTitle"
 >
  <Stack
    style={
@@ -21,6 +23,7 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
    }
  >
    <Text
+      id="deleteDialogTitle"
      style={
        {
          "fontSize": "18px",
@@ -33,6 +36,7 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
      </b>
    </Text>
    <Text
+      id="deleteDialogSubTitle"
      style={
        {
          "marginBottom": 20,
@@ -89,6 +93,8 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
      },
    }
  }
+  subtitleAriaId="deleteDialogSubTitle"
+  titleAriaId="deleteDialogTitle"
 >
  <Stack
    style={
@@ -99,6 +105,7 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
    }
  >
    <Text
+      id="deleteDialogTitle"
      style={
        {
          "fontSize": "18px",
@@ -111,6 +118,7 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
      </b>
    </Text>
    <Text
+      id="deleteDialogSubTitle"
      style={
        {
          "marginBottom": 20,
--- a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
+++ b/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";
--- a/src/Explorer/Sidebar.tsx
+++ b/src/Explorer/Sidebar.tsx
@@ -1,5 +1,6 @@
 import {
  Button,
+  makeStyles,
  Menu,
  MenuButton,
  MenuButtonProps,
@@ -7,20 +8,26 @@ 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 { GlobalSecondaryIndexLabels } from "Common/Constants";
+import { isGlobalSecondaryIndexEnabled } from "Common/DatabaseAccountUtility";
+import { configContext, Platform } from "ConfigContext";
 import Explorer from "Explorer/Explorer";
 import { AddDatabasePanel } from "Explorer/Panes/AddDatabasePanel/AddDatabasePanel";
+import {
+  AddGlobalSecondaryIndexPanel,
+  AddGlobalSecondaryIndexPanelProps,
+} from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
 import { Tabs } from "Explorer/Tabs/Tabs";
 import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/ThemeUtil";
 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 +130,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 +144,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()}`,
@@ -158,6 +168,25 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
      });
    }

+    if (isGlobalSecondaryIndexEnabled()) {
+      const addMaterializedViewPanelProps: AddGlobalSecondaryIndexPanelProps = {
+        explorer,
+      };
+
+      actions.push({
+        id: "new_materialized_view",
+        label: GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+        icon: <Add16Regular />,
+        onClick: () =>
+          useSidePanel
+            .getState()
+            .openSidePanel(
+              GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+              <AddGlobalSecondaryIndexPanel {...addMaterializedViewPanelProps} />,
+            ),
+      });
+    }
+
    return actions;
  }, [explorer]);

@@ -288,7 +317,7 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
  }, [setLoading]);

  const hasGlobalCommands = !(
-    configContext.platform === Platform.Fabric ||
+    isFabricMirrored() ||
    userContext.apiType === "Postgres" ||
    userContext.apiType === "VCoreMongo"
  );
@@ -311,16 +340,18 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
                  <>
                    <div className={styles.floatingControlsContainer}>
                      <div className={styles.floatingControls}>
-                        <button
-                          type="button"
-                          data-test="Sidebar/RefreshButton"
-                          className={styles.floatingControlButton}
-                          disabled={loading}
-                          title="Refresh"
-                          onClick={onRefreshClick}
-                        >
-                          <ArrowSync12Regular />
-                        </button>
+                        {!isFabricNative() && (
+                          <button
+                            type="button"
+                            data-test="Sidebar/RefreshButton"
+                            className={styles.floatingControlButton}
+                            disabled={loading}
+                            title="Refresh"
+                            onClick={onRefreshClick}
+                          >
+                            <ArrowSync12Regular />
+                          </button>
+                        )}
                        <button
                          type="button"
                          className={styles.floatingControlButton}
--- a/src/Explorer/SplashScreen/FabricHome.tsx
+++ b/src/Explorer/SplashScreen/FabricHome.tsx
@@ -0,0 +1,185 @@
+/**
+ * Accordion top class
+ */
+import { Link, makeStyles, tokens } from "@fluentui/react-components";
+import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
+import { SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
+import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
+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();
+  return (
+    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick}>
+      <div className={styles.buttonUpperPart}>{icon}</div>
+      <div aria-label={title} className={styles.buttonLowerPart}>
+        <div>{title}</div>
+        <div>{description}</div>
+      </div>
+    </div>
+  );
+};
+
+export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScreenProps) => {
+  const styles = useStyles();
+  const [openSampleDataImportDialog, setOpenSampleDataImportDialog] = React.useState(false);
+
+  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} />,
+        onClick: () => setOpenSampleDataImportDialog(true),
+      },
+      {
+        title: "App development",
+        description: "Start here to use an SDK to build your apps",
+        icon: <LinkMultipleRegular />,
+        onClick: () => window.open("https://aka.ms/cosmosdbfabricsdk", "_blank"),
+      },
+    ];
+
+    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 (
+    <>
+      <CosmosFluentProvider className={styles.homeContainer}>
+        <SampleDataImportDialog
+          open={openSampleDataImportDialog}
+          setOpen={setOpenSampleDataImportDialog}
+          explorer={props.explorer}
+          databaseName={userContext.fabricContext?.databaseName}
+        />
+        <div className={styles.title} role="heading" aria-label={title}>
+          {title}
+        </div>
+        {getSplashScreenButtons()}
+        <div className={styles.footer}>
+          Need help?{" "}
+          <Link href="https://aka.ms/cosmosdbfabricdocs" target="_blank">
+            Learn more <img src={LinkIcon} alt="Learn more" />
+          </Link>
+        </div>
+      </CosmosFluentProvider>
+    </>
+  );
+};
--- a/src/Explorer/SplashScreen/SampleDataImportDialog.tsx
+++ b/src/Explorer/SplashScreen/SampleDataImportDialog.tsx
@@ -0,0 +1,158 @@
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogBody,
+  DialogContent,
+  DialogSurface,
+  DialogTitle,
+  makeStyles,
+  Spinner,
+  tokens,
+} from "@fluentui/react-components";
+import Explorer from "Explorer/Explorer";
+import { checkContainerExists, createContainer, importData } from "Explorer/SplashScreen/SampleUtil";
+import React, { useEffect, useState } from "react";
+import * as ViewModels from "../../Contracts/ViewModels";
+
+const SAMPLE_DATA_CONTAINER_NAME = "SampleData";
+
+const useStyles = makeStyles({
+  dialogContent: {
+    alignItems: "center",
+    marginBottom: tokens.spacingVerticalL,
+  },
+});
+
+/**
+ * This dialog:
+ * - creates a container
+ * - imports data into the container
+ * @param props
+ * @returns
+ */
+export const SampleDataImportDialog: React.FC<{
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  explorer: Explorer;
+  databaseName: string;
+}> = (props) => {
+  const [status, setStatus] = useState<"idle" | "creating" | "importing" | "completed" | "error">("idle");
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const containerName = SAMPLE_DATA_CONTAINER_NAME;
+  const [collection, setCollection] = useState<ViewModels.Collection>(undefined);
+  const styles = useStyles();
+
+  useEffect(() => {
+    // Reset state when dialog opens
+    if (props.open) {
+      setStatus("idle");
+      setErrorMessage(undefined);
+    }
+  }, [props.open]);
+
+  const handleStartImport = async (): Promise<void> => {
+    setStatus("creating");
+    const databaseName = props.databaseName;
+    if (checkContainerExists(databaseName, containerName)) {
+      const msg = `The container "${containerName}" in database "${databaseName}" already exists. Please delete it and retry.`;
+      setStatus("error");
+      setErrorMessage(msg);
+      return;
+    }
+
+    let collection;
+    try {
+      collection = await createContainer(databaseName, containerName, props.explorer);
+    } catch (error) {
+      setStatus("error");
+      setErrorMessage(`Failed to create container: ${error instanceof Error ? error.message : String(error)}`);
+      return;
+    }
+
+    try {
+      setStatus("importing");
+      await importData(collection);
+      setCollection(collection);
+      setStatus("completed");
+    } catch (error) {
+      setStatus("error");
+      setErrorMessage(`Failed to import data: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  };
+
+  const handleActionOnClick = () => {
+    switch (status) {
+      case "idle":
+        handleStartImport();
+        break;
+      case "error":
+        props.setOpen(false);
+        break;
+      case "creating":
+      case "importing":
+        props.setOpen(false);
+        break;
+      case "completed":
+        props.setOpen(false);
+        collection.openTab();
+        break;
+    }
+  };
+
+  const renderContent = () => {
+    switch (status) {
+      case "idle":
+        return `Create a container "${containerName}" and import sample data into it. This may take a few minutes.`;
+
+      case "creating":
+        return <Spinner size="small" labelPosition="above" label={`Creating container "${containerName}"...`} />;
+      case "importing":
+        return <Spinner size="small" labelPosition="above" label={`Importing data into "${containerName}"...`} />;
+      case "completed":
+        return `Successfully created "${containerName}" with sample data.`;
+      case "error":
+        return (
+          <div style={{ color: "red" }}>
+            <div>Error: {errorMessage}</div>
+          </div>
+        );
+    }
+  };
+
+  const getButtonLabel = () => {
+    switch (status) {
+      case "idle":
+        return "Start";
+      case "creating":
+      case "importing":
+        return "Close";
+      case "completed":
+        return "Close";
+      case "error":
+        return "Close";
+    }
+  };
+
+  return (
+    <Dialog open={props.open} onOpenChange={(event, data) => props.setOpen(data.open)}>
+      <DialogSurface>
+        <DialogBody>
+          <DialogTitle>Sample Data</DialogTitle>
+          <DialogContent>
+            <div className={styles.dialogContent}>{renderContent()}</div>
+          </DialogContent>
+          <DialogActions>
+            <Button
+              appearance="primary"
+              onClick={handleActionOnClick}
+              disabled={status === "creating" || status === "importing"}
+            >
+              {getButtonLabel()}
+            </Button>
+          </DialogActions>
+        </DialogBody>
+      </DialogSurface>
+    </Dialog>
+  );
+};
--- a/src/Explorer/SplashScreen/SampleUtil.ts
+++ b/src/Explorer/SplashScreen/SampleUtil.ts
@@ -0,0 +1,64 @@
+import { BackendDefaults } from "Common/Constants";
+import { createCollection } from "Common/dataAccess/createCollection";
+import Explorer from "Explorer/Explorer";
+import { useDatabases } from "Explorer/useDatabases";
+import * as DataModels from "../../Contracts/DataModels";
+import * as ViewModels from "../../Contracts/ViewModels";
+
+/**
+ * Public for unit tests
+ * @param databaseName
+ * @param containerName
+ * @param containerDatabases
+ */
+const hasContainer = (
+  databaseName: string,
+  containerName: string,
+  containerDatabases: ViewModels.Database[],
+): boolean => {
+  const filteredDatabases = containerDatabases.filter((database) => database.id() === databaseName);
+  return (
+    filteredDatabases.length > 0 &&
+    filteredDatabases[0].collections().filter((collection) => collection.id() === containerName).length > 0
+  );
+};
+
+export const checkContainerExists = (databaseName: string, containerName: string) =>
+  hasContainer(databaseName, containerName, useDatabases.getState().databases);
+
+export const createContainer = async (
+  databaseName: string,
+  containerName: string,
+  explorer: Explorer,
+): Promise<ViewModels.Collection> => {
+  const createRequest: DataModels.CreateCollectionParams = {
+    createNewDatabase: false,
+    collectionId: containerName,
+    databaseId: databaseName,
+    databaseLevelThroughput: false,
+    partitionKey: {
+      paths: [`/${SAMPLE_DATA_PARTITION_KEY}`],
+      kind: "Hash",
+      version: BackendDefaults.partitionKeyVersion,
+    },
+  };
+  await createCollection(createRequest);
+  await explorer.refreshAllDatabases();
+  const database = useDatabases.getState().findDatabaseWithId(databaseName);
+  if (!database) {
+    return undefined;
+  }
+  await database.loadCollections();
+  const newCollection = database.findCollectionWithId(containerName);
+  return newCollection;
+};
+
+const SAMPLE_DATA_PARTITION_KEY = "category"; // This pkey is specifically set for queryCopilotSampleData.json below
+
+export const importData = async (collection: ViewModels.Collection): Promise<void> => {
+  // TODO: keep same chunk as ContainerSampleGenerator
+  const dataFileContent = await import(
+    /* webpackChunkName: "queryCopilotSampleData" */ "../../../sampleData/queryCopilotSampleData.json"
+  );
+  await collection.bulkInsertDocuments(dataFileContent.data);
+};
--- a/src/Explorer/SplashScreen/SplashScreen.tsx
+++ b/src/Explorer/SplashScreen/SplashScreen.tsx
@@ -817,7 +817,7 @@ export class SplashScreen extends React.Component<SplashScreenProps> {

  private vcoreMongoNextStepItems: { link: string; title: string; description: string }[] = [
    {
-      link: "https://learn.microsoft.com/en-us/azure/cosmos-db/mongodb/vcore/how-to-migrate-native-tools?tabs=export-import",
+      link: "https://learn.microsoft.com/azure/cosmos-db/mongodb/vcore/migration-options",
      title: "Migrate Data",
      description: "",
    },
--- a/src/Explorer/Tabs/CloudShellTab/AttachAddOn.tsx
+++ b/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);
-        }
-    };
-}
--- a/src/Explorer/Tabs/CloudShellTab/CloudShellTabComponent.tsx
+++ b/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"}} />;
-};
--- a/src/Explorer/Tabs/CloudShellTab/Commands.tsx
+++ b/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 "";
-    }
-};
--- a/src/Explorer/Tabs/CloudShellTab/Core/CloudShellTerminalCore.tsx
+++ b/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);
-    };
-  }
-};
--- a/src/Explorer/Tabs/CloudShellTab/Data.tsx
+++ b/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
-    });
-}
--- a/src/Explorer/Tabs/CloudShellTab/Data/CloudShellApiClient.tsx
+++ b/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
-  });
-}
--- a/src/Explorer/Tabs/CloudShellTab/Data/LocalizationUtils.tsx
+++ b/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');
-};
--- a/Show More
+++ b/Show More