update settings component test snap

update treeNodeUtil test snap
fix tests
2026-03-02 14:25:32 +00:00 · 2025-03-17 13:51:46 -04:00 · 2025-03-17 13:45:46 -04:00 · 2025-03-17 13:37:37 -04:00 · 2025-03-17 22:45:51 +05:30 · 2025-03-14 15:11:36 -04:00
117 changed files with 3211 additions and 39943 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, 9, 10, 11, 12, 13, 14, 15, 16]
-        shardTotal: [16]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
    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 }} --workers=3
+        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
      - 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
@@ -1,8 +0,0 @@
-<?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
@@ -1,10 +0,0 @@
-<?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/documentDB.less
+++ b/less/documentDB.less
@@ -1914,20 +1914,13 @@ 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
@@ -86,7 +86,7 @@
        "mkdirp": "1.0.4",
        "monaco-editor": "0.44.0",
        "ms": "2.1.3",
-        "p-retry": "6.2.1",
+        "p-retry": "4.6.2",
        "patch-package": "8.0.0",
        "plotly.js-cartesian-dist-min": "1.52.3",
        "post-robot": "10.0.42",
@@ -12662,9 +12662,7 @@
      }
    },
    "node_modules/@types/retry": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
-      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+      "version": "0.12.0",
      "license": "MIT"
    },
    "node_modules/@types/sanitize-html": {
@@ -21801,18 +21799,6 @@
        "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",
@@ -30257,20 +30243,14 @@
      }
    },
    "node_modules/p-retry": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
-      "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
+      "version": "4.6.2",
      "license": "MIT",
      "dependencies": {
-        "@types/retry": "0.12.2",
-        "is-network-error": "^1.0.0",
+        "@types/retry": "0.12.0",
        "retry": "^0.13.1"
      },
      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
      }
    },
    "node_modules/p-try": {
@@ -36017,13 +35997,6 @@
        }
      }
    },
-    "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,
@@ -36071,20 +36044,6 @@
        "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
@@ -81,7 +81,7 @@
    "mkdirp": "1.0.4",
    "monaco-editor": "0.44.0",
    "ms": "2.1.3",
-    "p-retry": "6.2.1",
+    "p-retry": "4.6.2",
    "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,4 +1,5 @@
 import { defineConfig, devices } from "@playwright/test";
+
 /**
 * See https://playwright.dev/docs/test-configuration.
 */
@@ -28,60 +29,24 @@ export default defineConfig({
  projects: [
    {
      name: "chromium",
-      use: {
-        ...devices["Desktop Chrome"],
-        launchOptions: {
-          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
-        },
-      },
+      use: { ...devices["Desktop Chrome"] },
    },
    {
      name: "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"],
-        },
-      },
+      use: { ...devices["Desktop Firefox"] },
    },
    {
      name: "webkit",
-      use: {
-        ...devices["Desktop Safari"],
-      },
+      use: { ...devices["Desktop Safari"] },
    },
+    /* Test against branded browsers. */
    {
      name: "Google Chrome",
-      use: {
-        ...devices["Desktop Chrome"],
-        channel: "chrome",
-        launchOptions: {
-          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
-        },
-      },
+      use: { ...devices["Desktop Chrome"], channel: "chrome" }, // or 'chrome-beta'
    },
    {
      name: "Microsoft Edge",
-      use: {
-        ...devices["Desktop Edge"],
-        channel: "msedge",
-        launchOptions: {
-          args: ["--disable-web-security", "--disable-features=IsolateOrigins,site-per-process"],
-        },
-      },
+      use: { ...devices["Desktop Edge"], channel: "msedge" }, // or 'msedge-dev'
    },
  ],

--- a/preview/package-lock.json
+++ b/preview/package-lock.json
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -530,8 +530,8 @@ 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 MaterializedViewsLabels {
+  public static readonly NewMaterializedView: string = "New Materialized View";
 }
 export class FeedbackLabels {
  public static readonly provideFeedback: string = "Provide feedback";
--- a/src/Common/CosmosClient.ts
+++ b/src/Common/CosmosClient.ts
@@ -125,11 +125,7 @@ export const endpoint = () => {
    const location = _global.parent ? _global.parent.location : _global.location;
    return configContext.EMULATOR_ENDPOINT || location.origin;
  }
-  return (
-    userContext.selectedRegionalEndpoint ||
-    userContext.endpoint ||
-    userContext?.databaseAccount?.properties?.documentEndpoint
-  );
+  return userContext.endpoint || userContext?.databaseAccount?.properties?.documentEndpoint;
 };

 export async function getTokenFromAuthService(
@@ -207,7 +203,6 @@ 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,6 +1,5 @@
 import { TagNames, WorkloadType } from "Common/Constants";
 import { Tags } from "Contracts/DataModels";
-import { isFabric } from "Platform/Fabric/FabricUtil";
 import { userContext } from "../UserContext";

 function isVirtualNetworkFilterEnabled() {
@@ -28,8 +27,6 @@ export function getWorkloadType(): WorkloadType {
  return workloadType;
 }

-export function isGlobalSecondaryIndexEnabled(): boolean {
-  return (
-    !isFabric() && userContext.apiType === "SQL" && userContext.databaseAccount?.properties?.enableMaterializedViews
-  );
+export function isMaterializedViewsEnabled(): boolean {
+  return userContext.apiType === "SQL" && userContext.databaseAccount?.properties?.enableMaterializedViews;
 }
--- a/src/Common/IteratorUtilities.ts
+++ b/src/Common/IteratorUtilities.ts
@@ -1,8 +1,5 @@
 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
@@ -24,9 +21,7 @@ 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/dataAccess/createMaterializedView.ts
+++ b/src/Common/dataAccess/createMaterializedView.ts
@@ -1,6 +1,6 @@
 import { constructRpOptions } from "Common/dataAccess/createCollection";
 import { handleError } from "Common/ErrorHandlingUtils";
-import { Collection, CreateMaterializedViewsParams as CreateGlobalSecondaryIndexParams } from "Contracts/DataModels";
+import { Collection, CreateMaterializedViewsParams } from "Contracts/DataModels";
 import { userContext } from "UserContext";
 import { createUpdateSqlContainer } from "Utils/arm/generatedClients/cosmos/sqlResources";
 import {
@@ -10,9 +10,9 @@ import {
 } from "Utils/arm/generatedClients/cosmos/types";
 import { logConsoleInfo, logConsoleProgress } from "Utils/NotificationConsoleUtils";

-export const createGlobalSecondaryIndex = async (params: CreateGlobalSecondaryIndexParams): Promise<Collection> => {
+export const createMaterializedView = async (params: CreateMaterializedViewsParams): Promise<Collection> => {
  const clearMessage = logConsoleProgress(
-    `Creating a new global secondary index ${params.materializedViewId} for database ${params.databaseId}`,
+    `Creating a new materialized view ${params.materializedViewId} for database ${params.databaseId}`,
  );

  const options: CreateUpdateOptions = constructRpOptions(params);
@@ -58,15 +58,11 @@ export const createGlobalSecondaryIndex = async (params: CreateGlobalSecondaryIn
      params.materializedViewId,
      rpPayload,
    );
-    logConsoleInfo(`Successfully created global secondary index ${params.materializedViewId}`);
+    logConsoleInfo(`Successfully created materialized view ${params.materializedViewId}`);

    return createResponse && (createResponse.properties.resource as Collection);
  } catch (error) {
-    handleError(
-      error,
-      "CreateGlobalSecondaryIndex",
-      `Error while creating global secondary index ${params.materializedViewId}`,
-    );
+    handleError(error, "CreateMaterializedView", `Error while creating materialized view ${params.materializedViewId}`);
    throw error;
  } finally {
    clearMessage();
--- a/src/Common/dataAccess/readCollectionOffer.ts
+++ b/src/Common/dataAccess/readCollectionOffer.ts
@@ -1,4 +1,3 @@
-import { isFabric } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { Offer, ReadCollectionOfferParams } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -14,11 +13,6 @@ 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/Contracts/DataExplorerMessagesContract.ts
+++ b/src/Contracts/DataExplorerMessagesContract.ts
@@ -18,13 +18,10 @@ export type DataExploreMessageV3 =
  | {
      type: FabricMessageTypes.GetAllResourceTokens;
      id: string;
-    }
-  | {
-      type: FabricMessageTypes.OpenSettings;
-      settingsId: string;
    };
-export interface GetCosmosTokenMessageOptions {
+
+export type GetCosmosTokenMessageOptions = {
  verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";
  resourceType: "" | "dbs" | "colls" | "docs" | "sprocs" | "pkranges";
  resourceId: string;
-}
+};
--- a/src/Contracts/FabricMessageTypes.ts
+++ b/src/Contracts/FabricMessageTypes.ts
@@ -6,7 +6,6 @@ export enum FabricMessageTypes {
  GetAllResourceTokens = "GetAllResourceTokens",
  GetAccessToken = "GetAccessToken",
  Ready = "Ready",
-  OpenSettings = "OpenSettings",
 }

 export interface AuthorizationToken {
--- a/src/Contracts/FabricMessagesContract.ts
+++ b/src/Contracts/FabricMessagesContract.ts
@@ -81,13 +81,6 @@ export type FabricMessageV3 =
        error: string | undefined;
        data: { accessToken: string };
      };
-    }
-  | {
-      type: "refreshResourceTree";
-      message: {
-        id: string;
-        error: string | undefined;
-      };
    };

 export enum CosmosDbArtifactType {
--- a/src/Contracts/ViewModels.ts
+++ b/src/Contracts/ViewModels.ts
@@ -1,5 +1,4 @@
 import {
-  JSONObject,
  QueryMetrics,
  Resource,
  StoredProcedureDefinition,
@@ -207,12 +206,6 @@ 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,11 +1,11 @@
-import { GlobalSecondaryIndexLabels } from "Common/Constants";
-import { isGlobalSecondaryIndexEnabled } from "Common/DatabaseAccountUtility";
+import { MaterializedViewsLabels } from "Common/Constants";
+import { isMaterializedViewsEnabled } from "Common/DatabaseAccountUtility";
 import { configContext, Platform } from "ConfigContext";
 import { TreeNodeMenuItem } from "Explorer/Controls/TreeComponent/TreeNodeComponent";
 import {
-  AddGlobalSecondaryIndexPanel,
-  AddGlobalSecondaryIndexPanelProps,
-} from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
+  AddMaterializedViewPanel,
+  AddMaterializedViewPanelProps,
+} from "Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel";
 import { useDatabases } from "Explorer/useDatabases";
 import { isFabric, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
@@ -170,19 +170,19 @@ export const createCollectionContextMenuButton = (
    });
  }

-  if (isGlobalSecondaryIndexEnabled() && !selectedCollection.materializedViewDefinition()) {
+  if (isMaterializedViewsEnabled() && !selectedCollection.materializedViewDefinition()) {
    items.push({
-      label: GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+      label: MaterializedViewsLabels.NewMaterializedView,
      onClick: () => {
-        const addMaterializedViewPanelProps: AddGlobalSecondaryIndexPanelProps = {
+        const addMaterializedViewPanelProps: AddMaterializedViewPanelProps = {
          explorer: container,
          sourceContainer: selectedCollection,
        };
        useSidePanel
          .getState()
          .openSidePanel(
-            GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
-            <AddGlobalSecondaryIndexPanel {...addMaterializedViewPanelProps} />,
+            MaterializedViewsLabels.NewMaterializedView,
+            <AddMaterializedViewPanel {...addMaterializedViewPanelProps} />,
          );
      },
    });
--- a/src/Explorer/Controls/Dialog.tsx
+++ b/src/Explorer/Controls/Dialog.tsx
@@ -214,10 +214,8 @@ export const Dialog: FC = () => {
      {contentHtml}
      {progressIndicatorProps && <ProgressIndicator {...progressIndicatorProps} />}
      <DialogFooter>
-        <PrimaryButton {...primaryButtonProps} data-test={`DialogButton:${primaryButtonText}`} />
-        {secondaryButtonProps && (
-          <DefaultButton {...secondaryButtonProps} data-test={`DialogButton:${secondaryButtonText}`} />
-        )}
+        <PrimaryButton {...primaryButtonProps} />
+        {secondaryButtonProps && <DefaultButton {...secondaryButtonProps} />}
      </DialogFooter>
    </FluentDialog>
  ) : (
--- a/src/Explorer/Controls/InputDataList/InputDataList.tsx
+++ b/src/Explorer/Controls/InputDataList/InputDataList.tsx
@@ -193,7 +193,6 @@ 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,7 +12,6 @@ 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";
@@ -45,11 +44,11 @@ import {
  ConflictResolutionComponent,
  ConflictResolutionComponentProps,
 } from "./SettingsSubComponents/ConflictResolutionComponent";
-import {
-  GlobalSecondaryIndexComponent,
-  GlobalSecondaryIndexComponentProps,
-} from "./SettingsSubComponents/GlobalSecondaryIndexComponent";
 import { IndexingPolicyComponent, IndexingPolicyComponentProps } from "./SettingsSubComponents/IndexingPolicyComponent";
+import {
+  MaterializedViewComponent,
+  MaterializedViewComponentProps,
+} from "./SettingsSubComponents/MaterializedViewComponent";
 import {
  MongoIndexingPolicyComponent,
  MongoIndexingPolicyComponentProps,
@@ -167,7 +166,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
  private shouldShowComputedPropertiesEditor: boolean;
  private shouldShowIndexingPolicyEditor: boolean;
  private shouldShowPartitionKeyEditor: boolean;
-  private isGlobalSecondaryIndex: boolean;
+  private isMaterializedView: boolean;
  private isVectorSearchEnabled: boolean;
  private isFullTextSearchEnabled: boolean;
  private totalThroughputUsed: number;
@@ -185,7 +184,7 @@ 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.isMaterializedView =
        !!this.collection?.materializedViewDefinition() || !!this.collection?.materializedViews();
      this.isVectorSearchEnabled = isVectorSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);
      this.isFullTextSearchEnabled = isFullTextSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);
@@ -1149,7 +1148,6 @@ 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,
@@ -1279,10 +1277,9 @@ 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 = {
+    const materializedViewComponentProps: MaterializedViewComponentProps = {
      collection: this.collection,
      explorer: this.props.settingsTab.getContainer(),
    };
@@ -1350,10 +1347,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
      });
    }

-    if (this.isGlobalSecondaryIndex) {
+    if (this.isMaterializedView) {
      tabs.push({
-        tab: SettingsV2TabTypes.GlobalSecondaryIndexTab,
-        content: <GlobalSecondaryIndexComponent {...globalSecondaryIndexComponentProps} />,
+        tab: SettingsV2TabTypes.MaterializedViewTab,
+        content: <MaterializedViewComponent {...materializedViewComponentProps} />,
      });
    }

--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.test.tsx
@@ -1,46 +0,0 @@
-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/MaterializedViewComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/MaterializedViewComponent.test.tsx
@@ -0,0 +1,46 @@
+import { shallow } from "enzyme";
+import React from "react";
+import { collection, container } from "../TestUtils";
+import { MaterializedViewComponent } from "./MaterializedViewComponent";
+import { MaterializedViewSourceComponent } from "./MaterializedViewSourceComponent";
+import { MaterializedViewTargetComponent } from "./MaterializedViewTargetComponent";
+
+describe("MaterializedViewComponent", () => {
+  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(<MaterializedViewComponent collection={testCollection} explorer={testExplorer} />);
+    expect(wrapper.find(MaterializedViewSourceComponent).exists()).toBe(true);
+    expect(wrapper.find(MaterializedViewTargetComponent).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(<MaterializedViewComponent collection={testCollection} explorer={testExplorer} />);
+    expect(wrapper.find(MaterializedViewSourceComponent).exists()).toBe(false);
+    expect(wrapper.find(MaterializedViewTargetComponent).exists()).toBe(true);
+  });
+
+  it("renders neither component when both are missing", () => {
+    testCollection.materializedViews(null);
+    testCollection.materializedViewDefinition(null);
+    const wrapper = shallow(<MaterializedViewComponent collection={testCollection} explorer={testExplorer} />);
+    expect(wrapper.find(MaterializedViewSourceComponent).exists()).toBe(false);
+    expect(wrapper.find(MaterializedViewTargetComponent).exists()).toBe(false);
+  });
+});
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexComponent.tsx
@@ -2,27 +2,22 @@ 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";
+import { MaterializedViewSourceComponent } from "./MaterializedViewSourceComponent";
+import { MaterializedViewTargetComponent } from "./MaterializedViewTargetComponent";

-export interface GlobalSecondaryIndexComponentProps {
+export interface MaterializedViewComponentProps {
  collection: ViewModels.Collection;
  explorer: Explorer;
 }

-export const GlobalSecondaryIndexComponent: React.FC<GlobalSecondaryIndexComponentProps> = ({
-  collection,
-  explorer,
-}) => {
+export const MaterializedViewComponent: React.FC<MaterializedViewComponentProps> = ({ 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 styles={{ root: { fontWeight: 600 } }}>This container has the following views defined for it.</Text>
        <Text>
          <Link
            target="_blank"
@@ -31,11 +26,11 @@ export const GlobalSecondaryIndexComponent: React.FC<GlobalSecondaryIndexCompone
            Learn more
            <FontIcon iconName="NavigateExternalInline" style={{ marginLeft: "4px" }} />
          </Link>{" "}
-          about how to define global secondary indexes and how to use them.
+          about how to define materialized views and how to use them.
        </Text>
      </Stack>
-      {isSourceContainer && <GlobalSecondaryIndexSourceComponent collection={collection} explorer={explorer} />}
-      {isTargetContainer && <GlobalSecondaryIndexTargetComponent collection={collection} />}
+      {isSourceContainer && <MaterializedViewSourceComponent collection={collection} explorer={explorer} />}
+      {isTargetContainer && <MaterializedViewTargetComponent collection={collection} />}
    </Stack>
  );
 };
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.test.tsx
@@ -2,9 +2,9 @@ import { PrimaryButton } from "@fluentui/react";
 import { shallow } from "enzyme";
 import React from "react";
 import { collection, container } from "../TestUtils";
-import { GlobalSecondaryIndexSourceComponent } from "./GlobalSecondaryIndexSourceComponent";
+import { MaterializedViewSourceComponent } from "./MaterializedViewSourceComponent";

-describe("GlobalSecondaryIndexSourceComponent", () => {
+describe("MaterializedViewSourceComponent", () => {
  let testCollection: typeof collection;
  let testExplorer: typeof container;

@@ -13,23 +13,17 @@ describe("GlobalSecondaryIndexSourceComponent", () => {
  });

  it("renders without crashing", () => {
-    const wrapper = shallow(
-      <GlobalSecondaryIndexSourceComponent collection={testCollection} explorer={testExplorer} />,
-    );
+    const wrapper = shallow(<MaterializedViewSourceComponent collection={testCollection} explorer={testExplorer} />);
    expect(wrapper.exists()).toBe(true);
  });

  it("renders the PrimaryButton", () => {
-    const wrapper = shallow(
-      <GlobalSecondaryIndexSourceComponent collection={testCollection} explorer={testExplorer} />,
-    );
+    const wrapper = shallow(<MaterializedViewSourceComponent 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} />,
-    );
+  it("updates when new materialized views are provided", () => {
+    const wrapper = shallow(<MaterializedViewSourceComponent collection={testCollection} explorer={testExplorer} />);

    // Simulating an update by modifying the observable directly
    testCollection.materializedViews([{ id: "view3", _rid: "rid3" }]);
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexSourceComponent.tsx
@@ -1,30 +1,29 @@
 import { PrimaryButton } from "@fluentui/react";
-import { GlobalSecondaryIndexLabels } from "Common/Constants";
-import { MaterializedView } from "Contracts/DataModels";
+import { MaterializedViewsLabels } from "Common/Constants";
 import Explorer from "Explorer/Explorer";
 import { loadMonaco } from "Explorer/LazyMonaco";
-import { AddGlobalSecondaryIndexPanel } from "Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel";
+import { AddMaterializedViewPanel } from "Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel";
 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 {
+export interface MaterializedViewSourceComponentProps {
  collection: ViewModels.Collection;
  explorer: Explorer;
 }

-export const GlobalSecondaryIndexSourceComponent: React.FC<GlobalSecondaryIndexSourceComponentProps> = ({
+export const MaterializedViewSourceComponent: React.FC<MaterializedViewSourceComponentProps> = ({
  collection,
  explorer,
 }) => {
  const editorContainerRef = useRef<HTMLDivElement>(null);
  const editorRef = useRef<monaco.editor.IStandaloneCodeEditor>(null);

-  const globalSecondaryIndexes: MaterializedView[] = collection?.materializedViews() ?? [];
+  const materializedViews = 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.
+  // Helper function to fetch the definition and partition key of targetContainer by traversing through all collections and matching id from MaterializedViews[] with collection id.
  const getViewDetails = (viewId: string): { definition: string; partitionKey: string[] } => {
    let definition = "";
    let partitionKey: string[] = [];
@@ -32,8 +31,8 @@ export const GlobalSecondaryIndexSourceComponent: React.FC<GlobalSecondaryIndexS
    useDatabases.getState().databases.find((database) => {
      const collection = database.collections().find((collection) => collection.id() === viewId);
      if (collection) {
-        const globalSecondaryIndexDefinition = collection.materializedViewDefinition();
-        globalSecondaryIndexDefinition && (definition = globalSecondaryIndexDefinition.definition);
+        const materializedViewDefinition = collection.materializedViewDefinition();
+        materializedViewDefinition && (definition = materializedViewDefinition.definition);
        collection.partitionKey?.paths && (partitionKey = collection.partitionKey.paths);
      }
    });
@@ -43,7 +42,7 @@ export const GlobalSecondaryIndexSourceComponent: React.FC<GlobalSecondaryIndexS

  //JSON value for the editor using the fetched id and definitions.
  const jsonValue = JSON.stringify(
-    globalSecondaryIndexes.map((view) => {
+    materializedViews.map((view) => {
      const { definition, partitionKey } = getViewDetails(view.id);
      return {
        name: view.id,
@@ -67,7 +66,7 @@ export const GlobalSecondaryIndexSourceComponent: React.FC<GlobalSecondaryIndexS
      editorRef.current = monacoInstance.editor.create(editorContainerRef.current, {
        value: jsonValue,
        language: "json",
-        ariaLabel: "Global Secondary Index JSON",
+        ariaLabel: "Materialized Views JSON",
        readOnly: true,
      });
    };
@@ -98,14 +97,14 @@ export const GlobalSecondaryIndexSourceComponent: React.FC<GlobalSecondaryIndexS
        }}
      />
      <PrimaryButton
-        text="Add index"
+        text="Add view"
        styles={{ root: { width: "fit-content", marginTop: 12 } }}
        onClick={() =>
          useSidePanel
            .getState()
            .openSidePanel(
-              GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
-              <AddGlobalSecondaryIndexPanel explorer={explorer} sourceContainer={collection} />,
+              MaterializedViewsLabels.NewMaterializedView,
+              <AddMaterializedViewPanel explorer={explorer} sourceContainer={collection} />,
            )
        }
      />
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexTargetComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/GlobalSecondaryIndexTargetComponent.test.tsx
@@ -3,9 +3,9 @@ import { Collection } from "Contracts/ViewModels";
 import { shallow } from "enzyme";
 import React from "react";
 import { collection } from "../TestUtils";
-import { GlobalSecondaryIndexTargetComponent } from "./GlobalSecondaryIndexTargetComponent";
+import { MaterializedViewTargetComponent } from "./MaterializedViewTargetComponent";

-describe("GlobalSecondaryIndexTargetComponent", () => {
+describe("MaterializedViewTargetComponent", () => {
  let testCollection: Collection;

  beforeEach(() => {
@@ -16,17 +16,17 @@ describe("GlobalSecondaryIndexTargetComponent", () => {
  });

  it("renders without crashing", () => {
-    const wrapper = shallow(<GlobalSecondaryIndexTargetComponent collection={testCollection} />);
+    const wrapper = shallow(<MaterializedViewTargetComponent collection={testCollection} />);
    expect(wrapper.exists()).toBe(true);
  });

  it("displays the source container ID", () => {
-    const wrapper = shallow(<GlobalSecondaryIndexTargetComponent collection={testCollection} />);
+    const wrapper = shallow(<MaterializedViewTargetComponent 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} />);
+  it("displays the materialized view definition", () => {
+    const wrapper = shallow(<MaterializedViewTargetComponent 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
@@ -2,14 +2,12 @@ import { Stack, Text } from "@fluentui/react";
 import * as React from "react";
 import * as ViewModels from "../../../../Contracts/ViewModels";

-export interface GlobalSecondaryIndexTargetComponentProps {
+export interface MaterializedViewTargetComponentProps {
  collection: ViewModels.Collection;
 }

-export const GlobalSecondaryIndexTargetComponent: React.FC<GlobalSecondaryIndexTargetComponentProps> = ({
-  collection,
-}) => {
-  const globalSecondaryIndexDefinition = collection?.materializedViewDefinition();
+export const MaterializedViewTargetComponent: React.FC<MaterializedViewTargetComponentProps> = ({ collection }) => {
+  const materializedViewDefinition = collection?.materializedViewDefinition();

  const textHeadingStyle = {
    root: { fontWeight: "600", fontSize: 16 },
@@ -25,19 +23,19 @@ export const GlobalSecondaryIndexTargetComponent: React.FC<GlobalSecondaryIndexT

  return (
    <Stack tokens={{ childrenGap: 15 }} styles={{ root: { maxWidth: 600 } }}>
-      <Text styles={textHeadingStyle}>Global Secondary Index Settings</Text>
+      <Text styles={textHeadingStyle}>Materialized View Settings</Text>

      <Stack tokens={{ childrenGap: 5 }}>
        <Text styles={{ root: { fontWeight: "600" } }}>Source container</Text>
        <Stack styles={valueBoxStyle}>
-          <Text>{globalSecondaryIndexDefinition?.sourceCollectionId}</Text>
+          <Text>{materializedViewDefinition?.sourceCollectionId}</Text>
        </Stack>
      </Stack>

      <Stack tokens={{ childrenGap: 5 }}>
-        <Text styles={{ root: { fontWeight: "600" } }}>Global secondary index definition</Text>
+        <Text styles={{ root: { fontWeight: "600" } }}>Materialized view definition</Text>
        <Stack styles={valueBoxStyle}>
-          <Text>{globalSecondaryIndexDefinition?.definition}</Text>
+          <Text>{materializedViewDefinition?.definition}</Text>
        </Stack>
      </Stack>
    </Stack>
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.test.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.test.tsx
@@ -1,41 +0,0 @@
-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,26 +29,16 @@ 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,
-  isReadOnly,
-}) => {
+export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({ database, collection, explorer }) => {
  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();
@@ -161,7 +151,7 @@ export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({
  return (
    <Stack tokens={{ childrenGap: 20 }} styles={{ root: { maxWidth: 600 } }}>
      <Stack tokens={{ childrenGap: 10 }}>
-        {!isReadOnly && <Text styles={textHeadingStyle}>Change {partitionKeyName.toLowerCase()}</Text>}
+        <Text styles={textHeadingStyle}>Change {partitionKeyName.toLowerCase()}</Text>
        <Stack horizontal tokens={{ childrenGap: 20 }}>
          <Stack tokens={{ childrenGap: 5 }}>
            <Text styles={textSubHeadingStyle}>Current {partitionKeyName.toLowerCase()}</Text>
@@ -173,61 +163,56 @@ export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({
          </Stack>
        </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>
-          )}
-        </>
+      <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,7 +9,6 @@ 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,7 +22,6 @@ export interface ScaleComponentProps {
  collection: ViewModels.Collection;
  database: ViewModels.Database;
  isFixedContainer: boolean;
-  isGlobalSecondaryIndex: boolean;
  onThroughputChange: (newThroughput: number) => void;
  throughput: number;
  throughputBaseline: number;
@@ -144,7 +143,6 @@ 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,7 +44,6 @@ 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,7 +80,6 @@ export interface ThroughputInputAutoPilotV3Props {
  throughputError?: string;
  instantMaximumThroughput: number;
  softAllowedMaximumThroughput: number;
-  isGlobalSecondaryIndex: boolean;
 }

 interface ThroughputInputAutoPilotV3State {
@@ -376,26 +375,22 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
            toolTipElement={getToolTipContainer(this.props.infoBubbleText)}
          />
        </Label>
-        {!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)}
-            />
-          </>
+        {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)}
+        />
      </Stack>
    );
  };
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/PartitionKeyComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/snapshots/PartitionKeyComponent.test.tsx.snap
@@ -1,196 +0,0 @@
-// 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,7 +1,6 @@
 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;
@@ -58,7 +57,7 @@ export enum SettingsV2TabTypes {
  ComputedPropertiesTab,
  ContainerVectorPolicyTab,
  ThroughputBucketsTab,
-  GlobalSecondaryIndexTab,
+  MaterializedViewTab,
 }

 export enum ContainerPolicyTabTypes {
@@ -166,15 +165,15 @@ export const getTabTitle = (tab: SettingsV2TabTypes): string => {
    case SettingsV2TabTypes.IndexingPolicyTab:
      return "Indexing Policy";
    case SettingsV2TabTypes.PartitionKeyTab:
-      return isFabricNative() ? "Partition Keys" : "Partition Keys (preview)";
+      return "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)";
+    case SettingsV2TabTypes.MaterializedViewTab:
+      return "Materialized Views (Preview)";
    default:
      throw new Error(`Unknown tab ${tab}`);
  }
--- a/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
+++ b/src/Explorer/Controls/Settings/snapshots/SettingsComponent.test.tsx.snap
@@ -79,7 +79,6 @@ exports[`SettingsComponent renders 1`] = `
          }
          isAutoPilotSelected={false}
          isFixedContainer={false}
-          isGlobalSecondaryIndex={true}
          onAutoPilotSelected={[Function]}
          onMaxAutoPilotThroughputChange={[Function]}
          onScaleDiscardableChange={[Function]}
@@ -307,7 +306,6 @@ exports[`SettingsComponent renders 1`] = `
              },
            }
          }
-          isReadOnly={false}
        />
      </PivotItem>
      <PivotItem
@@ -345,16 +343,16 @@ exports[`SettingsComponent renders 1`] = `
        />
      </PivotItem>
      <PivotItem
-        headerText="Global Secondary Index (Preview)"
-        itemKey="GlobalSecondaryIndexTab"
-        key="GlobalSecondaryIndexTab"
+        headerText="Materialized Views (Preview)"
+        itemKey="MaterializedViewTab"
+        key="MaterializedViewTab"
        style={
          {
            "marginTop": 20,
          }
        }
      >
-        <GlobalSecondaryIndexComponent
+        <MaterializedViewComponent
          collection={
            {
              "analyticalStorageTtl": [Function],
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -18,7 +18,6 @@ export interface ThroughputInputProps {
  isFreeTier: boolean;
  showFreeTierExceedThroughputTooltip: boolean;
  isQuickstart?: boolean;
-  isGlobalSecondaryIndex?: boolean;
  setThroughputValue: (throughput: number) => void;
  setIsAutoscale: (isAutoscale: boolean) => void;
  setIsThroughputCapExceeded: (isThroughputCapExceeded: boolean) => void;
@@ -31,7 +30,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  isFreeTier,
  showFreeTierExceedThroughputTooltip,
  isQuickstart,
-  isGlobalSecondaryIndex,
  setThroughputValue,
  setIsAutoscale,
  setIsThroughputCapExceeded,
@@ -195,41 +193,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>

-            <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>
-      )}
+      <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>
+
      {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,7 +6,6 @@ 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/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, Options } from "p-retry";
+import promiseRetry, { AbortError } 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: Options;
+  private retryOptions: promiseRetry.Options;
  private scheduleTimerId: NodeJS.Timeout;

  constructor(private onConnectionLost: () => void) {
--- a/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx
@@ -56,9 +56,9 @@ import {
  isVectorSearchEnabled,
 } from "Utils/CapabilityUtils";
 import { getUpsellMessage } from "Utils/PricingUtils";
-import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 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";
@@ -331,8 +331,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                    required
                    type="text"
                    autoComplete="off"
-                    pattern={ValidCosmosDbIdInputPattern.source}
-                    title={ValidCosmosDbIdDescription}
+                    pattern="[^/?#\\]*[^/?# \\]"
+                    title="May not end with space nor contain characters '\' '/' '#' '?'"
                    placeholder="Type a new database id"
                    size={40}
                    className="panelTextField"
@@ -439,8 +439,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
              aria-required
              required
              autoComplete="off"
-              pattern={ValidCosmosDbIdInputPattern.source}
-              title={ValidCosmosDbIdDescription}
+              pattern="[^/?#\\]*[^/?# \\]"
+              title="May not end with space nor contain characters '\' '/' '#' '?'"
              placeholder={`e.g., ${getCollectionName()}1`}
              size={40}
              className="panelTextField"
--- 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,6 +1,5 @@
 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";
@@ -205,8 +204,8 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
            type="text"
            aria-required="true"
            autoComplete="off"
-            pattern={ValidCosmosDbIdInputPattern.source}
-            title={ValidCosmosDbIdDescription}
+            pattern="[^/?#\\]*[^/?# \\]"
+            title="May not end with space nor contain characters '\' '/' '#' '?'"
            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
@@ -1,28 +0,0 @@
-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/Components/AdvancedComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AdvancedComponent.tsx
@@ -5,12 +5,12 @@ import React from "react";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";

-export interface AdvancedComponentProps {
+export interface AddMVAdvancedComponentProps {
  useHashV1: boolean;
  setUseHashV1: React.Dispatch<React.SetStateAction<boolean>>;
  setSubPartitionKeys: React.Dispatch<React.SetStateAction<string[]>>;
 }
-export const AdvancedComponent = (props: AdvancedComponentProps): JSX.Element => {
+export const AddMVAdvancedComponent = (props: AddMVAdvancedComponentProps): JSX.Element => {
  const { useHashV1, setUseHashV1, setSubPartitionKeys } = props;

  const useHashV1CheckboxOnChange = (isChecked: boolean): void => {
@@ -23,7 +23,7 @@ export const AdvancedComponent = (props: AdvancedComponentProps): JSX.Element =>
      title="Advanced"
      isExpandedByDefault={false}
      onExpand={() => {
-        TelemetryProcessor.traceOpen(Action.ExpandAddGlobalSecondaryIndexPaneAdvancedSection);
+        TelemetryProcessor.traceOpen(Action.ExpandAddMaterializedViewPaneAdvancedSection);
        scrollToSection("collapsibleAdvancedSectionContent");
      }}
    >
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AnalyticalStoreComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/AnalyticalStoreComponent.tsx
@@ -8,12 +8,12 @@ import {
 import React from "react";
 import { getCollectionName } from "Utils/APITypeUtils";

-export interface AnalyticalStoreComponentProps {
+export interface AddMVAnalyticalStoreComponentProps {
  explorer: Explorer;
  enableAnalyticalStore: boolean;
  setEnableAnalyticalStore: React.Dispatch<React.SetStateAction<boolean>>;
 }
-export const AnalyticalStoreComponent = (props: AnalyticalStoreComponentProps): JSX.Element => {
+export const AddMVAnalyticalStoreComponent = (props: AddMVAnalyticalStoreComponentProps): JSX.Element => {
  const { explorer, enableAnalyticalStore, setEnableAnalyticalStore } = props;

  const onEnableAnalyticalStoreRadioButtonChange = (checked: boolean): void => {
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/FullTextSearchComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/FullTextSearchComponent.tsx
@@ -5,13 +5,13 @@ import { FullTextPoliciesComponent } from "Explorer/Controls/FullTextSeach/FullT
 import { scrollToSection } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 import React from "react";

-export interface FullTextSearchComponentProps {
+export interface AddMVFullTextSearchComponentProps {
  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 => {
+export const AddMVFullTextSearchComponent = (props: AddMVFullTextSearchComponentProps): JSX.Element => {
  const { fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated } = props;

  return (
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/PartitionKeyComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/PartitionKeyComponent.tsx
@@ -7,7 +7,7 @@ import {
 } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 import React from "react";

-export interface PartitionKeyComponentProps {
+export interface AddMVPartitionKeyComponentProps {
  partitionKey?: string;
  setPartitionKey: React.Dispatch<React.SetStateAction<string>>;
  subPartitionKeys: string[];
@@ -15,7 +15,7 @@ export interface PartitionKeyComponentProps {
  useHashV1: boolean;
 }

-export const PartitionKeyComponent = (props: PartitionKeyComponentProps): JSX.Element => {
+export const AddMVPartitionKeyComponent = (props: AddMVPartitionKeyComponentProps): JSX.Element => {
  const { partitionKey, setPartitionKey, subPartitionKeys, setSubPartitionKeys, useHashV1 } = props;

  const partitionKeyValueOnChange = (value: string): void => {
@@ -50,7 +50,7 @@ export const PartitionKeyComponent = (props: PartitionKeyComponentProps): JSX.El

      <input
        type="text"
-        id="addGlobalSecondaryIndex-partitionKeyValue"
+        id="addmaterializedView-partitionKeyValue"
        aria-required
        required
        size={40}
@@ -77,8 +77,8 @@ export const PartitionKeyComponent = (props: PartitionKeyComponentProps): JSX.El
            ></div>
            <input
              type="text"
-              id="addGlobalSecondaryIndex-partitionKeyValue"
-              key={`addGlobalSecondaryIndex-partitionKeyValue_${subPartitionKeyIndex}`}
+              id="addMaterializedView-partitionKeyValue"
+              key={`addMaterializedView-partitionKeyValue_${subPartitionKeyIndex}`}
              aria-required
              required
              size={40}
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx
@@ -6,23 +6,25 @@ import React from "react";
 import { getCollectionName } from "Utils/APITypeUtils";
 import { isServerlessAccount } from "Utils/CapabilityUtils";

-export interface ThroughputComponentProps {
+export interface AddMVThroughputComponentProps {
  enableDedicatedThroughput: boolean;
  setEnabledDedicatedThroughput: React.Dispatch<React.SetStateAction<boolean>>;
  isSelectedSourceContainerSharedThroughput: () => boolean;
  showCollectionThroughputInput: () => boolean;
-  globalSecondaryIndexThroughputOnChange: (globalSecondaryIndexThroughputValue: number) => void;
+  materializedViewThroughputOnChange: (materializedViewThroughputValue: number) => void;
+  isMaterializedViewAutoscaleOnChange: (isMaterializedViewAutoscaleValue: boolean) => void;
  setIsThroughputCapExceeded: React.Dispatch<React.SetStateAction<boolean>>;
  isCostAknowledgedOnChange: (isCostAknowledgedValue: boolean) => void;
 }

-export const ThroughputComponent = (props: ThroughputComponentProps): JSX.Element => {
+export const AddMVThroughputComponent = (props: AddMVThroughputComponentProps): JSX.Element => {
  const {
    enableDedicatedThroughput,
    setEnabledDedicatedThroughput,
    isSelectedSourceContainerSharedThroughput,
    showCollectionThroughputInput,
-    globalSecondaryIndexThroughputOnChange,
+    materializedViewThroughputOnChange,
+    isMaterializedViewAutoscaleOnChange,
    setIsThroughputCapExceeded,
    isCostAknowledgedOnChange,
  } = props;
@@ -50,11 +52,12 @@ export const ThroughputComponent = (props: ThroughputComponentProps): JSX.Elemen
          isSharded={false}
          isFreeTier={isFreeTierAccount()}
          isQuickstart={false}
-          isGlobalSecondaryIndex={true}
          setThroughputValue={(throughput: number) => {
-            globalSecondaryIndexThroughputOnChange(throughput);
+            materializedViewThroughputOnChange(throughput);
+          }}
+          setIsAutoscale={(isAutoscale: boolean) => {
+            isMaterializedViewAutoscaleOnChange(isAutoscale);
          }}
-          setIsAutoscale={() => {}}
          setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) => {
            setIsThroughputCapExceeded(isThroughputCapExceeded);
          }}
--- a/src/Explorer/Panes/AddMaterializedViewPanel/AddMVUniqueKeysComponent.tsx
+++ b/src/Explorer/Panes/AddMaterializedViewPanel/AddMVUniqueKeysComponent.tsx
@@ -0,0 +1,78 @@
+import { ActionButton, IconButton, Stack } from "@fluentui/react";
+import { UniqueKeysHeader } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
+import React from "react";
+import { userContext } from "UserContext";
+
+export interface AddMVUniqueKeysComponentProps {
+  uniqueKeys: string[];
+  setUniqueKeys: React.Dispatch<React.SetStateAction<string[]>>;
+}
+
+export const AddMVUniqueKeysComponent = (props: AddMVUniqueKeysComponentProps): JSX.Element => {
+  const { uniqueKeys, setUniqueKeys } = props;
+
+  const updateUniqueKeysOnChange = (value: string, uniqueKeyToReplaceIndex: number): void => {
+    const updatedUniqueKeys = uniqueKeys.map((uniqueKey: string, uniqueKeyIndex: number) => {
+      if (uniqueKeyToReplaceIndex === uniqueKeyIndex) {
+        return value;
+      }
+      return uniqueKey;
+    });
+    setUniqueKeys(updatedUniqueKeys);
+  };
+
+  const deleteUniqueKeyOnClick = (uniqueKeyToDeleteIndex: number): void => {
+    const updatedUniqueKeys = uniqueKeys.filter((_, uniqueKeyIndex) => uniqueKeyToDeleteIndex !== uniqueKeyIndex);
+    setUniqueKeys(updatedUniqueKeys);
+  };
+
+  const addUniqueKeyOnClick = (): void => {
+    setUniqueKeys([...uniqueKeys, ""]);
+  };
+
+  return (
+    <Stack>
+      {UniqueKeysHeader()}
+
+      {uniqueKeys.map((uniqueKey: string, uniqueKeyIndex: number): JSX.Element => {
+        return (
+          <Stack style={{ marginBottom: 8 }} key={`uniqueKey-${uniqueKeyIndex}`} horizontal>
+            <input
+              type="text"
+              autoComplete="off"
+              placeholder={
+                userContext.apiType === "Mongo"
+                  ? "Comma separated paths e.g. firstName,address.zipCode"
+                  : "Comma separated paths e.g. /firstName,/address/zipCode"
+              }
+              className="panelTextField"
+              autoFocus
+              value={uniqueKey}
+              onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                updateUniqueKeysOnChange(event.target.value, uniqueKeyIndex);
+              }}
+            />
+
+            <IconButton
+              iconProps={{ iconName: "Delete" }}
+              style={{ height: 27 }}
+              onClick={() => {
+                deleteUniqueKeyOnClick(uniqueKeyIndex);
+              }}
+            />
+          </Stack>
+        );
+      })}
+
+      <ActionButton
+        iconProps={{ iconName: "Add" }}
+        styles={{ root: { padding: 0 }, label: { fontSize: 12 } }}
+        onClick={() => {
+          addUniqueKeyOnClick();
+        }}
+      >
+        Add unique key
+      </ActionButton>
+    </Stack>
+  );
+};
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx
@@ -8,7 +8,7 @@ import {
 } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 import React from "react";

-export interface VectorSearchComponentProps {
+export interface AddMVVectorSearchComponentProps {
  vectorEmbeddingPolicy: VectorEmbedding[];
  setVectorEmbeddingPolicy: React.Dispatch<React.SetStateAction<VectorEmbedding[]>>;
  vectorIndexingPolicy: VectorIndex[];
@@ -16,7 +16,7 @@ export interface VectorSearchComponentProps {
  setVectorPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
 }

-export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.Element => {
+export const AddMVVectorSearchComponent = (props: AddMVVectorSearchComponentProps): JSX.Element => {
  const {
    vectorEmbeddingPolicy,
    setVectorEmbeddingPolicy,
--- a/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.test.tsx
+++ b/src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.test.tsx
@@ -0,0 +1,28 @@
+import { shallow, ShallowWrapper } from "enzyme";
+import Explorer from "Explorer/Explorer";
+import {
+  AddMaterializedViewPanel,
+  AddMaterializedViewPanelProps,
+} from "Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel";
+import React, { Component } from "react";
+
+const props: AddMaterializedViewPanelProps = {
+  explorer: new Explorer(),
+};
+
+describe("AddMaterializedViewPanel", () => {
+  it("render default panel", () => {
+    const wrapper: ShallowWrapper<AddMaterializedViewPanelProps, object, Component> = shallow(
+      <AddMaterializedViewPanel {...props} />,
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("should render form", () => {
+    const wrapper: ShallowWrapper<AddMaterializedViewPanelProps, object, Component> = shallow(
+      <AddMaterializedViewPanel {...props} />,
+    );
+    const form = wrapper.find("form").first();
+    expect(form).toBeDefined();
+  });
+});
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx
@@ -11,7 +11,7 @@ import {
  TooltipHost,
 } from "@fluentui/react";
 import * as Constants from "Common/Constants";
-import { createGlobalSecondaryIndex } from "Common/dataAccess/createMaterializedView";
+import { createMaterializedView } from "Common/dataAccess/createMaterializedView";
 import { getErrorMessage, getErrorStack } from "Common/ErrorHandlingUtils";
 import * as DataModels from "Contracts/DataModels";
 import { FullTextIndex, FullTextPolicy, VectorEmbedding, VectorIndex } from "Contracts/DataModels";
@@ -22,19 +22,21 @@ import {
  FullTextPolicyDefault,
  getPartitionKey,
  isSynapseLinkEnabled,
+  parseUniqueKeys,
  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";
+} from "Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanelStyles";
+import { AddMVAdvancedComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVAdvancedComponent";
+import { AddMVAnalyticalStoreComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVAnalyticalStoreComponent";
+import { AddMVFullTextSearchComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVFullTextSearchComponent";
+import { AddMVPartitionKeyComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVPartitionKeyComponent";
+import { AddMVThroughputComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVThroughputComponent";
+import { AddMVUniqueKeysComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVUniqueKeysComponent";
+import { AddMVVectorSearchComponent } from "Explorer/Panes/AddMaterializedViewPanel/AddMVVectorSearchComponent";
 import { PanelFooterComponent } from "Explorer/Panes/PanelFooterComponent";
 import { PanelInfoErrorComponent } from "Explorer/Panes/PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "Explorer/Panes/PanelLoadingScreen";
@@ -46,31 +48,31 @@ 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 {
+export interface AddMaterializedViewPanelProps {
  explorer: Explorer;
  sourceContainer?: Collection;
 }
-export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanelProps): JSX.Element => {
+export const AddMaterializedViewPanel = (props: AddMaterializedViewPanelProps): JSX.Element => {
  const { explorer, sourceContainer } = props;

  const [sourceContainerOptions, setSourceContainerOptions] = useState<IDropdownOption[]>();
  const [selectedSourceContainer, setSelectedSourceContainer] = useState<Collection>(sourceContainer);
-  const [globalSecondaryIndexId, setGlobalSecondaryIndexId] = useState<string>();
+  const [materializedViewId, setMaterializedViewId] = 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 [uniqueKeys, setUniqueKeys] = useState<string[]>([]);
  const [enableAnalyticalStore, setEnableAnalyticalStore] = useState<boolean>();
-  const [vectorEmbeddingPolicy, setVectorEmbeddingPolicy] = useState<VectorEmbedding[]>([]);
-  const [vectorIndexingPolicy, setVectorIndexingPolicy] = useState<VectorIndex[]>([]);
-  const [vectorPolicyValidated, setVectorPolicyValidated] = useState<boolean>(true);
+  const [vectorEmbeddingPolicy, setVectorEmbeddingPolicy] = useState<VectorEmbedding[]>();
+  const [vectorIndexingPolicy, setVectorIndexingPolicy] = useState<VectorIndex[]>();
+  const [vectorPolicyValidated, setVectorPolicyValidated] = useState<boolean>();
  const [fullTextPolicy, setFullTextPolicy] = useState<FullTextPolicy>(FullTextPolicyDefault);
-  const [fullTextIndexes, setFullTextIndexes] = useState<FullTextIndex[]>([]);
-  const [fullTextPolicyValidated, setFullTextPolicyValidated] = useState<boolean>(true);
+  const [fullTextIndexes, setFullTextIndexes] = useState<FullTextIndex[]>();
+  const [fullTextPolicyValidated, setFullTextPolicyValidated] = useState<boolean>();
  const [errorMessage, setErrorMessage] = useState<string>();
  const [showErrorDetails, setShowErrorDetails] = useState<boolean>();
  const [isExecuting, setIsExecuting] = useState<boolean>();
@@ -85,13 +87,13 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
      });

      database.collections().forEach((collection: Collection) => {
-        const isGlobalSecondaryIndex: boolean = !!collection.materializedViewDefinition();
+        const isMaterializedView: boolean = !!collection.materializedViewDefinition();
        sourceContainerOptions.push({
          key: collection.rid,
          text: collection.id(),
-          disabled: isGlobalSecondaryIndex,
-          ...(isGlobalSecondaryIndex && {
-            title: "This is a global secondary index.",
+          disabled: isMaterializedView,
+          ...(isMaterializedView && {
+            title: "This is a materialized view.",
          }),
          data: collection,
        });
@@ -105,11 +107,16 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
    scrollToSection("panelContainer");
  }, [errorMessage]);

-  let globalSecondaryIndexThroughput: number;
+  let materializedViewThroughput: number;
+  let isMaterializedViewAutoscale: boolean;
  let isCostAcknowledged: boolean;

-  const globalSecondaryIndexThroughputOnChange = (globalSecondaryIndexThroughputValue: number): void => {
-    globalSecondaryIndexThroughput = globalSecondaryIndexThroughputValue;
+  const materializedViewThroughputOnChange = (materializedViewThroughputValue: number): void => {
+    materializedViewThroughput = materializedViewThroughputValue;
+  };
+
+  const isMaterializedViewAutoscaleOnChange = (isMaterializedViewAutoscaleValue: boolean): void => {
+    isMaterializedViewAutoscale = isMaterializedViewAutoscaleValue;
  };

  const isCostAknowledgedOnChange = (isCostAcknowledgedValue: boolean): void => {
@@ -169,13 +176,15 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
      return false;
    }

-    if (globalSecondaryIndexThroughput > CollectionCreation.DefaultCollectionRUs100K && !isCostAcknowledged) {
-      const errorMessage: string = "Please acknowledge the estimated monthly spend.";
+    if (materializedViewThroughput > CollectionCreation.DefaultCollectionRUs100K && !isCostAcknowledged) {
+      const errorMessage = isMaterializedViewAutoscale
+        ? "Please acknowledge the estimated monthly spend."
+        : "Please acknowledge the estimated daily spend.";
      setErrorMessage(errorMessage);
      return false;
    }

-    if (globalSecondaryIndexThroughput > CollectionCreation.MaxRUPerPartition) {
+    if (materializedViewThroughput > CollectionCreation.MaxRUPerPartition) {
      setErrorMessage("Unsharded collections support up to 10,000 RUs");
      return false;
    }
@@ -202,15 +211,16 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
      return;
    }

-    const globalSecondaryIdTrimmed: string = globalSecondaryIndexId.trim();
+    const materializedViewIdTrimmed: string = materializedViewId.trim();

-    const globalSecondaryIndexDefinition: DataModels.MaterializedViewDefinition = {
-      sourceCollectionId: selectedSourceContainer.id(),
+    const materializedViewDefinition: DataModels.MaterializedViewDefinition = {
+      sourceCollectionId: sourceContainer.id(),
      definition: definition,
    };

    const partitionKeyTrimmed: string = partitionKey.trim();

+    const uniqueKeyPolicy: DataModels.UniqueKeyPolicy = parseUniqueKeys(uniqueKeys);
    const partitionKeyVersion = useHashV1 ? undefined : 2;
    const partitionKeyPaths: DataModels.PartitionKey = partitionKeyTrimmed
      ? {
@@ -243,10 +253,11 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
        shared: isSelectedSourceContainerSharedThroughput(),
      },
      collection: {
-        id: globalSecondaryIdTrimmed,
-        throughput: globalSecondaryIndexThroughput,
-        isAutoscale: true,
+        id: materializedViewIdTrimmed,
+        throughput: materializedViewThroughput,
+        isAutoscale: isMaterializedViewAutoscale,
        partitionKeyPaths,
+        uniqueKeyPolicy,
        collectionWithDedicatedThroughput: enableDedicatedThroughput,
      },
      subscriptionQuotaId: userContext.quotaId,
@@ -256,17 +267,28 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
    const startKey: number = TelemetryProcessor.traceStart(Action.CreateCollection, telemetryData);
    const databaseLevelThroughput: boolean = isSelectedSourceContainerSharedThroughput() && !enableDedicatedThroughput;

-    const createGlobalSecondaryIndexParams: DataModels.CreateMaterializedViewsParams = {
-      materializedViewId: globalSecondaryIdTrimmed,
-      materializedViewDefinition: globalSecondaryIndexDefinition,
+    let offerThroughput: number;
+    let autoPilotMaxThroughput: number;
+
+    if (!databaseLevelThroughput) {
+      if (isMaterializedViewAutoscale) {
+        autoPilotMaxThroughput = materializedViewThroughput;
+      } else {
+        offerThroughput = materializedViewThroughput;
+      }
+    }
+
+    const createMaterializedViewParams: DataModels.CreateMaterializedViewsParams = {
+      materializedViewId: materializedViewIdTrimmed,
+      materializedViewDefinition: materializedViewDefinition,
      databaseId: selectedSourceContainer.databaseId,
      databaseLevelThroughput: databaseLevelThroughput,
-      ...(!databaseLevelThroughput && {
-        autoPilotMaxThroughput: globalSecondaryIndexThroughput,
-      }),
+      offerThroughput: offerThroughput,
+      autoPilotMaxThroughput: autoPilotMaxThroughput,
      analyticalStorageTtl: getAnalyticalStorageTtl(),
      indexingPolicy: indexingPolicy,
      partitionKey: partitionKeyPaths,
+      uniqueKeyPolicy: uniqueKeyPolicy,
      vectorEmbeddingPolicy: vectorEmbeddingPolicyFinal,
      fullTextPolicy: fullTextPolicy,
    };
@@ -274,23 +296,23 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
    setIsExecuting(true);

    try {
-      await createGlobalSecondaryIndex(createGlobalSecondaryIndexParams);
+      await createMaterializedView(createMaterializedViewParams);
      await explorer.refreshAllDatabases();
-      TelemetryProcessor.traceSuccess(Action.CreateGlobalSecondaryIndex, telemetryData, startKey);
+      TelemetryProcessor.traceSuccess(Action.CreateMaterializedView, 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);
+      TelemetryProcessor.traceFailure(Action.CreateMaterializedView, failureTelemetryData, startKey);
    } finally {
      setIsExecuting(false);
    }
  };

  return (
-    <form className="panelFormWrapper" id="panelGlobalSecondaryIndex" onSubmit={submit}>
+    <form className="panelFormWrapper" id="panelMaterializedView" onSubmit={submit}>
      {errorMessage && (
        <PanelInfoErrorComponent message={errorMessage} messageType="error" showErrorDetails={showErrorDetails} />
      )}
@@ -305,7 +327,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
          <Dropdown
            placeholder="Choose source container"
            options={sourceContainerOptions}
-            defaultSelectedKey={selectedSourceContainer?.rid}
+            defaultSelectedKey={sourceContainer?.rid}
            styles={chooseSourceContainerStyles()}
            style={chooseSourceContainerStyle()}
            onChange={(_, options: IDropdownOption) => setSelectedSourceContainer(options.data as Collection)}
@@ -314,27 +336,27 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
          <Stack horizontal>
            <span className="mandatoryStar">*&nbsp;</span>
            <Text className="panelTextBold" variant="small">
-              Global secondary index container id
+              View container id
            </Text>
          </Stack>
          <input
-            id="globalSecondaryIndexId"
+            id="materializedViewId"
            type="text"
            aria-required
            required
            autoComplete="off"
-            pattern={ValidCosmosDbIdInputPattern.source}
-            title={ValidCosmosDbIdDescription}
-            placeholder={`e.g., indexbyEmailId`}
+            pattern="[^/?#\\]*[^/?# \\]"
+            title="May not end with space nor contain characters '\' '/' '#' '?'"
+            placeholder={`e.g., viewByEmailId`}
            size={40}
            className="panelTextField"
-            value={globalSecondaryIndexId}
-            onChange={(event: React.ChangeEvent<HTMLInputElement>) => setGlobalSecondaryIndexId(event.target.value)}
+            value={materializedViewId}
+            onChange={(event: React.ChangeEvent<HTMLInputElement>) => setMaterializedViewId(event.target.value)}
          />
          <Stack horizontal>
            <span className="mandatoryStar">*&nbsp;</span>
            <Text className="panelTextBold" variant="small">
-              Global secondary index definition
+              Materialized View Definition
            </Text>
            <TooltipHost
              directionalHint={DirectionalHint.bottomLeftEdge}
@@ -343,7 +365,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
                  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.
+                  Learn more about defining materialized views.
                </Link>
              }
            >
@@ -351,7 +373,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
            </TooltipHost>
          </Stack>
          <input
-            id="globalSecondaryIndexDefinition"
+            id="materializedViewDefinition"
            type="text"
            aria-required
            required
@@ -362,25 +384,27 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
            value={definition || ""}
            onChange={(event: React.ChangeEvent<HTMLInputElement>) => setDefinition(event.target.value)}
          />
-          <PartitionKeyComponent
+          <AddMVPartitionKeyComponent
            {...{ partitionKey, setPartitionKey, subPartitionKeys, setSubPartitionKeys, useHashV1 }}
          />
-          <ThroughputComponent
+          <AddMVThroughputComponent
            {...{
              enableDedicatedThroughput,
              setEnabledDedicatedThroughput,
              isSelectedSourceContainerSharedThroughput,
              showCollectionThroughputInput,
-              globalSecondaryIndexThroughputOnChange,
+              materializedViewThroughputOnChange,
+              isMaterializedViewAutoscaleOnChange,
              setIsThroughputCapExceeded,
              isCostAknowledgedOnChange,
            }}
          />
+          <AddMVUniqueKeysComponent {...{ uniqueKeys, setUniqueKeys }} />
          {shouldShowAnalyticalStoreOptions() && (
-            <AnalyticalStoreComponent {...{ explorer, enableAnalyticalStore, setEnableAnalyticalStore }} />
+            <AddMVAnalyticalStoreComponent {...{ explorer, enableAnalyticalStore, setEnableAnalyticalStore }} />
          )}
          {showVectorSearchParameters() && (
-            <VectorSearchComponent
+            <AddMVVectorSearchComponent
              {...{
                vectorEmbeddingPolicy,
                setVectorEmbeddingPolicy,
@@ -392,11 +416,11 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
            />
          )}
          {showFullTextSearchParameters() && (
-            <FullTextSearchComponent
+            <AddMVFullTextSearchComponent
              {...{ fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated }}
            />
          )}
-          <AdvancedComponent {...{ useHashV1, setUseHashV1, setSubPartitionKeys }} />
+          <AddMVAdvancedComponent {...{ useHashV1, setUseHashV1, setSubPartitionKeys }} />
        </Stack>
      </div>
      <PanelFooterComponent buttonLabel="OK" isButtonDisabled={isThroughputCapExceeded} />
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanelStyles.ts
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanelStyles.ts
--- a/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/snapshots/AddGlobalSecondaryIndexPanel.test.tsx.snap
+++ b/src/Explorer/Panes/AddGlobalSecondaryIndexPanel/snapshots/AddGlobalSecondaryIndexPanel.test.tsx.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
+exports[`AddMaterializedViewPanel render default panel 1`] = `
 <form
  className="panelFormWrapper"
-  id="panelGlobalSecondaryIndex"
+  id="panelMaterializedView"
  onSubmit={[Function]}
 >
  <div
@@ -67,17 +67,17 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
          className="panelTextBold"
          variant="small"
        >
-          Global secondary index container id
+          View container id
        </Text>
      </Stack>
      <input
        aria-required={true}
        autoComplete="off"
        className="panelTextField"
-        id="globalSecondaryIndexId"
+        id="materializedViewId"
        onChange={[Function]}
-        pattern="[^\\/?#\\\\]*[^\\/?# \\\\]"
-        placeholder="e.g., indexbyEmailId"
+        pattern="[^/?#\\\\]*[^/?# \\\\]"
+        placeholder="e.g., viewByEmailId"
        required={true}
        size={40}
        title="May not end with space nor contain characters '\\' '/' '#' '?'"
@@ -95,7 +95,7 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
          className="panelTextBold"
          variant="small"
        >
-          Global secondary index definition
+          Materialized View Definition
        </Text>
        <StyledTooltipHostBase
          content={
@@ -103,7 +103,7 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
              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.
+              Learn more about defining materialized views.
            </StyledLinkBase>
          }
          directionalHint={4}
@@ -120,7 +120,7 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
        aria-required={true}
        autoComplete="off"
        className="panelTextField"
-        id="globalSecondaryIndexDefinition"
+        id="materializedViewDefinition"
        onChange={[Function]}
        placeholder="SELECT c.email, c.accountId FROM c"
        required={true}
@@ -128,21 +128,26 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
        type="text"
        value=""
      />
-      <PartitionKeyComponent
+      <AddMVPartitionKeyComponent
        partitionKey=""
        setPartitionKey={[Function]}
        setSubPartitionKeys={[Function]}
        subPartitionKeys={[]}
      />
-      <ThroughputComponent
-        globalSecondaryIndexThroughputOnChange={[Function]}
+      <AddMVThroughputComponent
        isCostAknowledgedOnChange={[Function]}
+        isMaterializedViewAutoscaleOnChange={[Function]}
        isSelectedSourceContainerSharedThroughput={[Function]}
+        materializedViewThroughputOnChange={[Function]}
        setEnabledDedicatedThroughput={[Function]}
        setIsThroughputCapExceeded={[Function]}
        showCollectionThroughputInput={[Function]}
      />
-      <AnalyticalStoreComponent
+      <AddMVUniqueKeysComponent
+        setUniqueKeys={[Function]}
+        uniqueKeys={[]}
+      />
+      <AddMVAnalyticalStoreComponent
        explorer={
          Explorer {
            "_isInitializingNotebooks": false,
@@ -172,7 +177,7 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
        }
        setEnableAnalyticalStore={[Function]}
      />
-      <AdvancedComponent
+      <AddMVAdvancedComponent
        setSubPartitionKeys={[Function]}
        setUseHashV1={[Function]}
      />
--- a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
+++ b/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
@@ -7,7 +7,6 @@ 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";
@@ -203,8 +202,8 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
                required={true}
                autoComplete="off"
                styles={getTextFieldStyles()}
-                pattern={ValidCosmosDbIdInputPattern.source}
-                title={ValidCosmosDbIdDescription}
+                pattern="[^/?#\\-]*[^/?#- \\]"
+                title="May not end with space nor contain characters '\' '/' '#' '?' '-'"
                placeholder="Type a new keyspace id"
                size={40}
                value={newKeyspaceId}
@@ -293,8 +292,8 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
              required={true}
              ariaLabel="addCollection-table Id Create table"
              autoComplete="off"
-              pattern={ValidCosmosDbIdInputPattern.source}
-              title={ValidCosmosDbIdDescription}
+              pattern="[^/?#\\-]*[^/?#- \\]"
+              title="May not end with space nor contain characters '\' '/' '#' '?' '-'"
              placeholder="Enter table Id"
              size={20}
              value={tableId}
--- a/src/Explorer/Panes/ChangePartitionKeyPane/ChangePartitionKeyPane.tsx
+++ b/src/Explorer/Panes/ChangePartitionKeyPane/ChangePartitionKeyPane.tsx
@@ -28,7 +28,6 @@ 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";

@@ -236,8 +235,8 @@ export const ChangePartitionKeyPane: React.FC<ChangePartitionKeyPaneProps> = ({
                aria-required
                required
                autoComplete="off"
-                pattern={ValidCosmosDbIdInputPattern.source}
-                title={ValidCosmosDbIdDescription}
+                pattern="[^/?#\\]*[^/?# \\]"
+                title="May not end with space nor contain characters '\' '/' '#' '?'"
                placeholder={`e.g., ${getCollectionName()}1`}
                size={40}
                className="panelTextField"
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -6,9 +6,7 @@ import {
  Checkbox,
  ChoiceGroup,
  DefaultButton,
-  Dropdown,
  IChoiceGroupOption,
-  IDropdownOption,
  ISpinButtonStyles,
  IToggleStyles,
  Position,
@@ -23,15 +21,7 @@ import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { Platform, configContext } from "ConfigContext";
 import { useDialog } from "Explorer/Controls/Dialog";
 import { useDatabases } from "Explorer/useDatabases";
-import { isFabric, isFabricNative } from "Platform/Fabric/FabricUtil";
-import {
-  AppStateComponentNames,
-  deleteAllStates,
-  deleteState,
-  hasState,
-  loadState,
-  saveState,
-} from "Shared/AppStatePersistenceUtility";
+import { deleteAllStates } from "Shared/AppStatePersistenceUtility";
 import {
  DefaultRUThreshold,
  LocalStorageUtility,
@@ -47,7 +37,6 @@ import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
 import { logConsoleError, logConsoleInfo } from "Utils/NotificationConsoleUtils";
 import * as PriorityBasedExecutionUtils from "Utils/PriorityBasedExecutionUtils";
 import { getReadOnlyKeys, listKeys } from "Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { useClientWriteEnabled } from "hooks/useClientWriteEnabled";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { useSidePanel } from "hooks/useSidePanel";
 import React, { FunctionComponent, useState } from "react";
@@ -154,17 +143,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
      ? LocalStorageUtility.getEntryString(StorageKey.IsGraphAutoVizDisabled)
      : "false",
  );
-  const [selectedRegionalEndpoint, setSelectedRegionalEndpoint] = useState<string>(
-    hasState({
-      componentName: AppStateComponentNames.SelectedRegionalEndpoint,
-      globalAccountName: userContext.databaseAccount?.name,
-    })
-      ? (loadState({
-          componentName: AppStateComponentNames.SelectedRegionalEndpoint,
-          globalAccountName: userContext.databaseAccount?.name,
-        }) as string)
-      : undefined,
-  );
  const [retryAttempts, setRetryAttempts] = useState<number>(
    LocalStorageUtility.hasItem(StorageKey.RetryAttempts)
      ? LocalStorageUtility.getEntryNumber(StorageKey.RetryAttempts)
@@ -211,44 +189,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    configContext.platform !== Platform.Fabric &&
    !isEmulator;
  const shouldShowPriorityLevelOption = PriorityBasedExecutionUtils.isFeatureEnabled() && !isEmulator;
-
-  const uniqueAccountRegions = new Set<string>();
-  const regionOptions: IDropdownOption[] = [];
-  regionOptions.push({
-    key: userContext?.databaseAccount?.properties?.documentEndpoint,
-    text: `Global (Default)`,
-    data: {
-      isGlobal: true,
-      writeEnabled: true,
-    },
-  });
-  userContext?.databaseAccount?.properties?.writeLocations?.forEach((loc) => {
-    if (!uniqueAccountRegions.has(loc.locationName)) {
-      uniqueAccountRegions.add(loc.locationName);
-      regionOptions.push({
-        key: loc.documentEndpoint,
-        text: `${loc.locationName} (Read/Write)`,
-        data: {
-          isGlobal: false,
-          writeEnabled: true,
-        },
-      });
-    }
-  });
-  userContext?.databaseAccount?.properties?.readLocations?.forEach((loc) => {
-    if (!uniqueAccountRegions.has(loc.locationName)) {
-      uniqueAccountRegions.add(loc.locationName);
-      regionOptions.push({
-        key: loc.documentEndpoint,
-        text: `${loc.locationName} (Read)`,
-        data: {
-          isGlobal: false,
-          writeEnabled: false,
-        },
-      });
-    }
-  });
-
  const shouldShowCopilotSampleDBOption =
    userContext.apiType === "SQL" &&
    useQueryCopilot.getState().copilotEnabled &&
@@ -334,46 +274,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
      }
    }

-    const storedRegionalEndpoint = loadState({
-      componentName: AppStateComponentNames.SelectedRegionalEndpoint,
-      globalAccountName: userContext.databaseAccount?.name,
-    }) as string;
-    const selectedRegionIsGlobal =
-      selectedRegionalEndpoint === userContext?.databaseAccount?.properties?.documentEndpoint;
-    if (selectedRegionIsGlobal && storedRegionalEndpoint) {
-      deleteState({
-        componentName: AppStateComponentNames.SelectedRegionalEndpoint,
-        globalAccountName: userContext.databaseAccount?.name,
-      });
-      updateUserContext({
-        selectedRegionalEndpoint: undefined,
-        writeEnabledInSelectedRegion: true,
-        refreshCosmosClient: true,
-      });
-      useClientWriteEnabled.setState({ clientWriteEnabled: true });
-    } else if (
-      selectedRegionalEndpoint &&
-      !selectedRegionIsGlobal &&
-      selectedRegionalEndpoint !== storedRegionalEndpoint
-    ) {
-      saveState(
-        {
-          componentName: AppStateComponentNames.SelectedRegionalEndpoint,
-          globalAccountName: userContext.databaseAccount?.name,
-        },
-        selectedRegionalEndpoint,
-      );
-      const validWriteEndpoint = userContext.databaseAccount?.properties?.writeLocations?.find(
-        (loc) => loc.documentEndpoint === selectedRegionalEndpoint,
-      );
-      updateUserContext({
-        selectedRegionalEndpoint: selectedRegionalEndpoint,
-        writeEnabledInSelectedRegion: !!validWriteEndpoint,
-        refreshCosmosClient: true,
-      });
-      useClientWriteEnabled.setState({ clientWriteEnabled: !!validWriteEndpoint });
-    }
-
    LocalStorageUtility.setEntryBoolean(StorageKey.RUThresholdEnabled, ruThresholdEnabled);
    LocalStorageUtility.setEntryBoolean(StorageKey.QueryTimeoutEnabled, queryTimeoutEnabled);
    LocalStorageUtility.setEntryNumber(StorageKey.RetryAttempts, retryAttempts);
@@ -523,10 +423,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
    setDefaultQueryResultsView(option.key as SplitterDirection);
  };

-  const handleOnSelectedRegionOptionChange = (ev: React.FormEvent<HTMLInputElement>, option: IDropdownOption): void => {
-    setSelectedRegionalEndpoint(option.key as string);
-  };
-
  const handleOnQueryRetryAttemptsSpinButtonChange = (ev: React.MouseEvent<HTMLElement>, newValue?: string): void => {
    const retryAttempts = Number(newValue);
    if (!isNaN(retryAttempts)) {
@@ -607,447 +503,410 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
  return (
    <RightPaneForm {...genericPaneProps}>
      <div className={`paneMainContent ${styles.container}`}>
-        {!isFabricNative() && (
-          <Accordion className={`customAccordion ${styles.firstItem}`}>
-            {shouldShowQueryPageOptions && (
-              <AccordionItem value="1">
-                <AccordionHeader>
-                  <div className={styles.header}>Page Options</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as
-                      many query results per page.
-                    </div>
-                    <ChoiceGroup
-                      ariaLabelledBy="pageOptions"
-                      selectedKey={pageOption}
-                      options={pageOptionList}
-                      styles={choiceButtonStyles}
-                      onChange={handleOnPageOptionChange}
-                    />
+        <Accordion className={`customAccordion ${styles.firstItem}`}>
+          {shouldShowQueryPageOptions && (
+            <AccordionItem value="1">
+              <AccordionHeader>
+                <div className={styles.header}>Page Options</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Choose Custom to specify a fixed amount of query results to show, or choose Unlimited to show as
+                    many query results per page.
                  </div>
-                  <div className={`tabs ${styles.settingsSectionContainer}`}>
-                    {isCustomPageOptionSelected() && (
-                      <div className="tabcontent">
-                        <div className={styles.settingsSectionDescription}>
-                          Query results per page{" "}
-                          <InfoTooltip className={styles.headerIcon}>
-                            Enter the number of query results that should be shown per page.
-                          </InfoTooltip>
-                        </div>
-
-                        <SpinButton
-                          ariaLabel="Custom query items per page"
-                          value={"" + customItemPerPage}
-                          onIncrement={(newValue) => {
-                            setCustomItemPerPage(parseInt(newValue) + 1 || customItemPerPage);
-                          }}
-                          onDecrement={(newValue) => setCustomItemPerPage(parseInt(newValue) - 1 || customItemPerPage)}
-                          onValidate={(newValue) => setCustomItemPerPage(parseInt(newValue) || customItemPerPage)}
-                          min={1}
-                          step={1}
-                          className="textfontclr"
-                          incrementButtonAriaLabel="Increase value by 1"
-                          decrementButtonAriaLabel="Decrease value by 1"
-                        />
+                  <ChoiceGroup
+                    ariaLabelledBy="pageOptions"
+                    selectedKey={pageOption}
+                    options={pageOptionList}
+                    styles={choiceButtonStyles}
+                    onChange={handleOnPageOptionChange}
+                  />
+                </div>
+                <div className={`tabs ${styles.settingsSectionContainer}`}>
+                  {isCustomPageOptionSelected() && (
+                    <div className="tabcontent">
+                      <div className={styles.settingsSectionDescription}>
+                        Query results per page{" "}
+                        <InfoTooltip className={styles.headerIcon}>
+                          Enter the number of query results that should be shown per page.
+                        </InfoTooltip>
                      </div>
-                    )}
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {showEnableEntraIdRbac && (
-              <AccordionItem value="2">
-                <AccordionHeader>
-                  <div className={styles.header}>Enable Entra ID RBAC</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Choose Automatic to enable Entra ID RBAC automatically. True/False to force enable/disable Entra
-                      ID RBAC.
-                      <a
-                        href="https://learn.microsoft.com/en-us/azure/cosmos-db/how-to-setup-rbac#use-data-explorer"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
-                        {" "}
-                        Learn more{" "}
-                      </a>
+
+                      <SpinButton
+                        ariaLabel="Custom query items per page"
+                        value={"" + customItemPerPage}
+                        onIncrement={(newValue) => {
+                          setCustomItemPerPage(parseInt(newValue) + 1 || customItemPerPage);
+                        }}
+                        onDecrement={(newValue) => setCustomItemPerPage(parseInt(newValue) - 1 || customItemPerPage)}
+                        onValidate={(newValue) => setCustomItemPerPage(parseInt(newValue) || customItemPerPage)}
+                        min={1}
+                        step={1}
+                        className="textfontclr"
+                        incrementButtonAriaLabel="Increase value by 1"
+                        decrementButtonAriaLabel="Decrease value by 1"
+                      />
                    </div>
-                    <ChoiceGroup
-                      ariaLabelledBy="enableDataPlaneRBACOptions"
-                      options={dataPlaneRBACOptionsList}
-                      styles={choiceButtonStyles}
-                      selectedKey={enableDataPlaneRBACOption}
-                      onChange={handleOnDataPlaneRBACOptionChange}
-                    />
+                  )}
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {showEnableEntraIdRbac && (
+            <AccordionItem value="2">
+              <AccordionHeader>
+                <div className={styles.header}>Enable Entra ID RBAC</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Choose Automatic to enable Entra ID RBAC automatically. True/False to force enable/disable Entra ID
+                    RBAC.
+                    <a
+                      href="https://learn.microsoft.com/en-us/azure/cosmos-db/how-to-setup-rbac#use-data-explorer"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      {" "}
+                      Learn more{" "}
+                    </a>
                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {userContext.apiType === "SQL" && userContext.authType === AuthType.AAD && !isFabric() && (
+                  <ChoiceGroup
+                    ariaLabelledBy="enableDataPlaneRBACOptions"
+                    options={dataPlaneRBACOptionsList}
+                    styles={choiceButtonStyles}
+                    selectedKey={enableDataPlaneRBACOption}
+                    onChange={handleOnDataPlaneRBACOptionChange}
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {userContext.apiType === "SQL" && !isEmulator && (
+            <>
              <AccordionItem value="3">
                <AccordionHeader>
-                  <div className={styles.header}>Region Selection</div>
+                  <div className={styles.header}>Query Timeout</div>
                </AccordionHeader>
                <AccordionPanel>
                  <div className={styles.settingsSectionContainer}>
                    <div className={styles.settingsSectionDescription}>
-                      Changes region the Cosmos Client uses to access account.
+                      When a query reaches a specified time limit, a popup with an option to cancel the query will show
+                      unless automatic cancellation has been enabled.
                    </div>
-                    <div>
-                      <span className={styles.subHeader}>Select Region</span>
-                      <InfoTooltip className={styles.headerIcon}>
-                        Changes the account endpoint used to perform client operations.
-                      </InfoTooltip>
-                    </div>
-                    <Dropdown
-                      placeholder={
-                        selectedRegionalEndpoint
-                          ? regionOptions.find((option) => option.key === selectedRegionalEndpoint)?.text
-                          : regionOptions[0]?.text
-                      }
-                      onChange={handleOnSelectedRegionOptionChange}
-                      options={regionOptions}
-                      styles={{ root: { marginBottom: "10px" } }}
+                    <Toggle
+                      styles={toggleStyles}
+                      label="Enable query timeout"
+                      onChange={handleOnQueryTimeoutToggleChange}
+                      defaultChecked={queryTimeoutEnabled}
                    />
                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {userContext.apiType === "SQL" && !isEmulator && (
-              <>
-                <AccordionItem value="4">
-                  <AccordionHeader>
-                    <div className={styles.header}>Query Timeout</div>
-                  </AccordionHeader>
-                  <AccordionPanel>
+                  {queryTimeoutEnabled && (
                    <div className={styles.settingsSectionContainer}>
-                      <div className={styles.settingsSectionDescription}>
-                        When a query reaches a specified time limit, a popup with an option to cancel the query will
-                        show unless automatic cancellation has been enabled.
-                      </div>
+                      <SpinButton
+                        label="Query timeout (ms)"
+                        labelPosition={Position.top}
+                        defaultValue={(queryTimeout || 5000).toString()}
+                        min={100}
+                        step={1000}
+                        onChange={handleOnQueryTimeoutSpinButtonChange}
+                        incrementButtonAriaLabel="Increase value by 1000"
+                        decrementButtonAriaLabel="Decrease value by 1000"
+                        styles={spinButtonStyles}
+                      />
                      <Toggle
+                        label="Automatically cancel query after timeout"
                        styles={toggleStyles}
-                        label="Enable query timeout"
-                        onChange={handleOnQueryTimeoutToggleChange}
-                        defaultChecked={queryTimeoutEnabled}
+                        onChange={handleOnAutomaticallyCancelQueryToggleChange}
+                        defaultChecked={automaticallyCancelQueryAfterTimeout}
                      />
                    </div>
-                    {queryTimeoutEnabled && (
-                      <div className={styles.settingsSectionContainer}>
-                        <SpinButton
-                          label="Query timeout (ms)"
-                          labelPosition={Position.top}
-                          defaultValue={(queryTimeout || 5000).toString()}
-                          min={100}
-                          step={1000}
-                          onChange={handleOnQueryTimeoutSpinButtonChange}
-                          incrementButtonAriaLabel="Increase value by 1000"
-                          decrementButtonAriaLabel="Decrease value by 1000"
-                          styles={spinButtonStyles}
-                        />
-                        <Toggle
-                          label="Automatically cancel query after timeout"
-                          styles={toggleStyles}
-                          onChange={handleOnAutomaticallyCancelQueryToggleChange}
-                          defaultChecked={automaticallyCancelQueryAfterTimeout}
-                        />
-                      </div>
-                    )}
-                  </AccordionPanel>
-                </AccordionItem>
+                  )}
+                </AccordionPanel>
+              </AccordionItem>

-                <AccordionItem value="5">
-                  <AccordionHeader>
-                    <div className={styles.header}>RU Limit</div>
-                  </AccordionHeader>
-                  <AccordionPanel>
+              <AccordionItem value="4">
+                <AccordionHeader>
+                  <div className={styles.header}>RU Limit</div>
+                </AccordionHeader>
+                <AccordionPanel>
+                  <div className={styles.settingsSectionContainer}>
+                    <div className={styles.settingsSectionDescription}>
+                      If a query exceeds a configured RU limit, the query will be aborted.
+                    </div>
+                    <Toggle
+                      styles={toggleStyles}
+                      label="Enable RU limit"
+                      onChange={handleOnRUThresholdToggleChange}
+                      defaultChecked={ruThresholdEnabled}
+                    />
+                  </div>
+                  {ruThresholdEnabled && (
                    <div className={styles.settingsSectionContainer}>
-                      <div className={styles.settingsSectionDescription}>
-                        If a query exceeds a configured RU limit, the query will be aborted.
-                      </div>
-                      <Toggle
-                        styles={toggleStyles}
-                        label="Enable RU limit"
-                        onChange={handleOnRUThresholdToggleChange}
-                        defaultChecked={ruThresholdEnabled}
+                      <SpinButton
+                        label="RU Limit (RU)"
+                        labelPosition={Position.top}
+                        defaultValue={(ruThreshold || DefaultRUThreshold).toString()}
+                        min={1}
+                        step={1000}
+                        onChange={handleOnRUThresholdSpinButtonChange}
+                        incrementButtonAriaLabel="Increase value by 1000"
+                        decrementButtonAriaLabel="Decrease value by 1000"
+                        styles={spinButtonStyles}
                      />
                    </div>
-                    {ruThresholdEnabled && (
-                      <div className={styles.settingsSectionContainer}>
-                        <SpinButton
-                          label="RU Limit (RU)"
-                          labelPosition={Position.top}
-                          defaultValue={(ruThreshold || DefaultRUThreshold).toString()}
-                          min={1}
-                          step={1000}
-                          onChange={handleOnRUThresholdSpinButtonChange}
-                          incrementButtonAriaLabel="Increase value by 1000"
-                          decrementButtonAriaLabel="Decrease value by 1000"
-                          styles={spinButtonStyles}
-                        />
-                      </div>
-                    )}
-                  </AccordionPanel>
-                </AccordionItem>
+                  )}
+                </AccordionPanel>
+              </AccordionItem>

-                <AccordionItem value="6">
-                  <AccordionHeader>
-                    <div className={styles.header}>Default Query Results View</div>
-                  </AccordionHeader>
-                  <AccordionPanel>
-                    <div className={styles.settingsSectionContainer}>
-                      <div className={styles.settingsSectionDescription}>
-                        Select the default view to use when displaying query results.
-                      </div>
-                      <ChoiceGroup
-                        ariaLabelledBy="defaultQueryResultsView"
-                        selectedKey={defaultQueryResultsView}
-                        options={defaultQueryResultsViewOptionList}
-                        styles={choiceButtonStyles}
-                        onChange={handleOnDefaultQueryResultsViewChange}
-                      />
-                    </div>
-                  </AccordionPanel>
-                </AccordionItem>
-              </>
-            )}
-
-            {showRetrySettings && (
-              <AccordionItem value="7">
+              <AccordionItem value="5">
                <AccordionHeader>
-                  <div className={styles.header}>Retry Settings</div>
+                  <div className={styles.header}>Default Query Results View</div>
                </AccordionHeader>
                <AccordionPanel>
                  <div className={styles.settingsSectionContainer}>
                    <div className={styles.settingsSectionDescription}>
-                      Retry policy associated with throttled requests during CosmosDB queries.
-                    </div>
-                    <div>
-                      <span className={styles.subHeader}>Max retry attempts</span>
-                      <InfoTooltip className={styles.headerIcon}>
-                        Max number of retries to be performed for a request. Default value 9.
-                      </InfoTooltip>
-                    </div>
-                    <SpinButton
-                      labelPosition={Position.top}
-                      min={1}
-                      step={1}
-                      value={"" + retryAttempts}
-                      onChange={handleOnQueryRetryAttemptsSpinButtonChange}
-                      incrementButtonAriaLabel="Increase value by 1"
-                      decrementButtonAriaLabel="Decrease value by 1"
-                      onIncrement={(newValue) => setRetryAttempts(parseInt(newValue) + 1 || retryAttempts)}
-                      onDecrement={(newValue) => setRetryAttempts(parseInt(newValue) - 1 || retryAttempts)}
-                      onValidate={(newValue) => setRetryAttempts(parseInt(newValue) || retryAttempts)}
-                      styles={spinButtonStyles}
-                    />
-                    <div>
-                      <span className={styles.subHeader}>Fixed retry interval (ms)</span>
-                      <InfoTooltip className={styles.headerIcon}>
-                        Fixed retry interval in milliseconds to wait between each retry ignoring the retryAfter returned
-                        as part of the response. Default value is 0 milliseconds.
-                      </InfoTooltip>
-                    </div>
-                    <SpinButton
-                      labelPosition={Position.top}
-                      min={1000}
-                      step={1000}
-                      value={"" + retryInterval}
-                      onChange={handleOnRetryIntervalSpinButtonChange}
-                      incrementButtonAriaLabel="Increase value by 1000"
-                      decrementButtonAriaLabel="Decrease value by 1000"
-                      onIncrement={(newValue) => setRetryInterval(parseInt(newValue) + 1000 || retryInterval)}
-                      onDecrement={(newValue) => setRetryInterval(parseInt(newValue) - 1000 || retryInterval)}
-                      onValidate={(newValue) => setRetryInterval(parseInt(newValue) || retryInterval)}
-                      styles={spinButtonStyles}
-                    />
-                    <div>
-                      <span className={styles.subHeader}>Max wait time (s)</span>
-                      <InfoTooltip className={styles.headerIcon}>
-                        Max wait time in seconds to wait for a request while the retries are happening. Default value 30
-                        seconds.
-                      </InfoTooltip>
-                    </div>
-                    <SpinButton
-                      labelPosition={Position.top}
-                      min={1}
-                      step={1}
-                      value={"" + MaxWaitTimeInSeconds}
-                      onChange={handleOnMaxWaitTimeSpinButtonChange}
-                      incrementButtonAriaLabel="Increase value by 1"
-                      decrementButtonAriaLabel="Decrease value by 1"
-                      onIncrement={(newValue) =>
-                        setMaxWaitTimeInSeconds(parseInt(newValue) + 1 || MaxWaitTimeInSeconds)
-                      }
-                      onDecrement={(newValue) =>
-                        setMaxWaitTimeInSeconds(parseInt(newValue) - 1 || MaxWaitTimeInSeconds)
-                      }
-                      onValidate={(newValue) => setMaxWaitTimeInSeconds(parseInt(newValue) || MaxWaitTimeInSeconds)}
-                      styles={spinButtonStyles}
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {!isEmulator && (
-              <AccordionItem value="8">
-                <AccordionHeader>
-                  <div className={styles.header}>Enable container pagination</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Load 50 containers at a time. Currently, containers are not pulled in alphanumeric order.
-                    </div>
-                    <Checkbox
-                      styles={{
-                        label: { padding: 0 },
-                      }}
-                      className="padding"
-                      ariaLabel="Enable container pagination"
-                      checked={containerPaginationEnabled}
-                      onChange={() => setContainerPaginationEnabled(!containerPaginationEnabled)}
-                      label="Enable container pagination"
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {shouldShowCrossPartitionOption && (
-              <AccordionItem value="9">
-                <AccordionHeader>
-                  <div className={styles.header}>Enable cross-partition query</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Send more than one request while executing a query. More than one request is necessary if the
-                      query is not scoped to single partition key value.
-                    </div>
-                    <Checkbox
-                      styles={{
-                        label: { padding: 0 },
-                      }}
-                      className="padding"
-                      ariaLabel="Enable cross partition query"
-                      checked={crossPartitionQueryEnabled}
-                      onChange={() => setCrossPartitionQueryEnabled(!crossPartitionQueryEnabled)}
-                      label="Enable cross-partition query"
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {shouldShowParallelismOption && (
-              <AccordionItem value="10">
-                <AccordionHeader>
-                  <div className={styles.header}>Max degree of parallelism</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Gets or sets the number of concurrent operations run client side during parallel query execution.
-                      A positive property value limits the number of concurrent operations to the set value. If it is
-                      set to less than 0, the system automatically decides the number of concurrent operations to run.
-                    </div>
-                    <SpinButton
-                      min={-1}
-                      step={1}
-                      className="textfontclr"
-                      role="textbox"
-                      id="max-degree"
-                      value={"" + maxDegreeOfParallelism}
-                      onIncrement={(newValue) =>
-                        setMaxDegreeOfParallelism(parseInt(newValue) + 1 || maxDegreeOfParallelism)
-                      }
-                      onDecrement={(newValue) =>
-                        setMaxDegreeOfParallelism(parseInt(newValue) - 1 || maxDegreeOfParallelism)
-                      }
-                      onValidate={(newValue) => setMaxDegreeOfParallelism(parseInt(newValue) || maxDegreeOfParallelism)}
-                      ariaLabel="Max degree of parallelism"
-                      label="Max degree of parallelism"
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {shouldShowPriorityLevelOption && (
-              <AccordionItem value="11">
-                <AccordionHeader>
-                  <div className={styles.header}>Priority Level</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Sets the priority level for data-plane requests from Data Explorer when using Priority-Based
-                      Execution. If &quot;None&quot; is selected, Data Explorer will not specify priority level, and the
-                      server-side default priority level will be used.
+                      Select the default view to use when displaying query results.
                    </div>
                    <ChoiceGroup
-                      ariaLabelledBy="priorityLevel"
-                      selectedKey={priorityLevel}
-                      options={priorityLevelOptionList}
+                      ariaLabelledBy="defaultQueryResultsView"
+                      selectedKey={defaultQueryResultsView}
+                      options={defaultQueryResultsViewOptionList}
                      styles={choiceButtonStyles}
-                      onChange={handleOnPriorityLevelOptionChange}
+                      onChange={handleOnDefaultQueryResultsViewChange}
                    />
                  </div>
                </AccordionPanel>
              </AccordionItem>
-            )}
-            {shouldShowGraphAutoVizOption && (
-              <AccordionItem value="12">
-                <AccordionHeader>
-                  <div className={styles.header}>Display Gremlin query results as:&nbsp;</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      Select Graph to automatically visualize the query results as a Graph or JSON to display the
-                      results as JSON.
-                    </div>
-                    <ChoiceGroup
-                      selectedKey={graphAutoVizDisabled}
-                      options={graphAutoOptionList}
-                      onChange={handleOnGremlinChange}
-                      aria-label="Graph Auto-visualization"
-                    />
+            </>
+          )}
+          {showRetrySettings && (
+            <AccordionItem value="6">
+              <AccordionHeader>
+                <div className={styles.header}>Retry Settings</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Retry policy associated with throttled requests during CosmosDB queries.
                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            {shouldShowCopilotSampleDBOption && (
-              <AccordionItem value="13">
-                <AccordionHeader>
-                  <div className={styles.header}>Enable sample database</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      This is a sample database and collection with synthetic product data you can use to explore using
-                      NoSQL queries and Query Advisor. This will appear as another database in the Data Explorer UI, and
-                      is created by, and maintained by Microsoft at no cost to you.
-                    </div>
-                    <Checkbox
-                      styles={{
-                        label: { padding: 0 },
-                      }}
-                      className="padding"
-                      ariaLabel="Enable sample db for Query Advisor"
-                      checked={copilotSampleDBEnabled}
-                      onChange={handleSampleDatabaseChange}
-                      label="Enable sample database"
-                    />
+                  <div>
+                    <span className={styles.subHeader}>Max retry attempts</span>
+                    <InfoTooltip className={styles.headerIcon}>
+                      Max number of retries to be performed for a request. Default value 9.
+                    </InfoTooltip>
                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-          </Accordion>
-        )}
+                  <SpinButton
+                    labelPosition={Position.top}
+                    min={1}
+                    step={1}
+                    value={"" + retryAttempts}
+                    onChange={handleOnQueryRetryAttemptsSpinButtonChange}
+                    incrementButtonAriaLabel="Increase value by 1"
+                    decrementButtonAriaLabel="Decrease value by 1"
+                    onIncrement={(newValue) => setRetryAttempts(parseInt(newValue) + 1 || retryAttempts)}
+                    onDecrement={(newValue) => setRetryAttempts(parseInt(newValue) - 1 || retryAttempts)}
+                    onValidate={(newValue) => setRetryAttempts(parseInt(newValue) || retryAttempts)}
+                    styles={spinButtonStyles}
+                  />
+                  <div>
+                    <span className={styles.subHeader}>Fixed retry interval (ms)</span>
+                    <InfoTooltip className={styles.headerIcon}>
+                      Fixed retry interval in milliseconds to wait between each retry ignoring the retryAfter returned
+                      as part of the response. Default value is 0 milliseconds.
+                    </InfoTooltip>
+                  </div>
+                  <SpinButton
+                    labelPosition={Position.top}
+                    min={1000}
+                    step={1000}
+                    value={"" + retryInterval}
+                    onChange={handleOnRetryIntervalSpinButtonChange}
+                    incrementButtonAriaLabel="Increase value by 1000"
+                    decrementButtonAriaLabel="Decrease value by 1000"
+                    onIncrement={(newValue) => setRetryInterval(parseInt(newValue) + 1000 || retryInterval)}
+                    onDecrement={(newValue) => setRetryInterval(parseInt(newValue) - 1000 || retryInterval)}
+                    onValidate={(newValue) => setRetryInterval(parseInt(newValue) || retryInterval)}
+                    styles={spinButtonStyles}
+                  />
+                  <div>
+                    <span className={styles.subHeader}>Max wait time (s)</span>
+                    <InfoTooltip className={styles.headerIcon}>
+                      Max wait time in seconds to wait for a request while the retries are happening. Default value 30
+                      seconds.
+                    </InfoTooltip>
+                  </div>
+                  <SpinButton
+                    labelPosition={Position.top}
+                    min={1}
+                    step={1}
+                    value={"" + MaxWaitTimeInSeconds}
+                    onChange={handleOnMaxWaitTimeSpinButtonChange}
+                    incrementButtonAriaLabel="Increase value by 1"
+                    decrementButtonAriaLabel="Decrease value by 1"
+                    onIncrement={(newValue) => setMaxWaitTimeInSeconds(parseInt(newValue) + 1 || MaxWaitTimeInSeconds)}
+                    onDecrement={(newValue) => setMaxWaitTimeInSeconds(parseInt(newValue) - 1 || MaxWaitTimeInSeconds)}
+                    onValidate={(newValue) => setMaxWaitTimeInSeconds(parseInt(newValue) || MaxWaitTimeInSeconds)}
+                    styles={spinButtonStyles}
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {!isEmulator && (
+            <AccordionItem value="7">
+              <AccordionHeader>
+                <div className={styles.header}>Enable container pagination</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Load 50 containers at a time. Currently, containers are not pulled in alphanumeric order.
+                  </div>
+                  <Checkbox
+                    styles={{
+                      label: { padding: 0 },
+                    }}
+                    className="padding"
+                    ariaLabel="Enable container pagination"
+                    checked={containerPaginationEnabled}
+                    onChange={() => setContainerPaginationEnabled(!containerPaginationEnabled)}
+                    label="Enable container pagination"
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {shouldShowCrossPartitionOption && (
+            <AccordionItem value="8">
+              <AccordionHeader>
+                <div className={styles.header}>Enable cross-partition query</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Send more than one request while executing a query. More than one request is necessary if the query
+                    is not scoped to single partition key value.
+                  </div>
+                  <Checkbox
+                    styles={{
+                      label: { padding: 0 },
+                    }}
+                    className="padding"
+                    ariaLabel="Enable cross partition query"
+                    checked={crossPartitionQueryEnabled}
+                    onChange={() => setCrossPartitionQueryEnabled(!crossPartitionQueryEnabled)}
+                    label="Enable cross-partition query"
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {shouldShowParallelismOption && (
+            <AccordionItem value="9">
+              <AccordionHeader>
+                <div className={styles.header}>Max degree of parallelism</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Gets or sets the number of concurrent operations run client side during parallel query execution. A
+                    positive property value limits the number of concurrent operations to the set value. If it is set to
+                    less than 0, the system automatically decides the number of concurrent operations to run.
+                  </div>
+                  <SpinButton
+                    min={-1}
+                    step={1}
+                    className="textfontclr"
+                    role="textbox"
+                    id="max-degree"
+                    value={"" + maxDegreeOfParallelism}
+                    onIncrement={(newValue) =>
+                      setMaxDegreeOfParallelism(parseInt(newValue) + 1 || maxDegreeOfParallelism)
+                    }
+                    onDecrement={(newValue) =>
+                      setMaxDegreeOfParallelism(parseInt(newValue) - 1 || maxDegreeOfParallelism)
+                    }
+                    onValidate={(newValue) => setMaxDegreeOfParallelism(parseInt(newValue) || maxDegreeOfParallelism)}
+                    ariaLabel="Max degree of parallelism"
+                    label="Max degree of parallelism"
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {shouldShowPriorityLevelOption && (
+            <AccordionItem value="10">
+              <AccordionHeader>
+                <div className={styles.header}>Priority Level</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Sets the priority level for data-plane requests from Data Explorer when using Priority-Based
+                    Execution. If &quot;None&quot; is selected, Data Explorer will not specify priority level, and the
+                    server-side default priority level will be used.
+                  </div>
+                  <ChoiceGroup
+                    ariaLabelledBy="priorityLevel"
+                    selectedKey={priorityLevel}
+                    options={priorityLevelOptionList}
+                    styles={choiceButtonStyles}
+                    onChange={handleOnPriorityLevelOptionChange}
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {shouldShowGraphAutoVizOption && (
+            <AccordionItem value="11">
+              <AccordionHeader>
+                <div className={styles.header}>Display Gremlin query results as:&nbsp;</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    Select Graph to automatically visualize the query results as a Graph or JSON to display the results
+                    as JSON.
+                  </div>
+                  <ChoiceGroup
+                    selectedKey={graphAutoVizDisabled}
+                    options={graphAutoOptionList}
+                    onChange={handleOnGremlinChange}
+                    aria-label="Graph Auto-visualization"
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+          {shouldShowCopilotSampleDBOption && (
+            <AccordionItem value="12">
+              <AccordionHeader>
+                <div className={styles.header}>Enable sample database</div>
+              </AccordionHeader>
+              <AccordionPanel>
+                <div className={styles.settingsSectionContainer}>
+                  <div className={styles.settingsSectionDescription}>
+                    This is a sample database and collection with synthetic product data you can use to explore using
+                    NoSQL queries and Query Advisor. This will appear as another database in the Data Explorer UI, and
+                    is created by, and maintained by Microsoft at no cost to you.
+                  </div>
+                  <Checkbox
+                    styles={{
+                      label: { padding: 0 },
+                    }}
+                    className="padding"
+                    ariaLabel="Enable sample db for Query Advisor"
+                    checked={copilotSampleDBEnabled}
+                    onChange={handleSampleDatabaseChange}
+                    label="Enable sample database"
+                  />
+                </div>
+              </AccordionPanel>
+            </AccordionItem>
+          )}
+        </Accordion>

        <div className="settingsSection">
          <div className="settingsSectionPart">
@@ -1057,15 +916,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                  "Clear History",
                  undefined,
                  "Are you sure you want to proceed?",
-                  () => {
-                    deleteAllStates();
-                    updateUserContext({
-                      selectedRegionalEndpoint: undefined,
-                      writeEnabledInSelectedRegion: true,
-                      refreshCosmosClient: true,
-                    });
-                    useClientWriteEnabled.setState({ clientWriteEnabled: true });
-                  },
+                  () => deleteAllStates(),
                  "Cancel",
                  undefined,
                  <>
@@ -1076,7 +927,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                      <li>Reset your customized tab layout, including the splitter positions</li>
                      <li>Erase your table column preferences, including any custom columns</li>
                      <li>Clear your filter history</li>
-                      <li>Reset region selection to global</li>
                    </ul>
                  </>,
                );
--- 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="4"
+        value="3"
      >
        <AccordionHeader>
          <div
@@ -148,7 +148,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="5"
+        value="4"
      >
        <AccordionHeader>
          <div
@@ -219,7 +219,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="6"
+        value="5"
      >
        <AccordionHeader>
          <div
@@ -281,7 +281,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="7"
+        value="6"
      >
        <AccordionHeader>
          <div
@@ -423,7 +423,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="8"
+        value="7"
      >
        <AccordionHeader>
          <div
@@ -459,7 +459,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="9"
+        value="8"
      >
        <AccordionHeader>
          <div
@@ -495,7 +495,7 @@ exports[`Settings Pane should render Default properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="10"
+        value="9"
      >
        <AccordionHeader>
          <div
@@ -575,7 +575,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
      className="customAccordion ___1uf6361_0000000 fz7g6wx"
    >
      <AccordionItem
-        value="7"
+        value="6"
      >
        <AccordionHeader>
          <div
@@ -717,7 +717,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="8"
+        value="7"
      >
        <AccordionHeader>
          <div
@@ -753,7 +753,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
        </AccordionPanel>
      </AccordionItem>
      <AccordionItem
-        value="12"
+        value="11"
      >
        <AccordionHeader>
          <div
--- a/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
+++ b/src/Explorer/QueryCopilot/Popup/DeletePopup.tsx
@@ -22,17 +22,12 @@ export const DeletePopup = ({
  };

  return (
-    <Modal
-      isOpen={showDeletePopup}
-      styles={{ main: { minHeight: "122px", minWidth: "880px" } }}
-      titleAriaId="deleteDialogTitle"
-      subtitleAriaId="deleteDialogSubTitle"
-    >
+    <Modal isOpen={showDeletePopup} styles={{ main: { minHeight: "122px", minWidth: "880px" } }}>
      <Stack style={{ padding: "16px 24px", height: "auto" }}>
-        <Text id="deleteDialogTitle" style={{ height: 24, fontSize: "18px" }}>
+        <Text style={{ height: 24, fontSize: "18px" }}>
          <b>Delete code?</b>
        </Text>
-        <Text id="deleteDialogSubTitle" style={{ marginTop: 10, marginBottom: 20 }}>
+        <Text 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,8 +11,6 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
      },
    }
  }
-  subtitleAriaId="deleteDialogSubTitle"
-  titleAriaId="deleteDialogTitle"
 >
  <Stack
    style={
@@ -23,7 +21,6 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
    }
  >
    <Text
-      id="deleteDialogTitle"
      style={
        {
          "fontSize": "18px",
@@ -36,7 +33,6 @@ exports[`Delete Popup snapshot test should not render when showDeletePopup is fa
      </b>
    </Text>
    <Text
-      id="deleteDialogSubTitle"
      style={
        {
          "marginBottom": 20,
@@ -93,8 +89,6 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
      },
    }
  }
-  subtitleAriaId="deleteDialogSubTitle"
-  titleAriaId="deleteDialogTitle"
 >
  <Stack
    style={
@@ -105,7 +99,6 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
    }
  >
    <Text
-      id="deleteDialogTitle"
      style={
        {
          "fontSize": "18px",
@@ -118,7 +111,6 @@ exports[`Delete Popup snapshot test should render when showDeletePopup is true 1
      </b>
    </Text>
    <Text
-      id="deleteDialogSubTitle"
      style={
        {
          "marginBottom": 20,
--- a/src/Explorer/Sidebar.tsx
+++ b/src/Explorer/Sidebar.tsx
@@ -13,15 +13,15 @@ import {
  SplitButton,
 } from "@fluentui/react-components";
 import { Add16Regular, ArrowSync12Regular, ChevronLeft12Regular, ChevronRight12Regular } from "@fluentui/react-icons";
-import { GlobalSecondaryIndexLabels } from "Common/Constants";
-import { isGlobalSecondaryIndexEnabled } from "Common/DatabaseAccountUtility";
+import { MaterializedViewsLabels } from "Common/Constants";
+import { isMaterializedViewsEnabled } 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";
+  AddMaterializedViewPanel,
+  AddMaterializedViewPanelProps,
+} from "Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel";
 import { Tabs } from "Explorer/Tabs/Tabs";
 import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/ThemeUtil";
 import { ResourceTree } from "Explorer/Tree/ResourceTree";
@@ -168,21 +168,21 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
      });
    }

-    if (isGlobalSecondaryIndexEnabled()) {
-      const addMaterializedViewPanelProps: AddGlobalSecondaryIndexPanelProps = {
+    if (isMaterializedViewsEnabled()) {
+      const addMaterializedViewPanelProps: AddMaterializedViewPanelProps = {
        explorer,
      };

      actions.push({
        id: "new_materialized_view",
-        label: GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
+        label: MaterializedViewsLabels.NewMaterializedView,
        icon: <Add16Regular />,
        onClick: () =>
          useSidePanel
            .getState()
            .openSidePanel(
-              GlobalSecondaryIndexLabels.NewGlobalSecondaryIndex,
-              <AddGlobalSecondaryIndexPanel {...addMaterializedViewPanelProps} />,
+              MaterializedViewsLabels.NewMaterializedView,
+              <AddMaterializedViewPanel {...addMaterializedViewPanelProps} />,
            ),
      });
    }
@@ -340,18 +340,16 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
                  <>
                    <div className={styles.floatingControlsContainer}>
                      <div className={styles.floatingControls}>
-                        {!isFabricNative() && (
-                          <button
-                            type="button"
-                            data-test="Sidebar/RefreshButton"
-                            className={styles.floatingControlButton}
-                            disabled={loading}
-                            title="Refresh"
-                            onClick={onRefreshClick}
-                          >
-                            <ArrowSync12Regular />
-                          </button>
-                        )}
+                        <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
@@ -3,8 +3,6 @@
 */
 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";
@@ -110,10 +108,12 @@ const FabricHomeScreenButton: React.FC<FabricHomeScreenButtonProps & { className
  onClick,
 }) => {
  const styles = useStyles();
+
+  // TODO Make this a11y copmliant: aria-label for icon
  return (
    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick}>
      <div className={styles.buttonUpperPart}>{icon}</div>
-      <div aria-label={title} className={styles.buttonLowerPart}>
+      <div className={styles.buttonLowerPart}>
        <div>{title}</div>
        <div>{description}</div>
      </div>
@@ -123,8 +123,6 @@ const FabricHomeScreenButton: React.FC<FabricHomeScreenButtonProps & { className

 export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScreenProps) => {
  const styles = useStyles();
-  const [openSampleDataImportDialog, setOpenSampleDataImportDialog] = React.useState(false);
-
  const getSplashScreenButtons = (): JSX.Element => {
    const buttons: FabricHomeScreenButtonProps[] = [
      {
@@ -140,13 +138,11 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
        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"),
      },
    ];

@@ -161,25 +157,17 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree

  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>
-    </>
+    <div className={styles.homeContainer}>
+      <div className={styles.title} role="heading" aria-label={title}>
+        {title}
+      </div>
+      {getSplashScreenButtons()}
+      <div className={styles.footer}>
+        Need help?{" "}
+        <Link href="https://cosmos.azure.com/docs" target="_blank">
+          Learn more <img src={LinkIcon} alt="Learn more" />
+        </Link>
+      </div>
+    </div>
  );
 };
--- a/src/Explorer/SplashScreen/SampleDataImportDialog.tsx
+++ b/src/Explorer/SplashScreen/SampleDataImportDialog.tsx
@@ -1,158 +0,0 @@
-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
@@ -1,64 +0,0 @@
-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/azure/cosmos-db/mongodb/vcore/migration-options",
+      link: "https://learn.microsoft.com/en-us/azure/cosmos-db/mongodb/vcore/how-to-migrate-native-tools?tabs=export-import",
      title: "Migrate Data",
      description: "",
    },
--- a/src/Explorer/Tabs/ConnectTab.tsx
+++ b/src/Explorer/Tabs/ConnectTab.tsx
@@ -16,20 +16,10 @@ export const ConnectTab: React.FC = (): JSX.Element => {
  const [primaryReadonlyMasterKey, setPrimaryReadonlyMasterKey] = useState<string>("");
  const [secondaryReadonlyMasterKey, setSecondaryReadonlyMasterKey] = useState<string>("");
  const uri: string = userContext.databaseAccount.properties?.documentEndpoint;
-  const primaryConnectionStr = `AccountEndpoint=${uri};AccountKey=${primaryMasterKey};`;
-  const secondaryConnectionStr = `AccountEndpoint=${uri};AccountKey=${secondaryMasterKey};`;
-  const primaryReadonlyConnectionStr = `AccountEndpoint=${uri};AccountKey=${primaryReadonlyMasterKey};`;
-  const secondaryReadonlyConnectionStr = `AccountEndpoint=${uri};AccountKey=${secondaryReadonlyMasterKey};`;
-  const maskedValue: string =
-    "*********************************************************************************************************************************";
-  const [showPrimaryMasterKey, setShowPrimaryMasterKey] = useState<boolean>(false);
-  const [showSecondaryMasterKey, setShowSecondaryMasterKey] = useState<boolean>(false);
-  const [showPrimaryReadonlyMasterKey, setShowPrimaryReadonlyMasterKey] = useState<boolean>(false);
-  const [showSecondaryReadonlyMasterKey, setShowSecondaryReadonlyMasterKey] = useState<boolean>(false);
-  const [showPrimaryConnectionStr, setShowPrimaryConnectionStr] = useState<boolean>(false);
-  const [showSecondaryConnectionStr, setShowSecondaryConnectionStr] = useState<boolean>(false);
-  const [showPrimaryReadonlyConnectionStr, setShowPrimaryReadonlyConnectionStr] = useState<boolean>(false);
-  const [showSecondaryReadonlyConnectionStr, setShowSecondaryReadonlyConnectionStr] = useState<boolean>(false);
+  const primaryConnectionStr = `AccountEndpoint=${uri};AccountKey=${primaryMasterKey}`;
+  const secondaryConnectionStr = `AccountEndpoint=${uri};AccountKey=${secondaryMasterKey}`;
+  const primaryReadonlyConnectionStr = `AccountEndpoint=${uri};AccountKey=${primaryReadonlyMasterKey}`;
+  const secondaryReadonlyConnectionStr = `AccountEndpoint=${uri};AccountKey=${secondaryReadonlyMasterKey}`;

  useEffect(() => {
    fetchKeys();
@@ -72,97 +62,55 @@ export const ConnectTab: React.FC = (): JSX.Element => {
    root: { width: "100%" },
    field: { backgroundColor: "rgb(230, 230, 230)" },
    fieldGroup: { borderColor: "rgb(138, 136, 134)" },
-    suffix: {
-      backgroundColor: "rgb(230, 230, 230)",
-      margin: 0,
-      padding: 0,
-    },
  };

-  const renderCopyButton = (selector: string) => (
-    <IconButton
-      iconProps={{ iconName: "Copy" }}
-      onClick={() => onCopyBtnClicked(selector)}
-      styles={{
-        root: {
-          height: "100%",
-          backgroundColor: "rgb(230, 230, 230)",
-          border: "none",
-        },
-        rootHovered: {
-          backgroundColor: "rgb(220, 220, 220)",
-        },
-        rootPressed: {
-          backgroundColor: "rgb(210, 210, 210)",
-        },
-      }}
-    />
-  );
-
  return (
    <div style={{ width: "100%", padding: 16 }}>
-      <Stack horizontal verticalAlign="end" style={{ marginBottom: 16, margin: 10 }}>
-        <TextField
-          label="URI"
-          id="uriTextfield"
-          readOnly
-          value={uri}
-          styles={textfieldStyles}
-          onRenderSuffix={() => renderCopyButton("#uriTextfield")}
-        />
-        <div style={{ width: 32 }}></div>
-      </Stack>
-
      <Pivot>
        {userContext.hasWriteAccess && (
          <PivotItem headerText="Read-write Keys">
-            <Stack style={{ margin: 10, overflow: "auto", maxHeight: "calc(100vh - 300px)" }}>
+            <Stack style={{ margin: 10 }}>
+              <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
+                <TextField label="URI" id="uriTextfield" readOnly value={uri} styles={textfieldStyles} />
+                <IconButton iconProps={{ iconName: "Copy" }} onClick={() => onCopyBtnClicked("#uriTextfield")} />
+              </Stack>
+
              <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
                <TextField
                  label="PRIMARY KEY"
                  id="primaryKeyTextfield"
                  readOnly
-                  value={showPrimaryMasterKey ? primaryMasterKey : maskedValue}
+                  value={primaryMasterKey}
                  styles={textfieldStyles}
-                  {...(showPrimaryMasterKey && {
-                    onRenderSuffix: () => renderCopyButton("#primaryKeyTextfield"),
-                  })}
-                />
-                <IconButton
-                  iconProps={{ iconName: showPrimaryMasterKey ? "Hide3" : "View" }}
-                  onClick={() => setShowPrimaryMasterKey(!showPrimaryMasterKey)}
                />
+                <IconButton iconProps={{ iconName: "Copy" }} onClick={() => onCopyBtnClicked("#primaryKeyTextfield")} />
              </Stack>
+
              <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
                <TextField
                  label="SECONDARY KEY"
                  id="secondaryKeyTextfield"
                  readOnly
-                  value={showSecondaryMasterKey ? secondaryMasterKey : maskedValue}
+                  value={secondaryMasterKey}
                  styles={textfieldStyles}
-                  {...(showSecondaryMasterKey && {
-                    onRenderSuffix: () => renderCopyButton("#secondaryKeyTextfield"),
-                  })}
                />
                <IconButton
-                  iconProps={{ iconName: showSecondaryMasterKey ? "Hide3" : "View" }}
-                  onClick={() => setShowSecondaryMasterKey(!showSecondaryMasterKey)}
+                  iconProps={{ iconName: "Copy" }}
+                  onClick={() => onCopyBtnClicked("#secondaryKeyTextfield")}
                />
              </Stack>
+
              <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
                <TextField
                  label="PRIMARY CONNECTION STRING"
                  id="primaryConStrTextfield"
                  readOnly
-                  value={showPrimaryConnectionStr ? primaryConnectionStr : maskedValue}
+                  value={primaryConnectionStr}
                  styles={textfieldStyles}
-                  {...(showPrimaryConnectionStr && {
-                    onRenderSuffix: () => renderCopyButton("#primaryConStrTextfield"),
-                  })}
                />
                <IconButton
-                  iconProps={{ iconName: showPrimaryConnectionStr ? "Hide3" : "View" }}
-                  onClick={() => setShowPrimaryConnectionStr(!showPrimaryConnectionStr)}
+                  iconProps={{ iconName: "Copy" }}
+                  onClick={() => onCopyBtnClicked("#primaryConStrTextfield")}
                />
              </Stack>
              <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
@@ -170,36 +118,34 @@ export const ConnectTab: React.FC = (): JSX.Element => {
                  label="SECONDARY CONNECTION STRING"
                  id="secondaryConStrTextfield"
                  readOnly
-                  value={showSecondaryConnectionStr ? secondaryConnectionStr : maskedValue}
+                  value={secondaryConnectionStr}
                  styles={textfieldStyles}
-                  {...(showSecondaryConnectionStr && {
-                    onRenderSuffix: () => renderCopyButton("#secondaryConStrTextfield"),
-                  })}
                />
                <IconButton
-                  iconProps={{ iconName: showSecondaryConnectionStr ? "Hide3" : "View" }}
-                  onClick={() => setShowSecondaryConnectionStr(!showSecondaryConnectionStr)}
+                  iconProps={{ iconName: "Copy" }}
+                  onClick={() => onCopyBtnClicked("#secondaryConStrTextfield")}
                />
              </Stack>
            </Stack>
          </PivotItem>
        )}
        <PivotItem headerText="Read-only Keys">
-          <Stack style={{ margin: 10, overflow: "auto", maxHeight: "calc(100vh - 300px)" }}>
+          <Stack style={{ margin: 10 }}>
+            <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
+              <TextField label="URI" id="uriReadOnlyTextfield" readOnly value={uri} styles={textfieldStyles} />
+              <IconButton iconProps={{ iconName: "Copy" }} onClick={() => onCopyBtnClicked("#uriReadOnlyTextfield")} />
+            </Stack>
            <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
              <TextField
                label="PRIMARY READ-ONLY KEY"
                id="primaryReadonlyKeyTextfield"
                readOnly
-                value={showPrimaryReadonlyMasterKey ? primaryReadonlyMasterKey : maskedValue}
+                value={primaryReadonlyMasterKey}
                styles={textfieldStyles}
-                {...(showPrimaryReadonlyMasterKey && {
-                  onRenderSuffix: () => renderCopyButton("#primaryReadonlyKeyTextfield"),
-                })}
              />
              <IconButton
-                iconProps={{ iconName: showPrimaryReadonlyMasterKey ? "Hide3" : "View" }}
-                onClick={() => setShowPrimaryReadonlyMasterKey(!showPrimaryReadonlyMasterKey)}
+                iconProps={{ iconName: "Copy" }}
+                onClick={() => onCopyBtnClicked("#primaryReadonlyKeyTextfield")}
              />
            </Stack>
            <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
@@ -207,15 +153,12 @@ export const ConnectTab: React.FC = (): JSX.Element => {
                label="SECONDARY READ-ONLY KEY"
                id="secondaryReadonlyKeyTextfield"
                readOnly
-                value={showSecondaryReadonlyMasterKey ? secondaryReadonlyMasterKey : maskedValue}
+                value={secondaryReadonlyMasterKey}
                styles={textfieldStyles}
-                {...(showSecondaryReadonlyMasterKey && {
-                  onRenderSuffix: () => renderCopyButton("#secondaryReadonlyKeyTextfield"),
-                })}
              />
              <IconButton
-                iconProps={{ iconName: showSecondaryReadonlyMasterKey ? "Hide3" : "View" }}
-                onClick={() => setShowSecondaryReadonlyMasterKey(!showSecondaryReadonlyMasterKey)}
+                iconProps={{ iconName: "Copy" }}
+                onClick={() => onCopyBtnClicked("#secondaryReadonlyKeyTextfield")}
              />
            </Stack>
            <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
@@ -223,31 +166,25 @@ export const ConnectTab: React.FC = (): JSX.Element => {
                label="PRIMARY READ-ONLY CONNECTION STRING"
                id="primaryReadonlyConStrTextfield"
                readOnly
-                value={showPrimaryReadonlyConnectionStr ? primaryReadonlyConnectionStr : maskedValue}
+                value={primaryReadonlyConnectionStr}
                styles={textfieldStyles}
-                {...(showPrimaryReadonlyConnectionStr && {
-                  onRenderSuffix: () => renderCopyButton("#primaryReadonlyConStrTextfield"),
-                })}
              />
              <IconButton
-                iconProps={{ iconName: showPrimaryReadonlyConnectionStr ? "Hide3" : "View" }}
-                onClick={() => setShowPrimaryReadonlyConnectionStr(!showPrimaryReadonlyConnectionStr)}
+                iconProps={{ iconName: "Copy" }}
+                onClick={() => onCopyBtnClicked("#primaryReadonlyConStrTextfield")}
              />
            </Stack>
            <Stack horizontal verticalAlign="end" style={{ marginBottom: 8 }}>
              <TextField
                label="SECONDARY READ-ONLY CONNECTION STRING"
                id="secondaryReadonlyConStrTextfield"
-                value={showSecondaryReadonlyConnectionStr ? secondaryReadonlyConnectionStr : maskedValue}
+                value={secondaryReadonlyConnectionStr}
                readOnly
                styles={textfieldStyles}
-                {...(showSecondaryReadonlyConnectionStr && {
-                  onRenderSuffix: () => renderCopyButton("#secondaryReadonlyConStrTextfield"),
-                })}
              />
              <IconButton
-                iconProps={{ iconName: showSecondaryReadonlyConnectionStr ? "Hide3" : "View" }}
-                onClick={() => setShowSecondaryReadonlyConnectionStr(!showSecondaryReadonlyConnectionStr)}
+                iconProps={{ iconName: "Copy" }}
+                onClick={() => onCopyBtnClicked("#secondaryReadonlyConStrTextfield")}
              />
            </Stack>
          </Stack>
--- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
+++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx
@@ -49,14 +49,12 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { userContext } from "UserContext";
 import { logConsoleError, logConsoleInfo } from "Utils/NotificationConsoleUtils";
 import { Allotment } from "allotment";
-import { useClientWriteEnabled } from "hooks/useClientWriteEnabled";
 import React, { KeyboardEventHandler, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { format } from "react-string-format";
 import DeleteDocumentIcon from "../../../../images/DeleteDocument.svg";
 import NewDocumentIcon from "../../../../images/NewDocument.svg";
 import UploadIcon from "../../../../images/Upload_16x16.svg";
 import DiscardIcon from "../../../../images/discard.svg";
-import RefreshIcon from "../../../../images/refresh-cosmos.svg";
 import SaveIcon from "../../../../images/save-cosmos.svg";
 import * as Constants from "../../../Common/Constants";
 import * as HeadersUtility from "../../../Common/HeadersUtility";
@@ -133,14 +131,6 @@ export const useDocumentsTabStyles = makeStyles({
    backgroundColor: "white",
    zIndex: 1,
  },
-  refreshBtn: {
-    position: "absolute",
-    top: "3px",
-    right: "4px",
-    float: "right",
-    zIndex: 1,
-    backgroundColor: "transparent",
-  },
  deleteProgressContent: {
    paddingTop: tokens.spacingVerticalL,
  },
@@ -306,7 +296,6 @@ export type ButtonsDependencies = {
  selectedRows: Set<TableRowId>;
  editorState: ViewModels.DocumentExplorerState;
  isPreferredApiMongoDB: boolean;
-  clientWriteEnabled: boolean;
  onNewDocumentClick: UiKeyboardEvent;
  onSaveNewDocumentClick: UiKeyboardEvent;
  onRevertNewDocumentClick: UiKeyboardEvent;
@@ -330,7 +319,6 @@ const createUploadButton = (container: Explorer): CommandButtonComponentProps =>
    hasPopup: true,
    disabled:
      useSelectedNode.getState().isDatabaseNodeOrNoneSelected() ||
-      !useClientWriteEnabled.getState().clientWriteEnabled ||
      useSelectedNode.getState().isQueryCopilotCollectionSelected(),
  };
 };
@@ -349,7 +337,6 @@ export const getTabsButtons = ({
  selectedRows,
  editorState,
  isPreferredApiMongoDB,
-  clientWriteEnabled,
  onNewDocumentClick,
  onSaveNewDocumentClick,
  onRevertNewDocumentClick,
@@ -375,7 +362,6 @@ export const getTabsButtons = ({
      hasPopup: false,
      disabled:
        !getNewDocumentButtonState(editorState).enabled ||
-        !clientWriteEnabled ||
        useSelectedNode.getState().isQueryCopilotCollectionSelected(),
      id: NEW_DOCUMENT_BUTTON_ID,
    });
@@ -393,7 +379,6 @@ export const getTabsButtons = ({
      hasPopup: false,
      disabled:
        !getSaveNewDocumentButtonState(editorState).enabled ||
-        !clientWriteEnabled ||
        useSelectedNode.getState().isQueryCopilotCollectionSelected(),
      id: SAVE_BUTTON_ID,
    });
@@ -428,7 +413,6 @@ export const getTabsButtons = ({
      hasPopup: false,
      disabled:
        !getSaveExistingDocumentButtonState(editorState).enabled ||
-        !clientWriteEnabled ||
        useSelectedNode.getState().isQueryCopilotCollectionSelected(),
      id: UPDATE_BUTTON_ID,
    });
@@ -461,7 +445,7 @@ export const getTabsButtons = ({
      commandButtonLabel: label,
      ariaLabel: label,
      hasPopup: false,
-      disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected() || !clientWriteEnabled,
+      disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
      id: DELETE_BUTTON_ID,
    });
  }
@@ -635,7 +619,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
  );

  // State
-  const clientWriteEnabled = useClientWriteEnabled((state) => state.clientWriteEnabled);
  const [tabStateData, setTabStateData] = useState<TabDivider>(() =>
    readDocumentsTabSubComponentState<TabDivider>(SubComponentName.MainTabDivider, _collection, {
      leftPaneWidthPercent: 35,
@@ -773,17 +756,16 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
    [_collection, _partitionKey],
  );
  const partitionKeyPropertyHeaders: string[] = useMemo(
-    () =>
-      isPreferredApiMongoDB && partitionKey?.systemKey
-        ? []
-        : _collection?.partitionKeyPropertyHeaders || partitionKey?.paths,
-    [_collection?.partitionKeyPropertyHeaders, partitionKey?.paths, partitionKey?.systemKey, isPreferredApiMongoDB],
+    () => _collection?.partitionKeyPropertyHeaders || partitionKey?.paths,
+    [_collection?.partitionKeyPropertyHeaders, partitionKey?.paths],
+  );
+  let partitionKeyProperties = useMemo(
+    () =>
+      partitionKeyPropertyHeaders?.map((partitionKeyPropertyHeader) =>
+        partitionKeyPropertyHeader.replace(/[/]+/g, ".").substring(1).replace(/[']+/g, ""),
+      ),
+    [partitionKeyPropertyHeaders],
  );
-  let partitionKeyProperties = useMemo(() => {
-    return partitionKeyPropertyHeaders?.map((partitionKeyPropertyHeader) =>
-      partitionKeyPropertyHeader.replace(/[/]+/g, ".").substring(1).replace(/[']+/g, ""),
-    );
-  }, [partitionKeyPropertyHeaders]);

  const getInitialColumnSelection = () => {
    const defaultColumnsIds = ["id"];
@@ -874,7 +856,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      selectedRows,
      editorState,
      isPreferredApiMongoDB,
-      clientWriteEnabled,
      onNewDocumentClick,
      onSaveNewDocumentClick,
      onRevertNewDocumentClick,
@@ -1047,7 +1028,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
    );

    const selectedDocumentId = documentIds[clickedRowIndex as number];
-    const originalPartitionKeyValue = selectedDocumentId.partitionKeyValue;
    selectedDocumentId.partitionKeyValue = partitionKeyValueArray;

    onExecutionErrorChange(false);
@@ -1083,10 +1063,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
          setColumnDefinitionsFromDocument(documentContent);
        },
        (error) => {
-          // in case of any kind of failures of accidently changing partition key, restore the original
-          // so that when user navigates away from current document and comes back,
-          // it doesnt fail to load due to using the invalid partition keys
-          selectedDocumentId.partitionKeyValue = originalPartitionKeyValue;
          onExecutionErrorChange(true);
          const errorMessage = getErrorMessage(error);
          useDialog.getState().showOkModalDialog("Update document failed", errorMessage);
@@ -1294,7 +1270,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
        selectedRows,
        editorState,
        isPreferredApiMongoDB,
-        clientWriteEnabled,
        onNewDocumentClick,
        onSaveNewDocumentClick,
        onRevertNewDocumentClick,
@@ -1307,7 +1282,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      selectedRows,
      editorState,
      isPreferredApiMongoDB,
-      clientWriteEnabled,
      onNewDocumentClick,
      onSaveNewDocumentClick,
      onRevertNewDocumentClick,
@@ -1726,8 +1700,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
    renderObjectForEditor = (value: unknown): string => MongoUtility.tojson(value, null, false);

    const _hasShardKeySpecified = (document: unknown): boolean => {
-      const partitionKeyDefinition: PartitionKeyDefinition = _getPartitionKeyDefinition() as PartitionKeyDefinition;
-      return partitionKeyDefinition.systemKey || Boolean(extractPartitionKeyValues(document, partitionKeyDefinition));
+      return Boolean(extractPartitionKeyValues(document, _getPartitionKeyDefinition() as PartitionKeyDefinition));
    };

    const _getPartitionKeyDefinition = (): DataModels.PartitionKey => {
@@ -1751,7 +1724,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
      return partitionKey;
    };

-    partitionKeyProperties = partitionKeyProperties.map((partitionKeyProperty, i) => {
+    partitionKeyProperties = partitionKeyProperties?.map((partitionKeyProperty, i) => {
      if (partitionKeyProperty && ~partitionKeyProperty.indexOf(`"`)) {
        partitionKeyProperty = partitionKeyProperty.replace(/["]+/g, "");
      }
@@ -2101,8 +2074,8 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone

  return (
    <CosmosFluentProvider className={styles.container}>
-      <div data-test={"DocumentsTab"} className="tab-pane active" role="tabpanel" style={{ display: "flex" }}>
-        <div data-test={"DocumentsTab/Filter"} className={styles.filterRow}>
+      <div className="tab-pane active" role="tabpanel" style={{ display: "flex" }}>
+        <div className={styles.filterRow}>
          {!isPreferredApiMongoDB && <span> SELECT * FROM c </span>}
          <InputDataList
            dropdownOptions={getFilterChoices()}
@@ -2119,7 +2092,6 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
          />
          <Button
            appearance="primary"
-            data-test={"DocumentsTab/ApplyFilter"}
            size="small"
            onClick={() => {
              if (isExecuting) {
@@ -2145,11 +2117,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
          }}
        >
          <Allotment.Pane preferredSize={`${tabStateData.leftPaneWidthPercent}%`} minSize={55}>
-            <div
-              data-test={"DocumentsTab/DocumentsPane"}
-              style={{ height: "100%", width: "100%", overflow: "hidden" }}
-              ref={tableContainerRef}
-            >
+            <div style={{ height: "100%", width: "100%", overflow: "hidden" }} ref={tableContainerRef}>
              <div className={styles.tableContainer}>
                <div
                  style={
@@ -2176,23 +2144,10 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
                    isColumnSelectionDisabled={isPreferredApiMongoDB}
                  />
                </div>
-                {tableContainerSizePx?.width >= calculateOffset(selectedColumnIds.length) + 200 && (
-                  <div
-                    title="Refresh"
-                    className={styles.refreshBtn}
-                    role="button"
-                    onClick={() => refreshDocumentsGrid(false)}
-                    aria-label="Refresh"
-                    tabIndex={0}
-                  >
-                    <img src={RefreshIcon} alt="Refresh" />
-                  </div>
-                )}
              </div>
              {tableItems.length > 0 && (
                <a
                  className={styles.loadMore}
-                  data-test={"DocumentsTab/LoadMore"}
                  role="button"
                  tabIndex={0}
                  onClick={() => loadNextPage(documentsIterator.iterator, false)}
@@ -2204,7 +2159,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
            </div>
          </Allotment.Pane>
          <Allotment.Pane minSize={30}>
-            <div data-test={"DocumentsTab/ResultsPane"} style={{ height: "100%", width: "100%" }}>
+            <div style={{ height: "100%", width: "100%" }}>
              {isTabActive && selectedDocumentContent && selectedRows.size <= 1 && (
                <EditorReact
                  language={"json"}
--- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx
+++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx
@@ -233,7 +233,7 @@ export const DocumentsTableComponent: React.FC<IDocumentsTableComponentProps> =
                    aria-label="Select column"
                    size="small"
                    icon={<MoreHorizontalRegular />}
-                    style={{ position: "absolute", right: 10, backgroundColor: tokens.colorNeutralBackground1 }}
+                    style={{ position: "absolute", right: 0, backgroundColor: tokens.colorNeutralBackground1 }}
                  />
                </MenuTrigger>
                <MenuPopover>
--- a/src/Explorer/Tabs/DocumentsTabV2/snapshots/DocumentsTabV2.test.tsx.snap
+++ b/src/Explorer/Tabs/DocumentsTabV2/snapshots/DocumentsTabV2.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
 >
  <div
    className="tab-pane active"
-    data-test="DocumentsTab"
    role="tabpanel"
    style={
      {
@@ -16,7 +15,6 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
  >
    <div
      className="___11ktxfv_0000000 f1o614cb fy9rknc f22iagw fsnqrgy f1f5gg8d fjodcmx f122n59 f1f09k3d fg706s2 frpde29"
-      data-test="DocumentsTab/Filter"
    >
      <span>
         SELECT * FROM c 
@@ -51,7 +49,6 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
      <Button
        appearance="primary"
        aria-label="Apply filter"
-        data-test="DocumentsTab/ApplyFilter"
        disabled={false}
        onClick={[Function]}
        size="small"
@@ -68,7 +65,6 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
        preferredSize="35%"
      >
        <div
-          data-test="DocumentsTab/DocumentsPane"
          style={
            {
              "height": "100%",
@@ -130,7 +126,6 @@ exports[`Documents tab (noSql API) when rendered should render the page 1`] = `
        minSize={30}
      >
        <div
-          data-test="DocumentsTab/ResultsPane"
          style={
            {
              "height": "100%",
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-console */
 import { FeedOptions, QueryOperationOptions } from "@azure/cosmos";
-import { AuthType } from "AuthType";
 import QueryError, { createMonacoErrorLocationResolver, createMonacoMarkersForQueryErrors } from "Common/QueryError";
 import { SplitterDirection } from "Common/Splitter";
 import { Platform, configContext } from "ConfigContext";
@@ -22,7 +21,6 @@ import { QueryConstants } from "Shared/Constants";
 import { LocalStorageUtility, StorageKey, getRUThreshold, ruThresholdEnabled } from "Shared/StorageUtility";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { Allotment } from "allotment";
-import { useClientWriteEnabled } from "hooks/useClientWriteEnabled";
 import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
 import { TabsState, useTabs } from "hooks/useTabs";
 import React, { Fragment, createRef } from "react";
@@ -486,9 +484,7 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
          commandButtonLabel: label,
          ariaLabel: label,
          hasPopup: false,
-          disabled:
-            !this.saveQueryButton.enabled ||
-            (!useClientWriteEnabled.getState().clientWriteEnabled && userContext.authType === AuthType.AAD),
+          disabled: !this.saveQueryButton.enabled,
        });
      }

@@ -700,7 +696,6 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
  }

  private unsubscribeCopilotSidebar: () => void;
-  private unsubscribeClientWriteEnabled: () => void;

  componentDidMount(): void {
    useTabs.subscribe((state: TabsState) => {
@@ -717,17 +712,10 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,

    useCommandBar.getState().setContextButtons(this.getTabsButtons());
    document.addEventListener("keydown", this.handleCopilotKeyDown);
-
-    this.unsubscribeClientWriteEnabled = useClientWriteEnabled.subscribe(() => {
-      useCommandBar.getState().setContextButtons(this.getTabsButtons());
-    });
  }

  componentWillUnmount(): void {
    document.removeEventListener("keydown", this.handleCopilotKeyDown);
-    if (this.unsubscribeClientWriteEnabled) {
-      this.unsubscribeClientWriteEnabled();
-    }
  }

  private getEditorAndQueryResult(): JSX.Element {
--- a/src/Explorer/Tabs/ScriptTabBase.ts
+++ b/src/Explorer/Tabs/ScriptTabBase.ts
@@ -1,6 +1,5 @@
 import * as ko from "knockout";
 import Q from "q";
-import { IsValidCosmosDbResourceId } from "Utils/ValidationUtils";
 import DiscardIcon from "../../../images/discard.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
 import * as Constants from "../../Common/Constants";
@@ -58,7 +57,7 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
    }

    this.id = editable.observable<string>();
-    this.id.validations([IsValidCosmosDbResourceId]);
+    this.id.validations([ScriptTabBase._isValidId]);

    this.editorContent = editable.observable<string>();
    this.editorContent.validations([ScriptTabBase._isNotEmpty]);
@@ -263,6 +262,29 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
    this.updateNavbarWithTabsButtons();
  }

+  private static _isValidId(id: string): boolean {
+    if (!id) {
+      return false;
+    }
+
+    const invalidStartCharacters = /^[/?#\\]/;
+    if (invalidStartCharacters.test(id)) {
+      return false;
+    }
+
+    const invalidMiddleCharacters = /^.+[/?#\\]/;
+    if (invalidMiddleCharacters.test(id)) {
+      return false;
+    }
+
+    const invalidEndCharacters = /.*[/?#\\ ]$/;
+    if (invalidEndCharacters.test(id)) {
+      return false;
+    }
+
+    return true;
+  }
+
  private static _isNotEmpty(value: string): boolean {
    return !!value;
  }
--- a/src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTabComponent.tsx
+++ b/src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTabComponent.tsx
@@ -1,7 +1,6 @@
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import { Pivot, PivotItem } from "@fluentui/react";
 import { KeyboardAction } from "KeyboardShortcuts";
-import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import React from "react";
 import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
 import DiscardIcon from "../../../../images/discard.svg";
@@ -456,12 +455,11 @@ export default class StoredProcedureTabComponent extends React.Component<
  }

  public handleIdOnChange(event: React.ChangeEvent<HTMLInputElement>): void {
-    const isValidId: boolean = event.currentTarget.reportValidity();
    if (this.state.saveButton.visible) {
      this.setState({
        id: event.target.value,
        saveButton: {
-          enabled: isValidId,
+          enabled: true,
          visible: this.props.scriptTabBaseInstance.isNew(),
        },
        discardButton: {
@@ -530,8 +528,8 @@ export default class StoredProcedureTabComponent extends React.Component<
              className="formTree"
              type="text"
              required
-              pattern={ValidCosmosDbIdInputPattern.source}
-              title={ValidCosmosDbIdDescription}
+              pattern="[^/?#\\]*[^/?# \\]"
+              title="May not end with space nor contain characters '\' '/' '#' '?'"
              aria-label="Stored procedure id"
              placeholder="Enter the new stored procedure id"
              size={40}
--- a/src/Explorer/Tabs/TerminalTab.tsx
+++ b/src/Explorer/Tabs/TerminalTab.tsx
@@ -5,7 +5,6 @@ import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
 import * as ko from "knockout";
 import * as React from "react";
 import FirewallRuleScreenshot from "../../../images/firewallRule.png";
-import VcoreFirewallRuleScreenshot from "../../../images/vcoreMongoFirewallRule.png";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
@@ -43,11 +42,7 @@ class NotebookTerminalComponentAdapter implements ReactAdapter {
      return (
        <QuickstartFirewallNotification
          messageType={MessageTypes.OpenPostgresNetworkingBlade}
-          screenshot={
-            this.kind === ViewModels.TerminalKind.Mongo || this.kind === ViewModels.TerminalKind.VCoreMongo
-              ? VcoreFirewallRuleScreenshot
-              : FirewallRuleScreenshot
-          }
+          screenshot={FirewallRuleScreenshot}
          shellName={this.getShellNameForDisplay(this.kind)}
        />
      );
--- a/src/Explorer/Tabs/TriggerTabContent.tsx
+++ b/src/Explorer/Tabs/TriggerTabContent.tsx
@@ -1,7 +1,6 @@
 import { TriggerDefinition } from "@azure/cosmos";
 import { Dropdown, IDropdownOption, Label, TextField } from "@fluentui/react";
 import { KeyboardAction } from "KeyboardShortcuts";
-import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import React, { Component } from "react";
 import DiscardIcon from "../../../images/discard.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
@@ -193,6 +192,29 @@ export class TriggerTabContent extends Component<TriggerTab, ITriggerTabContentS
    });
  }

+  private isValidId(id: string): boolean {
+    if (!id) {
+      return false;
+    }
+
+    const invalidStartCharacters = /^[/?#\\]/;
+    if (invalidStartCharacters.test(id)) {
+      return false;
+    }
+
+    const invalidMiddleCharacters = /^.+[/?#\\]/;
+    if (invalidMiddleCharacters.test(id)) {
+      return false;
+    }
+
+    const invalidEndCharacters = /.*[/?#\\ ]$/;
+    if (invalidEndCharacters.test(id)) {
+      return false;
+    }
+
+    return true;
+  }
+
  private isNotEmpty(value: string): boolean {
    return !!value;
  }
@@ -264,13 +286,7 @@ export class TriggerTabContent extends Component<TriggerTab, ITriggerTabContentS
    _event: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>,
    newValue?: string,
  ): void => {
-    const inputElement = _event.currentTarget as HTMLInputElement;
-    let isValidId: boolean = true;
-    if (inputElement) {
-      isValidId = inputElement.reportValidity();
-    }
-
-    this.saveButton.enabled = this.isNotEmpty(newValue) && isValidId;
+    this.saveButton.enabled = this.isValidId(newValue) && this.isNotEmpty(newValue);
    this.setState({ triggerId: newValue });
  };

@@ -297,8 +313,7 @@ export class TriggerTabContent extends Component<TriggerTab, ITriggerTabContentS
          autoFocus
          required
          type="text"
-          pattern={ValidCosmosDbIdInputPattern.source}
-          title={ValidCosmosDbIdDescription}
+          pattern="[^/?#\\]*[^/?# \\]"
          placeholder="Enter the new trigger id"
          size={40}
          value={triggerId}
--- a/src/Explorer/Tabs/UserDefinedFunctionTabContent.tsx
+++ b/src/Explorer/Tabs/UserDefinedFunctionTabContent.tsx
@@ -1,7 +1,6 @@
 import { UserDefinedFunctionDefinition } from "@azure/cosmos";
 import { Label, TextField } from "@fluentui/react";
 import { KeyboardAction } from "KeyboardShortcuts";
-import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 import React, { Component } from "react";
 import DiscardIcon from "../../../images/discard.svg";
 import SaveIcon from "../../../images/save-cosmos.svg";
@@ -65,13 +64,7 @@ export default class UserDefinedFunctionTabContent extends Component<
    _event: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>,
    newValue?: string,
  ): void => {
-    const inputElement = _event.currentTarget as HTMLInputElement;
-    let isValidId: boolean = true;
-    if (inputElement) {
-      isValidId = inputElement.reportValidity();
-    }
-
-    this.saveButton.enabled = this.isNotEmpty(newValue) && isValidId;
+    this.saveButton.enabled = this.isValidId(newValue) && this.isNotEmpty(newValue);
    this.setState({ udfId: newValue });
  };

@@ -245,6 +238,29 @@ export default class UserDefinedFunctionTabContent extends Component<
    });
  }

+  private isValidId(id: string): boolean {
+    if (!id) {
+      return false;
+    }
+
+    const invalidStartCharacters = /^[/?#\\]/;
+    if (invalidStartCharacters.test(id)) {
+      return false;
+    }
+
+    const invalidMiddleCharacters = /^.+[/?#\\]/;
+    if (invalidMiddleCharacters.test(id)) {
+      return false;
+    }
+
+    const invalidEndCharacters = /.*[/?#\\ ]$/;
+    if (invalidEndCharacters.test(id)) {
+      return false;
+    }
+
+    return true;
+  }
+
  private isNotEmpty(value: string): boolean {
    return !!value;
  }
@@ -268,8 +284,7 @@ export default class UserDefinedFunctionTabContent extends Component<
          required
          readOnly={!isUdfIdEditable}
          type="text"
-          pattern={ValidCosmosDbIdInputPattern.source}
-          title={ValidCosmosDbIdDescription}
+          pattern="[^/?#\\]*[^/?# \\]"
          placeholder="Enter the new user defined function id"
          size={40}
          value={udfId}
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -1,10 +1,4 @@
-import {
-  JSONObject,
-  Resource,
-  StoredProcedureDefinition,
-  TriggerDefinition,
-  UserDefinedFunctionDefinition,
-} from "@azure/cosmos";
+import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
 import { DocumentsTabV2 } from "Explorer/Tabs/DocumentsTabV2/DocumentsTabV2";
 import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
@@ -1050,22 +1044,9 @@ export default class Collection implements ViewModels.Collection {
  }

  public async uploadFiles(files: FileList): Promise<{ data: UploadDetailsRecord[] }> {
-    try {
-      TelemetryProcessor.trace(Action.UploadDocuments, ActionModifiers.Start, {
-        nbFiles: files.length,
-      });
-      const data = await Promise.all(Array.from(files).map((file) => this.uploadFile(file)));
-      TelemetryProcessor.trace(Action.UploadDocuments, ActionModifiers.Success, {
-        nbFiles: files.length,
-      });
-      return { data };
-    } catch (error) {
-      TelemetryProcessor.trace(Action.UploadDocuments, ActionModifiers.Failed, {
-        error: getErrorMessage(error),
-        errorStack: getErrorStack(error),
-      });
-      throw error;
-    }
+    const data = await Promise.all(Array.from(files).map((file) => this.uploadFile(file)));
+
+    return { data };
  }

  private uploadFile(file: File): Promise<UploadDetailsRecord> {
@@ -1092,56 +1073,6 @@ export default class Collection implements ViewModels.Collection {
    });
  }

-  public async bulkInsertDocuments(documents: JSONObject[]): Promise<{
-    numSucceeded: number;
-    numFailed: number;
-    numThrottled: number;
-    errors: string[];
-  }> {
-    const stats = {
-      numSucceeded: 0,
-      numFailed: 0,
-      numThrottled: 0,
-      errors: [] as string[],
-    };
-
-    const chunkSize = 100; // 100 is the max # of bulk operations the SDK currently accepts
-    const chunkedContent = Array.from({ length: Math.ceil(documents.length / chunkSize) }, (_, index) =>
-      documents.slice(index * chunkSize, index * chunkSize + chunkSize),
-    );
-    for (const chunk of chunkedContent) {
-      let retryAttempts = 0;
-      let chunkComplete = false;
-      let documentsToAttempt = chunk;
-      while (retryAttempts < 10 && !chunkComplete) {
-        const responses = await bulkCreateDocument(this, documentsToAttempt);
-        const attemptedDocuments = [...documentsToAttempt];
-        documentsToAttempt = [];
-        responses.forEach((response, index) => {
-          if (response.statusCode === 201) {
-            stats.numSucceeded++;
-          } else if (response.statusCode === 429) {
-            documentsToAttempt.push(attemptedDocuments[index]);
-          } else {
-            stats.numFailed++;
-            stats.errors.push(JSON.stringify(response.resourceBody));
-          }
-        });
-        if (documentsToAttempt.length === 0) {
-          chunkComplete = true;
-          break;
-        }
-        logConsoleInfo(
-          `${documentsToAttempt.length} document creations were throttled. Waiting ${retryAttempts} seconds and retrying throttled documents`,
-        );
-        retryAttempts++;
-        await sleep(retryAttempts);
-      }
-    }
-
-    return stats;
-  }
-
  private async _createDocumentsFromFile(fileName: string, documentContent: string): Promise<UploadDetailsRecord> {
    const record: UploadDetailsRecord = {
      fileName: fileName,
@@ -1154,11 +1085,38 @@ export default class Collection implements ViewModels.Collection {
    try {
      const parsedContent = JSON.parse(documentContent);
      if (Array.isArray(parsedContent)) {
-        const { numSucceeded, numFailed, numThrottled, errors } = await this.bulkInsertDocuments(parsedContent);
-        record.numSucceeded = numSucceeded;
-        record.numFailed = numFailed;
-        record.numThrottled = numThrottled;
-        record.errors = errors;
+        const chunkSize = 100; // 100 is the max # of bulk operations the SDK currently accepts
+        const chunkedContent = Array.from({ length: Math.ceil(parsedContent.length / chunkSize) }, (_, index) =>
+          parsedContent.slice(index * chunkSize, index * chunkSize + chunkSize),
+        );
+        for (const chunk of chunkedContent) {
+          let retryAttempts = 0;
+          let chunkComplete = false;
+          let documentsToAttempt = chunk;
+          while (retryAttempts < 10 && !chunkComplete) {
+            const responses = await bulkCreateDocument(this, documentsToAttempt);
+            const attemptedDocuments = [...documentsToAttempt];
+            documentsToAttempt = [];
+            responses.forEach((response, index) => {
+              if (response.statusCode === 201) {
+                record.numSucceeded++;
+              } else if (response.statusCode === 429) {
+                documentsToAttempt.push(attemptedDocuments[index]);
+              } else {
+                record.numFailed++;
+              }
+            });
+            if (documentsToAttempt.length === 0) {
+              chunkComplete = true;
+              break;
+            }
+            logConsoleInfo(
+              `${documentsToAttempt.length} document creations were throttled. Waiting ${retryAttempts} seconds and retrying throttled documents`,
+            );
+            retryAttempts++;
+            await sleep(retryAttempts);
+          }
+        }
      } else {
        await createDocument(this, parsedContent);
        record.numSucceeded++;
--- a/src/Explorer/Tree/ResourceTree.tsx
+++ b/src/Explorer/Tree/ResourceTree.tsx
@@ -1,6 +1,7 @@
 import { Tree, TreeItemValue, TreeOpenChangeData, TreeOpenChangeEvent } from "@fluentui/react-components";
 import { Home16Regular } from "@fluentui/react-icons";
 import { AuthType } from "AuthType";
+import { Collection } from "Contracts/ViewModels";
 import { useTreeStyles } from "Explorer/Controls/TreeComponent/Styles";
 import { TreeNode, TreeNodeComponent } from "Explorer/Controls/TreeComponent/TreeNodeComponent";
 import {
@@ -60,7 +61,7 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ explorer }: Resource

  const databaseTreeNodes = useMemo(() => {
    return userContext.authType === AuthType.ResourceToken
-      ? createResourceTokenTreeNodes(resourceTokenCollection)
+      ? createResourceTokenTreeNodes(resourceTokenCollection as Collection)
      : createDatabaseTreeNodes(explorer, isNotebookEnabled, databases, refreshActiveTab);
  }, [resourceTokenCollection, databases, isNotebookEnabled, refreshActiveTab]);

--- a/src/Explorer/Tree/ResourceTreeAdapter.tsx
+++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx
@@ -241,6 +241,21 @@ export class ResourceTreeAdapter implements ReactAdapter {
      contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(this.container, collection),
    });

+    if (
+      useNotebook.getState().isNotebookEnabled &&
+      userContext.apiType === "Mongo" &&
+      isPublicInternetAccessAllowed()
+    ) {
+      children.push({
+        label: "Schema (Preview)",
+        onClick: collection.onSchemaAnalyzerClick.bind(collection),
+        isSelected: () =>
+          useSelectedNode
+            .getState()
+            .isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.SchemaAnalyzer]),
+      });
+    }
+
    if (userContext.apiType !== "Cassandra" || !isServerlessAccount()) {
      children.push({
        label: database.isDatabaseShared() || isServerlessAccount() ? "Settings" : "Scale & Settings",
--- a/src/Explorer/Tree/snapshots/treeNodeUtil.test.ts.snap
+++ b/src/Explorer/Tree/snapshots/treeNodeUtil.test.ts.snap
@@ -338,6 +338,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
            "label": "Documents",
            "onClick": [Function],
          },
+          {
+            "isSelected": [Function],
+            "label": "Schema (Preview)",
+            "onClick": [Function],
+          },
          {
            "id": "",
            "isSelected": [Function],
@@ -401,6 +406,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
            "label": "Documents",
            "onClick": [Function],
          },
+          {
+            "isSelected": [Function],
+            "label": "Schema (Preview)",
+            "onClick": [Function],
+          },
          {
            "id": "",
            "isSelected": [Function],
@@ -505,6 +515,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
            "label": "Documents",
            "onClick": [Function],
          },
+          {
+            "isSelected": [Function],
+            "label": "Schema (Preview)",
+            "onClick": [Function],
+          },
          {
            "id": "sampleSettings",
            "isSelected": [Function],
@@ -595,6 +610,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
            "label": "Documents",
            "onClick": [Function],
          },
+          {
+            "isSelected": [Function],
+            "label": "Schema (Preview)",
+            "onClick": [Function],
+          },
          {
            "id": "",
            "isSelected": [Function],
@@ -720,38 +740,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
 ]
 `;

-exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric non read-only (native) 1`] = `
+exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric non read-only 1`] = `
 [
  {
    "children": [
      {
-        "children": [
-          {
-            "contextMenu": [
-              {
-                "iconSrc": {},
-                "label": "New SQL Query",
-                "onClick": [Function],
-              },
-              {
-                "iconSrc": {},
-                "label": "Delete Container",
-                "onClick": [Function],
-                "styleClass": "deleteCollectionMenuItem",
-              },
-            ],
-            "id": "",
-            "isSelected": [Function],
-            "label": "Items",
-            "onClick": [Function],
-          },
-          {
-            "id": "",
-            "isSelected": [Function],
-            "label": "Settings",
-            "onClick": [Function],
-          },
-        ],
+        "children": undefined,
        "className": "collectionNode",
        "contextMenu": [
          {
@@ -778,38 +772,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
        "onExpanded": [Function],
      },
      {
-        "children": [
-          {
-            "contextMenu": [
-              {
-                "iconSrc": {},
-                "label": "New SQL Query",
-                "onClick": [Function],
-              },
-              {
-                "iconSrc": {},
-                "label": "Delete Container",
-                "onClick": [Function],
-                "styleClass": "deleteCollectionMenuItem",
-              },
-            ],
-            "id": "",
-            "isSelected": [Function],
-            "label": "Items",
-            "onClick": [Function],
-          },
-          {
-            "id": "",
-            "isSelected": [Function],
-            "label": "Settings",
-            "onClick": [Function],
-          },
-          {
-            "isSelected": [Function],
-            "label": "Conflicts",
-            "onClick": [Function],
-          },
-        ],
+        "children": undefined,
        "className": "collectionNode",
        "contextMenu": [
          {
@@ -843,6 +806,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
        "label": "New Container",
        "onClick": [Function],
      },
+      {
+        "iconSrc": {},
+        "label": "Delete Database",
+        "onClick": [Function],
+        "styleClass": "deleteDatabaseMenuItem",
+      },
    ],
    "iconSrc": <DatabaseRegular
      fontSize={16}
@@ -857,33 +826,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
  {
    "children": [
      {
-        "children": [
-          {
-            "contextMenu": [
-              {
-                "iconSrc": {},
-                "label": "New SQL Query",
-                "onClick": [Function],
-              },
-              {
-                "iconSrc": {},
-                "label": "Delete Container",
-                "onClick": [Function],
-                "styleClass": "deleteCollectionMenuItem",
-              },
-            ],
-            "id": "sampleItems",
-            "isSelected": [Function],
-            "label": "Items",
-            "onClick": [Function],
-          },
-          {
-            "id": "sampleSettings",
-            "isSelected": [Function],
-            "label": "Settings",
-            "onClick": [Function],
-          },
-        ],
+        "children": undefined,
        "className": "collectionNode",
        "contextMenu": [
          {
@@ -917,6 +860,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
        "label": "New Container",
        "onClick": [Function],
      },
+      {
+        "iconSrc": {},
+        "label": "Delete Database",
+        "onClick": [Function],
+        "styleClass": "deleteDatabaseMenuItem",
+      },
    ],
    "iconSrc": <DatabaseRegular
      fontSize={16}
@@ -931,88 +880,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
  {
    "children": [
      {
-        "children": [
-          {
-            "contextMenu": [
-              {
-                "iconSrc": {},
-                "label": "New SQL Query",
-                "onClick": [Function],
-              },
-              {
-                "iconSrc": {},
-                "label": "Delete Container",
-                "onClick": [Function],
-                "styleClass": "deleteCollectionMenuItem",
-              },
-            ],
-            "id": "",
-            "isSelected": [Function],
-            "label": "Items",
-            "onClick": [Function],
-          },
-          {
-            "id": "",
-            "isSelected": [Function],
-            "label": "Settings",
-            "onClick": [Function],
-          },
-          {
-            "children": [
-              {
-                "children": [
-                  {
-                    "children": [
-                      {
-                        "label": "string",
-                      },
-                      {
-                        "label": "HasNulls: false",
-                      },
-                    ],
-                    "label": "street",
-                  },
-                  {
-                    "children": [
-                      {
-                        "label": "string",
-                      },
-                      {
-                        "label": "HasNulls: true",
-                      },
-                    ],
-                    "label": "line2",
-                  },
-                  {
-                    "children": [
-                      {
-                        "label": "number",
-                      },
-                      {
-                        "label": "HasNulls: false",
-                      },
-                    ],
-                    "label": "zip",
-                  },
-                ],
-                "label": "address",
-              },
-              {
-                "children": [
-                  {
-                    "label": "string",
-                  },
-                  {
-                    "label": "HasNulls: false",
-                  },
-                ],
-                "label": "orderId",
-              },
-            ],
-            "label": "Schema",
-            "onClick": [Function],
-          },
-        ],
+        "children": undefined,
        "className": "collectionNode",
        "contextMenu": [
          {
@@ -1051,6 +919,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
        "label": "New Container",
        "onClick": [Function],
      },
+      {
+        "iconSrc": {},
+        "label": "Delete Database",
+        "onClick": [Function],
+        "styleClass": "deleteDatabaseMenuItem",
+      },
    ],
    "iconSrc": <DatabaseRegular
      fontSize={16}
@@ -1065,7 +939,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
 ]
 `;

-exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric read-only (mirrored) 1`] = `
+exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric read-only 1`] = `
 [
  {
    "children": [
@@ -2392,7 +2266,7 @@ exports[`createResourceTokenTreeNodes creates the expected tree nodes 1`] = `
      },
    ],
    "className": "collectionNode",
-    "iconSrc": <DocumentMultipleRegular
+    "iconSrc": <EyeRegular
      fontSize={16}
    />,
    "isExpanded": true,
--- a/src/Explorer/Tree/treeNodeUtil.test.ts
+++ b/src/Explorer/Tree/treeNodeUtil.test.ts
@@ -82,7 +82,7 @@ jest.mock("Explorer/Tree/Trigger", () => {
 jest.mock("Common/DatabaseAccountUtility", () => {
  return {
    isPublicInternetAccessAllowed: () => true,
-    isGlobalSecondaryIndexEnabled: () => false,
+    isMaterializedViewsEnabled: () => false,
  };
 });

@@ -373,28 +373,18 @@ describe("createDatabaseTreeNodes", () => {

  it.each<[string, Platform, boolean, Partial<DataModels.DatabaseAccountExtendedProperties>, Partial<UserContext>]>([
    [
-      "the SQL API, on Fabric read-only (mirrored)",
+      "the SQL API, on Fabric read-only",
      Platform.Fabric,
      false,
      { capabilities: [], enableMultipleWriteLocations: true },
-      {
-        fabricContext: {
-          isReadOnly: true,
-          artifactType: CosmosDbArtifactType.MIRRORED_KEY,
-        } as FabricContext<CosmosDbArtifactType>,
-      },
+      { fabricContext: { isReadOnly: true } as FabricContext<CosmosDbArtifactType> },
    ],
    [
-      "the SQL API, on Fabric non read-only (native)",
+      "the SQL API, on Fabric non read-only",
      Platform.Fabric,
      false,
      { capabilities: [], enableMultipleWriteLocations: true },
-      {
-        fabricContext: {
-          isReadOnly: false,
-          artifactType: CosmosDbArtifactType.NATIVE,
-        } as FabricContext<CosmosDbArtifactType>,
-      },
+      { fabricContext: { isReadOnly: false } as FabricContext<CosmosDbArtifactType> },
    ],
    [
      "the SQL API, on Portal",
--- a/src/Explorer/Tree/treeNodeUtil.tsx
+++ b/src/Explorer/Tree/treeNodeUtil.tsx
@@ -6,11 +6,12 @@ import StoredProcedure from "Explorer/Tree/StoredProcedure";
 import Trigger from "Explorer/Tree/Trigger";
 import UserDefinedFunction from "Explorer/Tree/UserDefinedFunction";
 import { useDatabases } from "Explorer/useDatabases";
-import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
+import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
 import { getItemName } from "Utils/APITypeUtils";
 import { isServerlessAccount } from "Utils/CapabilityUtils";
 import { useTabs } from "hooks/useTabs";
 import React from "react";
+import { isPublicInternetAccessAllowed } from "../../Common/DatabaseAccountUtility";
 import { Platform, configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
@@ -18,16 +19,17 @@ import { userContext } from "../../UserContext";
 import * as ResourceTreeContextMenuButtonFactory from "../ContextMenuButtonFactory";
 import Explorer from "../Explorer";
 import { useCommandBar } from "../Menus/CommandBar/CommandBarComponentAdapter";
+import { useNotebook } from "../Notebook/useNotebook";
 import { useSelectedNode } from "../useSelectedNode";

 export const shouldShowScriptNodes = (): boolean => {
-  return !isFabric() && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
+  return !isFabricMirrored() && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
 };

 const TreeDatabaseIcon = <DatabaseRegular fontSize={16} />;
 const TreeSettingsIcon = <SettingsRegular fontSize={16} />;
 const TreeCollectionIcon = <DocumentMultipleRegular fontSize={16} />;
-const GlobalSecondaryIndexCollectionIcon = <EyeRegular fontSize={16} />; //check icon
+const MaterializedViewCollectionIcon = <EyeRegular fontSize={16} />; //check icon

 export const createSampleDataTreeNodes = (sampleDataResourceTokenCollection: ViewModels.CollectionBase): TreeNode[] => {
  const updatedSampleTree: TreeNode = {
@@ -79,7 +81,7 @@ export const createSampleDataTreeNodes = (sampleDataResourceTokenCollection: Vie
  return [updatedSampleTree];
 };

-export const createResourceTokenTreeNodes = (collection: ViewModels.CollectionBase): TreeNode[] => {
+export const createResourceTokenTreeNodes = (collection: ViewModels.Collection): TreeNode[] => {
  if (!collection) {
    return [
      {
@@ -109,7 +111,7 @@ export const createResourceTokenTreeNodes = (collection: ViewModels.CollectionBa
    isExpanded: true,
    children,
    className: "collectionNode",
-    iconSrc: TreeCollectionIcon,
+    iconSrc: collection.materializedViewDefinition() ? MaterializedViewCollectionIcon : TreeCollectionIcon,
    onClick: () => {
      // Rewritten version of expandCollapseCollection
      useSelectedNode.getState().setSelectedNode(collection);
@@ -218,7 +220,7 @@ export const buildCollectionNode = (
 ): TreeNode => {
  let children: TreeNode[];
  // Flat Tree for Fabric
-  if (!isFabricMirrored()) {
+  if (configContext.platform !== Platform.Fabric) {
    children = buildCollectionNodeChildren(database, collection, isNotebookEnabled, container, refreshActiveTab);
  }

@@ -227,7 +229,7 @@ export const buildCollectionNode = (
    children: children,
    className: "collectionNode",
    contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
-    iconSrc: collection.materializedViewDefinition() ? GlobalSecondaryIndexCollectionIcon : TreeCollectionIcon,
+    iconSrc: collection.materializedViewDefinition() ? MaterializedViewCollectionIcon : TreeCollectionIcon,
    onClick: () => {
      useSelectedNode.getState().setSelectedNode(collection);
      collection.openTab();
@@ -292,6 +294,22 @@ const buildCollectionNodeChildren = (
    contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(container, collection),
  });

+  if (
+    isNotebookEnabled &&
+    userContext.apiType === "Mongo" &&
+    isPublicInternetAccessAllowed() &&
+    useNotebook.getState().isPhoenixFeatures
+  ) {
+    children.push({
+      label: "Schema (Preview)",
+      onClick: collection.onSchemaAnalyzerClick.bind(collection),
+      isSelected: () =>
+        useSelectedNode
+          .getState()
+          .isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.SchemaAnalyzer]),
+    });
+  }
+
  if (userContext.apiType !== "Cassandra" || !isServerlessAccount()) {
    let id = "";
    if (collection.isSampleCollection) {
@@ -300,7 +318,7 @@ const buildCollectionNodeChildren = (

    children.push({
      id,
-      label: database.isDatabaseShared() || isServerlessAccount() || isFabricNative() ? "Settings" : "Scale & Settings",
+      label: database.isDatabaseShared() || isServerlessAccount() ? "Settings" : "Scale & Settings",
      onClick: collection.onSettingsClick.bind(collection),
      isSelected: () =>
        useSelectedNode
--- a/src/Localization/en/MaterializedViewsBuilder.json
+++ b/src/Localization/en/MaterializedViewsBuilder.json
@@ -1,11 +1,11 @@
 {
-    "MaterializedViewsBuilderDescription": "Provision a materialized views builder for your Azure Cosmos DB account. Materialized views builder is compute in your account that performs read operations on source collection for any updates and applies them on materialized views as per the materialized view definition.",
-    "MaterializedViewsBuilder": "Materialized views builder",
+    "MaterializedViewsBuilderDescription": "Provision a Materializedviews builder cluster for your Azure Cosmos DB account. Materializedviews builder is compute in your account that performs read operations on source collection for any updates and applies them on materialized views as per the materializedview definition.",
+    "MaterializedViewsBuilder": "Materializedviews Builder",
    "Provisioned": "Provisioned",
    "Deprovisioned": "Deprovisioned",
-    "LearnAboutMaterializedViews": "Learn more about materialized views.",
-    "DeprovisioningDetailsText": "Learn more about materialized views.",
-    "MaterializedviewsBuilderPricing": "Learn more about materialized views pricing.",
+    "LearnAboutMaterializedViews": "Learn more about materializedviews.",
+    "DeprovisioningDetailsText": "Learn more about materializedviews.",
+    "MaterializedviewsBuilderPricing": "Learn more about materializedviews pricing.",
    "SKUs": "SKUs",
    "SKUsPlaceHolder": "Select SKUs",
    "NumberOfInstances": "Number of instances",
@@ -14,58 +14,35 @@
    "CosmosD8s": "Cosmos.D8s (General Purpose Cosmos Compute with 8 vCPUs, 32 GB Memory)",
    "CosmosD16s": "Cosmos.D16s (General Purpose Cosmos Compute with 16 vCPUs, 64 GB Memory)",
    "CosmosD32s": "Cosmos.D32s (General Purpose Cosmos Compute with 32 vCPUs, 128 GB Memory)",
-    "CreateMessage": "Materialized views builder resource is being created.",
+    "CreateMessage": "MaterializedViewsBuilder resource is being created.",
    "CreateInitializeTitle": "Provisioning resource",
-    "CreateInitializeMessage": "Materialized views builder resource will be provisioned.",
+    "CreateInitializeMessage": "Materializedviews Builder resource will be provisioned.",
    "CreateSuccessTitle": "Resource provisioned",
-    "CreateSuccesseMessage": "Materialized views builder resource provisioned.",
+    "CreateSuccesseMessage": "Materializedviews Builder resource provisioned.",
    "CreateFailureTitle": "Failed to provision resource",
-    "CreateFailureMessage": "Materialized views builder resource provisioning failed.",
-    "UpdateMessage": "Materialized views builder resource is being updated.",
+    "CreateFailureMessage": "Materializedviews Builder resource provisioning failed.",
+    "UpdateMessage": "MaterializedViewsBuilder resource is being updated.",
    "UpdateInitializeTitle": "Updating resource",
-    "UpdateInitializeMessage": "Materialized views builder resource will be updated.",
+    "UpdateInitializeMessage": "Materializedviews Builder resource will be updated.",
    "UpdateSuccessTitle": "Resource updated",
-    "UpdateSuccesseMessage": "Materialized views builder resource updated.",
+    "UpdateSuccesseMessage": "Materializedviews Builder resource updated.",
    "UpdateFailureTitle": "Failed to update resource",
-    "UpdateFailureMessage": "Materialized views builder resource update failed.",
-    "DeleteMessage": "Materialized views builder resource is being deleted.",
+    "UpdateFailureMessage": "Materializedviews Builder resource updation failed.",
+    "DeleteMessage": "MaterializedViewsBuilder resource is being deleted.",
    "DeleteInitializeTitle": "Deleting resource",
-    "DeleteInitializeMessage": "Materialized views builder resource will be deleted.",
+    "DeleteInitializeMessage": "Materializedviews Builder resource will be deleted.",
    "DeleteSuccessTitle": "Resource deleted",
-    "DeleteSuccesseMessage": "Materialized views builder resource deleted.",
+    "DeleteSuccesseMessage": "Materializedviews Builder resource deleted.",
    "DeleteFailureTitle": "Failed to delete resource",
-    "DeleteFailureMessage": "Materialized views builder resource deletion failed.",
+    "DeleteFailureMessage": "Materializedviews Builder resource deletion failed.",
    "ApproximateCost": "Approximate Cost Per Hour",
-    "CostText": "Hourly cost of the materialized views builder resource depends on the SKU selection, number of instances per region, and number of regions.",
+    "CostText": "Hourly cost of the Materializedviews Builder resource depends on the SKU selection, number of instances per region, and number of regions.",
    "MetricsString": "Metrics",
-    "MetricsText": "Monitor the CPU and memory usage for the materialized views builder instances in ",
+    "MetricsText": "Monitor the CPU and memory usage for the Materializedviews Builder instances in ",
    "MetricsBlade": "the metrics blade.",
    "MonitorUsage": "Monitor Usage",
-    "ResizingDecisionText": "To understand if the materialized views builder is the right size, ",
-    "ResizingDecisionLink": "learn more about materialized views builder sizing.",
-    "WarningBannerOnUpdate": "Adding or modifying materialized views builder instances may affect your bill.",
-    "WarningBannerOnDelete": "After deprovisioning the materialized views builder, your materialized views will not be updated with new source changes anymore. Materialized views builder is compute in your account that performs read operations on source containers for any updates and applies them on materialized views as per the materialized view definition.",
-    "GlobalsecondaryindexesBuilderDescription": "Provision a global secondary indexes builder for your Azure Cosmos DB account. The global secondary indexes builder is compute in your account that performs read operations on source collections for any updates and populates the global secondary indexes as per their definition.",
-    "GlobalsecondaryindexesBuilder": "Global secondary indexes builder",
-    "LearnAboutGlobalSecondaryIndexes": "Learn more about global secondary indexes.",
-    "GlobalsecondaryindexesDeprovisioningDetailsText": "Learn more about global secondary indexes.",
-    "GlobalsecondaryindexesBuilderPricing": "Learn more about global secondary indexes pricing.",
-    "GlobalsecondaryindexesCreateMessage": "Global secondary indexes builder resource is being created.",
-    "GlobalsecondaryindexesCreateInitializeMessage": "Global secondary indexes builder resource will be provisioned.",
-    "GlobalsecondaryindexesCreateSuccesseMessage": "Global secondary indexes builder resource provisioned.",
-    "GlobalsecondaryindexesCreateFailureMessage": "Global secondary indexes builder resource provisioning failed.",
-    "GlobalsecondaryindexesUpdateMessage": "Global secondary indexes builder resource is being updated.",
-    "GlobalsecondaryindexesUpdateInitializeMessage": "Global secondary indexes builder resource will be updated.",
-    "GlobalsecondaryindexesUpdateSuccesseMessage": "Global secondary indexes builder resource updated.",
-    "GlobalsecondaryindexesUpdateFailureMessage": "Global secondary indexes builder resource update failed.",
-    "GlobalsecondaryindexesDeleteMessage": "Global secondary indexes builder resource is being deleted.",
-    "GlobalsecondaryindexesDeleteInitializeMessage": "Global secondary indexes builder resource will be deleted.",
-    "GlobalsecondaryindexesDeleteSuccesseMessage": "Global secondary indexes builder resource deleted.",
-    "GlobalsecondaryindexesDeleteFailureMessage": "Global secondary indexes builder resource deletion failed.",
-    "GlobalsecondaryindexesCostText": "Hourly cost of the global secondary indexes builder resource depends on the SKU selection, number of instances per region, and number of regions.",
-    "GlobalsecondaryindexesMetricsText": "Monitor the CPU and memory usage for the global secondary indexes builder instances in ",
-    "GlobalsecondaryindexesResizingDecisionText": "To understand if the global secondary indexes builder is the right size, ",
-    "GlobalsecondaryindexesesizingDecisionLink": "learn more about global secondary indexes builder sizing.",
-    "GlobalsecondaryindexesWarningBannerOnUpdate": "Adding or modifying global secondary indexes builder instances may affect your bill.",
-    "GlobalsecondaryindexesWarningBannerOnDelete": "After deprovisioning the global secondary indexes builder, your global secondary indexes will no longer be updated with new source changes. Global secondary indexes builder is compute in your account that performs read operations on source containers for any updates and applies them on global secondary indexes as per their definition."
+    "ResizingDecisionText": "To understand if the Materializedviews Builder is the right size, ",
+    "ResizingDecisionLink": "learn more about Materializedviews Builder sizing.",
+    "WarningBannerOnUpdate": "Adding or modifying Materializedviews Builder instances may affect your bill.",
+    "WarningBannerOnDelete": "After deprovisioning the Materializedviews Builder, your materializedviews will not be updated with new source changes anymore. Materializedviews builder is compute in your account that performs read operations on source collection for any updates and applies them on materialized views as per the materializedview definition."
 }
--- a/src/Phoenix/PhoenixClient.ts
+++ b/src/Phoenix/PhoenixClient.ts
@@ -4,7 +4,7 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { userContext } from "UserContext";
 import { allowedJunoOrigins, validateEndpoint } from "Utils/EndpointUtils";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
-import promiseRetry, { AbortError, Options } from "p-retry";
+import promiseRetry, { AbortError } from "p-retry";
 import {
  Areas,
  ConnectionStatusType,
@@ -35,26 +35,21 @@ import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 export class PhoenixClient {
  private armResourceId: string;
  private containerHealthHandler: NodeJS.Timeout;
-  private retryOptions: Options = {
+  private retryOptions: promiseRetry.Options = {
    retries: Notebook.retryAttempts,
    maxTimeout: Notebook.retryAttemptDelayMs,
    minTimeout: Notebook.retryAttemptDelayMs,
  };
-  private abortController: AbortController;
-  private abortSignal: AbortSignal;

  constructor(armResourceId: string) {
    this.armResourceId = armResourceId;
  }

  public async allocateContainer(provisionData: IProvisionData): Promise<IResponse<IPhoenixServiceInfo>> {
-    this.initializeCancelEventListener();
-
    return promiseRetry(() => this.executeContainerAssignmentOperation(provisionData, "allocate"), {
      retries: 4,
      maxTimeout: 20000,
      minTimeout: 20000,
-      signal: this.abortSignal,
    });
  }

@@ -275,17 +270,6 @@ export class PhoenixClient {
    };
  }

-  private initializeCancelEventListener(): void {
-    this.abortController = new AbortController();
-    this.abortSignal = this.abortController.signal;
-
-    document.addEventListener("keydown", (event: KeyboardEvent) => {
-      if (event.ctrlKey && (event.key === "c" || event.key === "z")) {
-        this.abortController.abort(new AbortError("Request canceled"));
-      }
-    });
-  }
-
  public ConvertToForbiddenErrorString(jsonData: IPhoenixError): string {
    const errInfo = jsonData;
    switch (errInfo?.type) {
--- a/src/SelfServe/MaterializedViewsBuilder/MaterializedViewsBuilder.rp.ts
+++ b/src/SelfServe/MaterializedViewsBuilder/MaterializedViewsBuilder.rp.ts
@@ -6,9 +6,9 @@ import { RefreshResult } from "../SelfServeTypes";
 import MaterializedViewsBuilder from "./MaterializedViewsBuilder";
 import {
  FetchPricesResponse,
-  MaterializedViewsBuilderServiceResource,
  PriceMapAndCurrencyCode,
  RegionsResponse,
+  MaterializedViewsBuilderServiceResource,
  UpdateMaterializedViewsBuilderRequestParameters,
 } from "./MaterializedViewsBuilderTypes";

@@ -123,23 +123,11 @@ export const refreshMaterializedViewsBuilderProvisioning = async (): Promise<Ref
    if (response.properties.status === ResourceStatus.Running.toString()) {
      return { isUpdateInProgress: false, updateInProgressMessageTKey: undefined };
    } else if (response.properties.status === ResourceStatus.Creating.toString()) {
-      return {
-        isUpdateInProgress: true,
-        updateInProgressMessageTKey:
-          userContext.apiType === "SQL" ? "GlobalsecondaryindexesCreateMessage" : "CreateMessage",
-      };
+      return { isUpdateInProgress: true, updateInProgressMessageTKey: "CreateMessage" };
    } else if (response.properties.status === ResourceStatus.Deleting.toString()) {
-      return {
-        isUpdateInProgress: true,
-        updateInProgressMessageTKey:
-          userContext.apiType === "SQL" ? "GlobalsecondaryindexesDeleteMessage" : "DeleteMessage",
-      };
+      return { isUpdateInProgress: true, updateInProgressMessageTKey: "DeleteMessage" };
    } else {
-      return {
-        isUpdateInProgress: true,
-        updateInProgressMessageTKey:
-          userContext.apiType === "SQL" ? "GlobalsecondaryindexesUpdateMessage" : "UpdateMessage",
-      };
+      return { isUpdateInProgress: true, updateInProgressMessageTKey: "UpdateMessage" };
    }
  } catch {
    //TODO differentiate between different failures
--- a/src/SelfServe/MaterializedViewsBuilder/MaterializedViewsBuilder.tsx
+++ b/src/SelfServe/MaterializedViewsBuilder/MaterializedViewsBuilder.tsx
@@ -29,20 +29,17 @@ import {
  updateMaterializedViewsBuilderResource,
 } from "./MaterializedViewsBuilder.rp";

-import { userContext } from "../../UserContext";
-
 const costPerHourDefaultValue: Description = {
-  textTKey: userContext.apiType === "SQL" ? "GlobalsecondaryindexesCostText" : "CostText",
+  textTKey: "CostText",
  type: DescriptionType.Text,
  link: {
    href: "https://aka.ms/cosmos-db-materializedviewsbuilder-pricing",
-    textTKey:
-      userContext.apiType === "SQL" ? "GlobalsecondaryindexesBuilderPricing" : "MaterializedviewsBuilderPricing",
+    textTKey: "MaterializedviewsBuilderPricing",
  },
 };

 const metricsStringValue: Description = {
-  textTKey: userContext.apiType === "SQL" ? "GlobalsecondaryindexesMetricsText" : "MetricsText",
+  textTKey: "MetricsText",
  type: DescriptionType.Text,
  link: {
    href: generateBladeLink(BladeType.Metrics),
@@ -79,8 +76,7 @@ const onNumberOfInstancesChange = (
        textTKey: "WarningBannerOnUpdate",
        link: {
          href: "https://aka.ms/cosmos-db-materializedviewsbuilder-pricing",
-          textTKey:
-            userContext.apiType === "SQL" ? "GlobalsecondaryindexesBuilderPricing" : "MaterializedviewsBuilderPricing",
+          textTKey: "MaterializedviewsBuilderPricing",
        },
      } as Description,
      hidden: false,
@@ -120,8 +116,7 @@ const onEnableMaterializedViewsBuilderChange = (
        textTKey: "WarningBannerOnUpdate",
        link: {
          href: "https://aka.ms/cosmos-db-materializedviewsbuilder-pricing",
-          textTKey:
-            userContext.apiType === "SQL" ? "GlobalsecondaryindexesBuilderPricing" : "MaterializedviewsBuilderPricing",
+          textTKey: "MaterializedviewsBuilderPricing",
        },
      } as Description,
      hidden: false,
@@ -134,17 +129,10 @@ const onEnableMaterializedViewsBuilderChange = (
  } else {
    currentValues.set("warningBanner", {
      value: {
-        textTKey:
-          userContext.apiType === "SQL" ? "GlobalsecondaryindexesWarningBannerOnDelete" : "WarningBannerOnDelete",
+        textTKey: "WarningBannerOnDelete",
        link: {
-          href:
-            userContext.apiType === "SQL"
-              ? "https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/materialized-views"
-              : "https://learn.microsoft.com/en-us/azure/cosmos-db/cassandra/materialized-views",
-          textTKey:
-            userContext.apiType === "SQL"
-              ? "GlobalsecondaryindexesDeprovisioningDetailsText"
-              : "DeprovisioningDetailsText",
+          href: "https://aka.ms/cosmos-db-materializedviews",
+          textTKey: "DeprovisioningDetailsText",
        },
      } as Description,
      hidden: false,
@@ -194,19 +182,18 @@ const getInstancesMax = async (): Promise<number> => {
 };

 const NumberOfInstancesDropdownInfo: Info = {
-  messageTKey: userContext.apiType === "SQL" ? "GlobalsecondaryindexesResizingDecisionText" : "ResizingDecisionText",
+  messageTKey: "ResizingDecisionText",
  link: {
    href: "https://aka.ms/cosmos-db-materializedviewsbuilder-size",
-    textTKey: userContext.apiType === "SQL" ? "GlobalsecondaryindexesesizingDecisionLink" : "ResizingDecisionLink",
+    textTKey: "ResizingDecisionLink",
  },
 };

 const ApproximateCostDropDownInfo: Info = {
-  messageTKey: userContext.apiType === "SQL" ? "GlobalsecondaryindexesCostText" : "CostText",
+  messageTKey: "CostText",
  link: {
    href: "https://aka.ms/cosmos-db-materializedviewsbuilder-pricing",
-    textTKey:
-      userContext.apiType === "SQL" ? "GlobalsecondaryindexesBuilderPricing" : "MaterializedviewsBuilderPricing",
+    textTKey: "MaterializedviewsBuilderPricing",
  },
 };

@@ -281,20 +268,15 @@ export default class MaterializedViewsBuilder extends SelfServeBaseClass {
          portalNotification: {
            initialize: {
              titleTKey: "DeleteInitializeTitle",
-              messageTKey:
-                userContext.apiType === "SQL"
-                  ? "GlobalsecondaryindexesDeleteInitializeMessage"
-                  : "DeleteInitializeMessage",
+              messageTKey: "DeleteInitializeMessage",
            },
            success: {
              titleTKey: "DeleteSuccessTitle",
-              messageTKey:
-                userContext.apiType === "SQL" ? "GlobalsecondaryindexesDeleteSuccesseMessage" : "DeleteSuccesseMessage",
+              messageTKey: "DeleteSuccesseMessage",
            },
            failure: {
              titleTKey: "DeleteFailureTitle",
-              messageTKey:
-                userContext.apiType === "SQL" ? "GlobalsecondaryindexesDeleteFailureMessage" : "DeleteFailureMessage",
+              messageTKey: "DeleteFailureMessage",
            },
          },
        };
@@ -307,20 +289,15 @@ export default class MaterializedViewsBuilder extends SelfServeBaseClass {
          portalNotification: {
            initialize: {
              titleTKey: "UpdateInitializeTitle",
-              messageTKey:
-                userContext.apiType === "SQL"
-                  ? "GlobalsecondaryindexesUpdateInitializeMessage"
-                  : "UpdateInitializeMessage",
+              messageTKey: "UpdateInitializeMessage",
            },
            success: {
              titleTKey: "UpdateSuccessTitle",
-              messageTKey:
-                userContext.apiType === "SQL" ? "GlobalsecondaryindexesUpdateSuccesseMessage" : "UpdateSuccesseMessage",
+              messageTKey: "UpdateSuccesseMessage",
            },
            failure: {
              titleTKey: "UpdateFailureTitle",
-              messageTKey:
-                userContext.apiType === "SQL" ? "GlobalsecondaryindexesUpdateFailureMessage" : "UpdateFailureMessage",
+              messageTKey: "UpdateFailureMessage",
            },
          },
        };
@@ -334,20 +311,15 @@ export default class MaterializedViewsBuilder extends SelfServeBaseClass {
        portalNotification: {
          initialize: {
            titleTKey: "CreateInitializeTitle",
-            messageTKey:
-              userContext.apiType === "SQL"
-                ? "GlobalsecondaryindexesCreateInitializeMessage"
-                : "CreateInitializeMessage",
+            messageTKey: "CreateInitializeMessage",
          },
          success: {
            titleTKey: "CreateSuccessTitle",
-            messageTKey:
-              userContext.apiType === "SQL" ? "GlobalsecondaryindexesCreateSuccesseMessage" : "CreateSuccesseMessage",
+            messageTKey: "CreateSuccesseMessage",
          },
          failure: {
            titleTKey: "CreateFailureTitle",
-            messageTKey:
-              userContext.apiType === "SQL" ? "GlobalsecondaryindexesCreateFailureMessage" : "CreateFailureMessage",
+            messageTKey: "CreateFailureMessage",
          },
        },
      };
@@ -394,17 +366,11 @@ export default class MaterializedViewsBuilder extends SelfServeBaseClass {

  @Values({
    description: {
-      textTKey:
-        userContext.apiType === "SQL"
-          ? "GlobalsecondaryindexesBuilderDescription"
-          : "MaterializedViewsBuilderDescription",
+      textTKey: "MaterializedViewsBuilderDescription",
      type: DescriptionType.Text,
      link: {
-        href:
-          userContext.apiType === "SQL"
-            ? "https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/materialized-views"
-            : "https://learn.microsoft.com/en-us/azure/cosmos-db/cassandra/materialized-views",
-        textTKey: userContext.apiType === "SQL" ? "LearnAboutGlobalSecondaryIndexes" : "LearnAboutMaterializedViews",
+        href: "https://aka.ms/cosmos-db-materializedviews",
+        textTKey: "LearnAboutMaterializedViews",
      },
    },
  })
@@ -412,7 +378,7 @@ export default class MaterializedViewsBuilder extends SelfServeBaseClass {

  @OnChange(onEnableMaterializedViewsBuilderChange)
  @Values({
-    labelTKey: userContext.apiType === "SQL" ? "GlobalSecondaryIndexesBuilder" : "MaterializedViewsBuilder",
+    labelTKey: "MaterializedViewsBuilder",
    trueLabelTKey: "Provisioned",
    falseLabelTKey: "Deprovisioned",
  })
--- a/src/SelfServe/SelfServe.tsx
+++ b/src/SelfServe/SelfServe.tsx
@@ -11,24 +11,13 @@ import { updateUserContext } from "../UserContext";
 import { isInvalidParentFrameOrigin } from "../Utils/MessageValidation";
 import "./SelfServe.less";
 import { SelfServeComponent } from "./SelfServeComponent";
-import { SelfServeBaseClass, SelfServeDescriptor } from "./SelfServeTypes";
+import { SelfServeDescriptor } from "./SelfServeTypes";
 import { SelfServeType } from "./SelfServeUtils";
 initializeIcons();

-const loadTranslationFile = async (
-  className: string | SelfServeBaseClass,
-  selfServeType?: SelfServeType,
-): Promise<void> => {
+const loadTranslationFile = async (className: string): Promise<void> => {
  const language = i18n.languages[0];
-  let namespace: string; // className is used as a key to retrieve the localized strings
-  let fileName: string;
-  if (className instanceof SelfServeBaseClass) {
-    fileName = `${selfServeType}.json`;
-    namespace = className.constructor.name;
-  } else {
-    fileName = `${className}.json`;
-    namespace = className;
-  }
+  const fileName = `${className}.json`;

  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  let translations: any;
@@ -39,16 +28,12 @@ const loadTranslationFile = async (
  } catch (e) {
    translations = await import(/* webpackChunkName: "Localization-en-[request]" */ `../Localization/en/${fileName}`);
  }
-
-  i18n.addResourceBundle(language, namespace, translations.default, true);
+  i18n.addResourceBundle(language, className, translations.default, true);
 };

-const loadTranslations = async (
-  className: string | SelfServeBaseClass,
-  selfServeType: SelfServeType,
-): Promise<void> => {
+const loadTranslations = async (className: string): Promise<void> => {
  await loadTranslationFile("Common");
-  await loadTranslationFile(className, selfServeType);
+  await loadTranslationFile(className);
 };

 const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDescriptor> => {
@@ -56,13 +41,13 @@ const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDes
    case SelfServeType.example: {
      const SelfServeExample = await import(/* webpackChunkName: "SelfServeExample" */ "./Example/SelfServeExample");
      const selfServeExample = new SelfServeExample.default();
-      await loadTranslations(selfServeExample, selfServeType);
+      await loadTranslations(selfServeType);
      return selfServeExample.toSelfServeDescriptor();
    }
    case SelfServeType.sqlx: {
      const SqlX = await import(/* webpackChunkName: "SqlX" */ "./SqlX/SqlX");
      const sqlX = new SqlX.default();
-      await loadTranslations(sqlX, selfServeType);
+      await loadTranslations(selfServeType);
      return sqlX.toSelfServeDescriptor();
    }
    case SelfServeType.graphapicompute: {
@@ -70,7 +55,7 @@ const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDes
        /* webpackChunkName: "GraphAPICompute" */ "./GraphAPICompute/GraphAPICompute"
      );
      const graphAPICompute = new GraphAPICompute.default();
-      await loadTranslations(graphAPICompute, selfServeType);
+      await loadTranslations(selfServeType);
      return graphAPICompute.toSelfServeDescriptor();
    }
    case SelfServeType.materializedviewsbuilder: {
@@ -78,7 +63,7 @@ const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDes
        /* webpackChunkName: "MaterializedViewsBuilder" */ "./MaterializedViewsBuilder/MaterializedViewsBuilder"
      );
      const materializedViewsBuilder = new MaterializedViewsBuilder.default();
-      await loadTranslations(materializedViewsBuilder, selfServeType);
+      await loadTranslations(selfServeType);
      return materializedViewsBuilder.toSelfServeDescriptor();
    }
    default:
--- a/src/SelfServe/SelfServeComponent.tsx
+++ b/src/SelfServe/SelfServeComponent.tsx
@@ -10,7 +10,7 @@ import {
  Text,
 } from "@fluentui/react";
 import { TFunction } from "i18next";
-import promiseRetry, { AbortError, Options } from "p-retry";
+import promiseRetry, { AbortError } from "p-retry";
 import React from "react";
 import { WithTranslation } from "react-i18next";
 import * as _ from "underscore";
@@ -80,7 +80,7 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
  private static readonly defaultRetryIntervalInMs = 30000;
  private smartUiGeneratorClassName: string;
  private retryIntervalInMs: number;
-  private retryOptions: Options;
+  private retryOptions: promiseRetry.Options;
  private translationFunction: TFunction;

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

@@ -291,6 +286,6 @@ export const getOfferingIds = async (regions: Array<RegionItem>): Promise<Offeri
  } catch (err) {
    const failureTelemetry = { err, selfServeClassName: SqlX.name };
    selfServeTraceFailure(failureTelemetry, getOfferingIdsCodeTimestamp);
-    return new Map<string, Map<string, string>>();
+    return undefined;
  }
 };
--- a/src/SelfServe/SqlX/SqlX.tsx
+++ b/src/SelfServe/SqlX/SqlX.tsx
@@ -227,13 +227,11 @@ const calculateCost = (skuName: string, instanceCount: number): Description => {
    let costPerHour = 0;
    let costBreakdown = "";
    for (const regionItem of regions) {
-      const incrementalCost = priceMap?.get(regionItem.locationName)?.get(skuName.replace("Cosmos.", ""));
+      const incrementalCost = priceMap.get(regionItem.locationName).get(skuName.replace("Cosmos.", ""));
      if (incrementalCost === undefined) {
        throw new Error(`${regionItem.locationName} not found in price map.`);
      } else if (incrementalCost === 0) {
        throw new Error(`${regionItem.locationName} cost per hour = 0`);
-      } else if (currencyCode === undefined) {
-        throw new Error(`Currency code not found in price map.`);
      }

      let regionalInstanceCount = instanceCount;
--- a/src/Shared/AppStatePersistenceUtility.ts
+++ b/src/Shared/AppStatePersistenceUtility.ts
@@ -10,7 +10,6 @@ export enum AppStateComponentNames {
  MostRecentActivity = "MostRecentActivity",
  QueryCopilot = "QueryCopilot",
  DataExplorerAction = "DataExplorerAction",
-  SelectedRegionalEndpoint = "SelectedRegionalEndpoint",
 }

 // Subcomponent for DataExplorerAction
--- a/src/Shared/Telemetry/TelemetryConstants.ts
+++ b/src/Shared/Telemetry/TelemetryConstants.ts
@@ -1,18 +1,17 @@
 // Data Explorer specific actions. No need to keep this in sync with the one in Portal.
-// Some of the enums names are used in Fabric. Please do not rename them.
 export enum Action {
  CollapseTreeNode,
-  CreateCollection, // Used in Fabric. Please do not rename.
-  CreateGlobalSecondaryIndex,
-  CreateDocument, // Used in Fabric. Please do not rename.
+  CreateCollection,
+  CreateMaterializedView,
+  CreateDocument,
  CreateStoredProcedure,
  CreateTrigger,
  CreateUDF,
-  DeleteCollection, // Used in Fabric. Please do not rename.
+  DeleteCollection,
  DeleteDatabase,
  DeleteDocument,
  ExpandTreeNode,
-  ExecuteQuery, // Used in Fabric. Please do not rename.
+  ExecuteQuery,
  HasFeature,
  GetVNETServices,
  InitializeAccountLocationFromResourceGroup,
@@ -121,7 +120,7 @@ export enum Action {
  NotebooksGalleryPublishedCount,
  SelfServe,
  ExpandAddCollectionPaneAdvancedSection,
-  ExpandAddGlobalSecondaryIndexPaneAdvancedSection,
+  ExpandAddMaterializedViewPaneAdvancedSection,
  SchemaAnalyzerClickAnalyze,
  SelfServeComponent,
  LaunchQuickstart,
@@ -145,7 +144,6 @@ export enum Action {
  ReadPersistedTabState,
  SavePersistedTabState,
  DeletePersistedTabState,
-  UploadDocuments, // Used in Fabric. Please do not rename.
 }

 export const ActionModifiers = {
--- a/src/Terminal/JupyterLabAppFactory.ts
+++ b/src/Terminal/JupyterLabAppFactory.ts
@@ -17,7 +17,7 @@ export class JupyterLabAppFactory {
    if (userContext.apiType === "VCoreMongo" && content?.includes("MongoServerError: Invalid key")) {
      this.restartShell = true;
    }
-    return content?.includes("cosmosshelluser@");
+    return content?.includes("cosmosuser@");
  }

  private isMongoShellStarted(content: string | undefined) {
@@ -68,6 +68,7 @@ export class JupyterLabAppFactory {
    const session = await manager.startNew();
    session.messageReceived.connect(async (_, message: IMessage) => {
      const content = message.content && message.content[0]?.toString();
+
      if (this.checkShellStarted && message.type == "stdout") {
        //Close the terminal tab once the shell closed messages are received
        if (!this.isShellStarted) {
@@ -113,13 +114,6 @@ export class JupyterLabAppFactory {
      panel.dispose();
    });

-    // Close terminal when Ctrl key is pressed
-    term.node.addEventListener("keydown", (event: KeyboardEvent) => {
-      if (event.ctrlKey) {
-        this.onShellExited(false);
-      }
-    });
-
    return session;
  }
 }
--- a/src/UserContext.ts
+++ b/src/UserContext.ts
@@ -111,8 +111,6 @@ export interface UserContext {
  readonly isReplica?: boolean;
  collectionCreationDefaults: CollectionCreationDefaults;
  sampleDataConnectionInfo?: ParsedResourceTokenConnectionString;
-  readonly selectedRegionalEndpoint?: string;
-  readonly writeEnabledInSelectedRegion?: boolean;
  readonly vcoreMongoConnectionParams?: VCoreMongoConnectionParams;
  readonly feedbackPolicies?: AdminFeedbackPolicySettings;
  readonly dataPlaneRbacEnabled?: boolean;
--- a/src/Utils/AuthorizationUtils.test.ts
+++ b/src/Utils/AuthorizationUtils.test.ts
@@ -39,7 +39,6 @@ describe("AuthorizationUtils", () => {
    it("should throw an error if token is malformed", () => {
      expect(() =>
        AuthorizationUtils.decryptJWTToken(
-          // This is an invalid JWT token used for testing
          "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6ImFQY3R3X29kdlJPb0VOZzNWb09sSWgydGlFcyIsImtpZCI6ImFQY3R3X29kdlJPb0VOZzNWb09sSWgydGlFcyJ9.",
        ),
      ).toThrow();
@@ -48,7 +47,6 @@ describe("AuthorizationUtils", () => {
    it("should return decrypted token payload", () => {
      expect(
        AuthorizationUtils.decryptJWTToken(
-          // This is an expired JWT token used for testing
          "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6ImFQY3R3X29kdlJPb0VOZzNWb09sSWgydGlFcyIsImtpZCI6ImFQY3R3X29kdlJPb0VOZzNWb09sSWgydGlFcyJ9.eyJhdWQiOiJodHRwczovL3dvcmtzcGFjZWFydGlmYWN0cy5wcm9qZWN0YXJjYWRpYS5uZXQiLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC83MmY5ODhiZi04NmYxLTQxYWYtOTFhYi0yZDdjZDAxMWRiNDcvIiwiaWF0IjoxNTcxOTUwMjIwLCJuYmYiOjE1NzE5NTAyMjAsImV4cCI6MTU3MTk1NDEyMCwiYWNyIjoiMSIsImFpbyI6IkFWUUFxLzhOQUFBQVJ5c1pWWW1qV3lqeG1zU3VpdUdGbUZLSEwxKytFM2JBK0xhck5mMUVYUnZ1MFB6bDlERWFaMVNMdi8vSXlscG5hanFwZG1aSjFaSXNZUEN0UzJrY1lJbWdTVjFvUitsM2VlNWZlT1JZRjZvPSIsImFtciI6WyJyc2EiLCJtZmEiXSwiYXBwaWQiOiIyMDNmMTE0NS04NTZhLTQyMzItODNkNC1hNDM1NjhmYmEyM2QiLCJhcHBpZGFjciI6IjAiLCJmYW1pbHlfbmFtZSI6IlJhbmdhaXNoZW52aSIsImdpdmVuX25hbWUiOiJWaWduZXNoIiwiaGFzZ3JvdXBzIjoidHJ1ZSIsImlwYWRkciI6IjEzMS4xMDcuMTQ3LjE0NiIsIm5hbWUiOiJWaWduZXNoIFJhbmdhaXNoZW52aSIsIm9pZCI6ImJiN2Q0YjliLTZlOGYtNDg4NS05OTI4LTBhOWM5OWQwN2Q1NSIsIm9ucHJlbV9zaWQiOiJTLTEtNS0yMS0yMTI3NTIxMTg0LTE2MDQwMTI5MjAtMTg4NzkyNzUyNy0yNzEyNTYzNiIsInB1aWQiOiIxMDAzMDAwMEEyNjJGNDE4Iiwic2NwIjoid29ya3NwYWNlYXJ0aWZhY3RzLm1hbmFnZW1lbnQiLCJzdWIiOiI0X3hzSVdTdWZncHEtN2ZBV1dxaURYT3U5bGtKbDRpWEtBV0JVeUZ0Mm5vIiwidGlkIjoiNzJmOTg4YmYtODZmMS00MWFmLTkxYWItMmQ3Y2QwMTFkYjQ3IiwidW5pcXVlX25hbWUiOiJ2aXJhbmdhaUBtaWNyb3NvZnQuY29tIiwidXBuIjoidmlyYW5nYWlAbWljcm9zb2Z0LmNvbSIsInV0aSI6InoxRldzZzlWU2tPR1BTcEdremdWQUEiLCJ2ZXIiOiIxLjAifQ.nd-CZ6jpTQ8_2wkxQzuaoJCyEeR_woFK4MGMpHEVttwTd5WBDbVOUgk6gz36Jm2fdFemrQFJ03n1MXtCJYNnMoJX37SrGD3lAzZlXs5aBQig6ZrexWkiUDaaNcbx5qVy8O5JEQPds8OGMArsfUra0DG7iW0v7rgvhInX0umeC8ugnU5C-xEMPSZ9xYj0Q7m62AQrrCIIc94nUicEpxm_cusfsbT-CJHf2yLdmLYQkSx-ewzyBca0jiIl98sm0xA9btXDcwnWcmTY9scyGZ9mlSMtz4zmVY0NUdwssysKm7Js4aWtbA_ON8tsNEElViuwy_w3havM_3RQaNv26J87eQ",
        ),
      ).toBeDefined();
--- a/src/Utils/EndpointUtils.ts
+++ b/src/Utils/EndpointUtils.ts
@@ -52,10 +52,22 @@ export const allowedAadEndpoints: ReadonlyArray<string> = [
 ];

 export const defaultAllowedBackendEndpoints: ReadonlyArray<string> = [
+  "https://main.documentdb.ext.azure.com",
+  "https://main.documentdb.ext.azure.cn",
+  "https://main.documentdb.ext.azure.us",
+  "https://main.cosmos.ext.azure",
  "https://localhost:12901",
  "https://localhost:1234",
 ];

+export const PortalBackendIPs: { [key: string]: string[] } = {
+  "https://main.documentdb.ext.azure.com": ["104.42.195.92", "40.76.54.131"],
+  // DE doesn't talk to prod2 (main2) but it might be added
+  //"https://main2.documentdb.ext.azure.com": ["104.42.196.69"],
+  "https://main.documentdb.ext.azure.cn": ["139.217.8.252"],
+  "https://main.documentdb.ext.azure.us": ["52.244.48.71"],
+};
+
 export const PortalBackendOutboundIPs: { [key: string]: string[] } = {
  [PortalBackendEndpoints.Mpac]: ["13.91.105.215", "4.210.172.107"],
  [PortalBackendEndpoints.Prod]: ["13.88.56.148", "40.91.218.243"],
@@ -86,6 +98,14 @@ export const defaultAllowedCassandraProxyEndpoints: ReadonlyArray<string> = [
  CassandraProxyEndpoints.Mooncake,
 ];

+export const allowedCassandraProxyEndpoints_ToBeDeprecated: ReadonlyArray<string> = [
+  "https://main.documentdb.ext.azure.com",
+  "https://main.documentdb.ext.azure.cn",
+  "https://main.documentdb.ext.azure.us",
+  "https://main.cosmos.ext.azure",
+  "https://localhost:12901",
+];
+
 export const CassandraProxyOutboundIPs: { [key: string]: string[] } = {
  [CassandraProxyEndpoints.Mpac]: ["40.113.96.14", "104.42.11.145"],
  [CassandraProxyEndpoints.Prod]: ["137.117.230.240", "168.61.72.237"],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Asier Isayas	7224dd26c1	update settings component test snap	2025-03-17 13:51:46 -04:00
Asier Isayas	4c73a1cc47	update treeNodeUtil test snap	2025-03-17 13:45:46 -04:00
Asier Isayas	610da6a9a5	fix tests	2025-03-17 13:37:37 -04:00
Nishtha Ahuja	7812ca4914	updated tests (#2077 ) Co-authored-by: nishthaAhujaa	2025-03-17 22:45:51 +05:30
Nishtha Ahuja	bc4f18ba79	Panel Integration (#2075 ) * integrated panel * edited header text --------- Co-authored-by: nishthaAhujaa <nishtha17354@iiittd.ac.in> Co-authored-by: Asier Isayas <aisayas@microsoft.com>	2025-03-14 15:11:36 -04:00
Asier Isayas	fd2551423d	merge conflict	2025-03-14 14:29:21 -04:00
Asier Isayas	508abcd21c	Merge branch 'feature/materialized-views' of https://github.com/Azure/cosmos-explorer into feature/materialized-views	2025-03-14 14:28:36 -04:00
Asier Isayas	7774589d60	fix tests	2025-03-14 14:28:28 -04:00
Asier Isayas	e23ba5ec8c	fix type error	2025-03-14 13:55:00 -04:00
Nishtha Ahuja	75719b3cf0	test files (#2074 ) Co-authored-by: nishthaAhujaa	2025-03-13 11:01:34 +05:30
Asier Isayas	f3f8fd241a	Merge branch 'master' of https://github.com/Azure/cosmos-explorer into feature/materialized-views	2025-03-12 16:52:21 -04:00
Asier Isayas	2dc2e59162	tests	2025-03-12 16:37:24 -04:00
Asier Isayas	6b811b5e76	add tests	2025-03-10 14:56:55 -04:00
Asier Isayas	69cf523274	Merge branch 'master' of https://github.com/Azure/cosmos-explorer into feature/materialized-views	2025-03-10 14:09:47 -04:00
Asier Isayas	2e45d8a2a4	styling	2025-03-10 13:49:42 -04:00
Asier Isayas	8624bf0423	format	2025-03-06 15:21:58 -05:00
Asier Isayas	db1600d81b	format	2025-03-06 15:12:53 -05:00
Asier Isayas	176bb47cb5	Merge branch 'feature/materialized-views' of https://github.com/Azure/cosmos-explorer into feature/materialized-views	2025-03-06 15:05:19 -05:00
Asier Isayas	b6d17284b5	Add MV Panel	2025-03-06 15:05:12 -05:00
Nishtha Ahuja	7b7a2817b6	All views associated with a container (#2063 ) and Materialized View Target Container (#2065 ) Identified Source container and Target container Created tabs in Scale and Settings respectively Changed the Icon of target container	2025-03-06 19:01:58 +05:30
Asier Isayas	f0e32491d7	Partition Key, Throughput, Unique Keys	2025-02-19 15:16:32 -05:00
Asier Isayas	c33c497fd9	subpartition keys	2025-02-18 12:30:55 -05:00
Asier Isayas	cec621443d	undefined check	2025-02-14 14:58:12 -05:00
Asier Isayas	b8017763b7	AddMaterializedViewPanel	2025-02-14 14:56:19 -05:00
Asier Isayas	59619a856e	fetch MV properties from RP API and capture them in our data models	2025-02-14 14:55:34 -05:00
Asier Isayas	b1f016a796	Merge branch 'master' of https://github.com/Azure/cosmos-explorer into feature/materialized-views	2025-02-13 17:21:51 -05:00
Asier Isayas	ae3912cbf2	add Materialized Views feature flag	2025-02-13 17:21:33 -05:00