update settings component test snap

Co-authored-by: nishthaAhujaa

.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

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>

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>

images/vscode.svg

@@ -1 +0,0 @@
-<svg width="15" height="15" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><defs><clipPath id="clip0"><rect x="479" y="279" width="15" height="15"/></clipPath><clipPath id="clip1"><rect x="-0.287396" y="-0.171573" width="152381" height="152381"/></clipPath><image width="35" height="35" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAH4UExURQAAAASExCGs7CC//wB9vQB5uxSU1yaz8ySy9AB8uwB8vAB5uxOR1Say8yax8iaw8gB6vAB6uwB7uwB4uROQ1Cax8ySy8QCAvwB3ugB5ugB2uROP1CWw8yav8wCT2QCQ1QCP1wB2uQB1uBOO0yWv8yat8wCP1QCP1QCP1QCO1QCQ1wB1tQB2uAB3uAB1tx+k6SSt8ySt8QCN0wCO1ACM0wBzuQBztAB1twB0tgB0tiSr8SSs8gCM1ACM1ACEywBwtQBxtAB0tgBztQB0sySp8SSr8gCL0wCK0gCL0wCHzwByuABusgBztQBttiOq8gB6wQCI0QCJ0gB7wySn8SOo8gBxtABtsABwtgCFzwCI0gCG0QCJ0SKn8SKn8iKl8QBvsABvsgBvsQBtsABssgCCzACG0QCF0ACDzyKm8QBtrwBusABsrgCAzQCE0ACF0ACF0ACE0CKj8SKl8QBssQBtrwBtrwBsrgBsrwCK1QCBzwCD0ACA0B2d7CGj8QBsrABrrQBwrwCA3wCC0ACCzwCBzwB+zhGM3iGi8SKh8QCAzQCAzgCAzwB9zRCK3iCh8SGh8SCf8QB+zAB/zgB8zRCJ3SCg8SCf7wB+zQB6zBCI3CCe8CCf8CCe8CCf8SCf/wB7zAB4yxGJ3h6c8CCd7yCf7wmA0RqX60C//5CaUeMAAACodFJOUwA8XAho+//ncID/////53iM//////9wCKv/////gCiYILf///+AMPP/70wYw/+3lP+AXP+MKNv/+3uA/3z/+////+NAgP9c9/////+7HP+A///MgP9Y+////7scgP+AeP/////7/+NA/2D/iyTb//t4gP808//vUBjD/7eU/yifIAi3//////+Ar////////4CI/////3B//////+9/CGj7/+dwEDhYBCm1XqwAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAFpSURBVDhPY2AYBaiAkYkZXQgdsLCysXPgV8XJxc3Dy8vHj0eVgKCQsIioqKioGLoMDIhLSEpKSknLyMjIyKLLyckrgJUoCgsLCyspq6ioqKiiKVFT19DUYmDQ1tEFAT19AwMDA0M0NUbGxsbGJqZm5ubm5haWDFbW1tbWVmhqGGxsbW1t7ewdHB2dnBkYXFxdXV1d0NUwuLl7eHh4enn7+DIwMLj4+fn5Yaph8A8IDAwMDBIHsYNDQkJCgtFVMISGhUdERkZGRkUzMDDExMbGxsahK4lPSExKTklNTU1NS2dgiMvIyMhAV5OZlZWVlZ2Tm5eXl5dfwFBYVFRUVIimpriktKycgaGisgoEqmtqa2tr0dUw1NU3gKjGpuaWlpbWtvb29vYOdDUw0NjZ1dXd09vX39c3AV0OASZOmjR5ytSpU6dOQ5dBAtN7ZsycNXvO3HnoEshg/oKFixYvQRdFA0uXLUcXGqEAAH4FV0z+qQbjAAAAAElFTkSuQmCC" preserveAspectRatio="none" id="img2"></image><clipPath id="clip3"><path d="M44291.4 46947.4 187148 46947.4 187148 188823 44291.4 188823Z" fill-rule="evenodd" clip-rule="evenodd"/></clipPath></defs><g clip-path="url(#clip0)" transform="translate(-479 -279)"><g clip-path="url(#clip1)" transform="matrix(0.000105 0 0 0.000105 479 279)"><g clip-path="url(#clip3)" transform="matrix(1 0 0 1.00692 -44291.4 -47272.4)"><use width="100%" height="100%" xlink:href="#img2" transform="scale(6709.45 6709.45)"></use></g></g></g></svg>

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;
-    }
   }
 }
 
@@ -2869,7 +2862,6 @@ a:link {
   z-index: 1000;
   overflow-y: auto;
   overflow-x: clip;
-  min-height: fit-content;
 }
 
 .uniqueIndexesContainer {

less/documentDBFabric.less

@@ -211,12 +211,3 @@ a:focus {
 .fileImportImg img {
   filter: brightness(0) saturate(100%);
 }
-
-.tabPanesContainer {
-  overflow: auto !important;
-}
-
-.tabs-container {
-  min-height: 500px;
-  min-width: 500px;
-}

package-lock.json

@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@azure/arm-cosmosdb": "9.1.0",
-        "@azure/cosmos": "4.3.0",
+        "@azure/cosmos": "4.2.0-beta.1",
         "@azure/cosmos-language-service": "0.0.5",
         "@azure/identity": "4.5.0",
         "@azure/msal-browser": "2.14.2",
@@ -51,8 +51,6 @@
         "@types/mkdirp": "1.0.1",
         "@types/node-fetch": "2.5.7",
         "@xmldom/xmldom": "0.7.13",
-        "@xterm/addon-fit": "0.10.0",
-        "@xterm/xterm": "5.5.0",
         "allotment": "1.20.2",
         "applicationinsights": "1.8.0",
         "bootstrap": "3.4.1",
@@ -88,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",
@@ -290,71 +288,59 @@
       "version": "2.6.2",
       "license": "0BSD"
     },
-    "node_modules/@azure/core-http-compat": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.0.tgz",
-      "integrity": "sha512-qLQujmUypBBG0gxHd0j6/Jdmul6ttl24c8WGiLXIk7IHXdBlfoBqW27hyz3Xn6xbfdyVSarl1Ttbk0AwnZBYCw==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-client": "^1.3.0",
-        "@azure/core-rest-pipeline": "^1.20.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/core-lro": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.7.2.tgz",
-      "integrity": "sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-util": "^1.2.0",
-        "@azure/logger": "^1.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/core-lro/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "node_modules/@azure/core-paging": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.6.2.tgz",
-      "integrity": "sha512-YKWi9YuCU04B55h25cnOYZHxXYtEvQEbKST5vqRga7hWY9ydd3FZHdeQF8pyh+acWZvppw13M/LMGx0LABUVMA==",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/core-paging/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
     "node_modules/@azure/core-rest-pipeline": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.20.0.tgz",
-      "integrity": "sha512-ASoP8uqZBS3H/8N8at/XwFr6vYrRP3syTK0EUjDXQy0Y1/AUS+QeIRThKmTNJO2RggvBBxaXDPM7YoIwDGeA0g==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz",
+      "integrity": "sha512-QSoGUp4Eq/gohEFNJaUOwTN7BCc2nHTjjbm75JT0aD7W65PWM1H/tItz0GsABn22uaKyGxiMhWQLt2r+FGU89Q==",
       "dependencies": {
         "@azure/abort-controller": "^2.0.0",
         "@azure/core-auth": "^1.8.0",
         "@azure/core-tracing": "^1.0.1",
         "@azure/core-util": "^1.11.0",
         "@azure/logger": "^1.0.0",
-        "@typespec/ts-http-runtime": "^0.2.2",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@azure/core-rest-pipeline/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/@azure/core-rest-pipeline/node_modules/tslib": {
       "version": "2.6.2",
       "license": "0BSD"
@@ -391,16 +377,15 @@
       "license": "0BSD"
     },
     "node_modules/@azure/cosmos": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.3.0.tgz",
-      "integrity": "sha512-0Ls3l1uWBBSphx6YRhnM+w7rSvq8qVugBCdO6kSiNuRYXEf6+YWLjbzz4e7L2kkz/6ScFdZIOJYP+XtkiRYOhA==",
+      "version": "4.2.0-beta.1",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.2.0-beta.1.tgz",
+      "integrity": "sha512-mREONehm1DxjEKXGaNU6Wmpf9Ckb9IrhKFXhDFVs45pxmoEb3y2s/Ub0owuFmqlphpcS1zgtYQn5exn+lwnJuQ==",
       "dependencies": {
         "@azure/abort-controller": "^2.0.0",
         "@azure/core-auth": "^1.7.1",
         "@azure/core-rest-pipeline": "^1.15.1",
         "@azure/core-tracing": "^1.1.1",
         "@azure/core-util": "^1.8.1",
-        "@azure/keyvault-keys": "^4.8.0",
         "fast-json-stable-stringify": "^2.1.0",
         "jsbi": "^4.3.0",
         "priorityqueuejs": "^2.0.0",
@@ -505,66 +490,14 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
-    "node_modules/@azure/keyvault-common": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/keyvault-common/-/keyvault-common-2.0.0.tgz",
-      "integrity": "sha512-wRLVaroQtOqfg60cxkzUkGKrKMsCP6uYXAOomOIysSMyt1/YM0eUn9LqieAWM8DLcU4+07Fio2YGpPeqUbpP9w==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-client": "^1.5.0",
-        "@azure/core-rest-pipeline": "^1.8.0",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.10.0",
-        "@azure/logger": "^1.1.4",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/keyvault-common/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
-    "node_modules/@azure/keyvault-keys": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.9.0.tgz",
-      "integrity": "sha512-ZBP07+K4Pj3kS4TF4XdkqFcspWwBHry3vJSOFM5k5ZABvf7JfiMonvaFk2nBF6xjlEbMpz5PE1g45iTMme0raQ==",
-      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-client": "^1.5.0",
-        "@azure/core-http-compat": "^2.0.1",
-        "@azure/core-lro": "^2.2.0",
-        "@azure/core-paging": "^1.1.1",
-        "@azure/core-rest-pipeline": "^1.8.1",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.0.0",
-        "@azure/keyvault-common": "^2.0.0",
-        "@azure/logger": "^1.0.0",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/keyvault-keys/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
     "node_modules/@azure/logger": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.2.0.tgz",
-      "integrity": "sha512-0hKEzLhpw+ZTAfNJyRrn6s+V0nDWzXk9OjBr2TiGIu0OfMr5s2V4FpKLTAK3Ca5r5OKLbf4hkOGDPyiRjie/jA==",
+      "version": "1.0.4",
+      "license": "MIT",
       "dependencies": {
-        "@typespec/ts-http-runtime": "^0.2.2",
-        "tslib": "^2.6.2"
+        "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=14.0.0"
       }
     },
     "node_modules/@azure/logger/node_modules/tslib": {
@@ -12729,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": {
@@ -13139,56 +13070,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typespec/ts-http-runtime": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.2.2.tgz",
-      "integrity": "sha512-Gz/Sm64+Sq/vklJu1tt9t+4R2lvnud8NbTD/ZfpZtMiUX7YeVpCA8j6NSW8ptwcoLL+NmYANwqP8DV0q/bwl2w==",
-      "dependencies": {
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "dependencies": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@typespec/ts-http-runtime/node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
-    },
     "node_modules/@ungap/url-search-params": {
       "version": "0.2.2",
       "license": "ISC"
@@ -13357,19 +13238,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@xterm/addon-fit": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
-      "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==",
-      "peerDependencies": {
-        "@xterm/xterm": "^5.0.0"
-      }
-    },
-    "node_modules/@xterm/xterm": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
-      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
-    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "license": "BSD-3-Clause"
@@ -21931,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",
@@ -30387,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": {
@@ -36147,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,
@@ -36201,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,

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.3.0",
+    "@azure/cosmos": "4.2.0-beta.1",
     "@azure/cosmos-language-service": "0.0.5",
     "@azure/identity": "4.5.0",
     "@azure/msal-browser": "2.14.2",
@@ -46,8 +46,6 @@
     "@types/mkdirp": "1.0.1",
     "@types/node-fetch": "2.5.7",
     "@xmldom/xmldom": "0.7.13",
-    "@xterm/xterm": "5.5.0",
-    "@xterm/addon-fit": "0.10.0",
     "allotment": "1.20.2",
     "applicationinsights": "1.8.0",
     "bootstrap": "3.4.1",
@@ -83,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",

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'
     },
   ],
 

src/Common/Constants.ts

@@ -257,7 +257,6 @@ export class Areas {
   public static ShareDialog: string = "Share Access Dialog";
   public static Notebook: string = "Notebook";
   public static Copilot: string = "Copilot";
-  public static CloudShell: string = "Cloud Shell";
 }
 
 export class HttpHeaders {
@@ -531,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";

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),

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;
 }

src/Common/IteratorUtilities.ts

@@ -1,7 +1,5 @@
-import { Action } from "Shared/Telemetry/TelemetryConstants";
-import * as Constants from "../Common/Constants";
+import { QueryOperationOptions } from "@azure/cosmos";
 import { QueryResults } from "../Contracts/ViewModels";
-import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 
 interface QueryResponse {
   // [Todo] remove any
@@ -13,15 +11,17 @@ interface QueryResponse {
 }
 
 export interface MinimalQueryIterator {
-  fetchNext: () => Promise<QueryResponse>;
+  fetchNext: (queryOperationOptions?: QueryOperationOptions) => Promise<QueryResponse>;
 }
 
 // Pick<QueryIterator<any>, "fetchNext">;
 
-export function nextPage(documentsIterator: MinimalQueryIterator, firstItemIndex: number): Promise<QueryResults> {
-  TelemetryProcessor.traceStart(Action.ExecuteQuery);
-  return documentsIterator.fetchNext().then((response) => {
-    TelemetryProcessor.traceSuccess(Action.ExecuteQuery, { dataExplorerArea: Constants.Areas.Tab });
+export function nextPage(
+  documentsIterator: MinimalQueryIterator,
+  firstItemIndex: number,
+  queryOperationOptions?: QueryOperationOptions,
+): Promise<QueryResults> {
+  return documentsIterator.fetchNext(queryOperationOptions).then((response) => {
     const documents = response.resources;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const headers = (response as any).headers || {}; // TODO this is a private key. Remove any

src/Common/QueryError.ts

@@ -1,4 +1,5 @@
 import { monaco } from "Explorer/LazyMonaco";
+import { getRUThreshold, ruThresholdEnabled } from "Shared/StorageUtility";
 
 export enum QueryErrorSeverity {
   Error = "Error",
@@ -102,9 +103,20 @@ export interface ErrorEnrichment {
   learnMoreUrl?: string;
 }
 
-const REPLACEMENT_MESSAGES: Record<string, (original: string) => string> = {};
+const REPLACEMENT_MESSAGES: Record<string, (original: string) => string> = {
+  OPERATION_RU_LIMIT_EXCEEDED: (original) => {
+    if (ruThresholdEnabled()) {
+      const threshold = getRUThreshold();
+      return `Query exceeded the Request Unit (RU) limit of ${threshold} RUs. You can change this limit in Data Explorer settings.`;
+    }
+    return original;
+  },
+};
 
-const HELP_LINKS: Record<string, string> = {};
+const HELP_LINKS: Record<string, string> = {
+  OPERATION_RU_LIMIT_EXCEEDED:
+    "https://learn.microsoft.com/en-us/azure/cosmos-db/data-explorer#configure-request-unit-threshold",
+};
 
 export default class QueryError {
   message: string;

src/Common/Tooltip/InfoTooltip.tsx

@@ -4,18 +4,13 @@ import * as React from "react";
 export interface TooltipProps {
   children: string;
   className?: string;
-  ariaLabelForTooltip?: string;
 }
 
-export const InfoTooltip: React.FunctionComponent<TooltipProps> = ({
-  children,
-  className,
-  ariaLabelForTooltip = children,
-}: TooltipProps) => {
+export const InfoTooltip: React.FunctionComponent<TooltipProps> = ({ children, className }: TooltipProps) => {
   return (
     <span className={className}>
       <TooltipHost content={children}>
-        <Icon iconName="Info" aria-label={ariaLabelForTooltip} className="panelInfoIcon" tabIndex={0} />
+        <Icon iconName="Info" ariaLabel={children} className="panelInfoIcon" tabIndex={0} />
       </TooltipHost>
     </span>
   );

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

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

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();

src/Common/dataAccess/deleteDocument.ts

@@ -42,7 +42,6 @@ export interface IBulkDeleteResult {
 export const deleteDocuments = async (
   collection: CollectionBase,
   documentIds: DocumentId[],
-  abortSignal: AbortSignal,
 ): Promise<IBulkDeleteResult[]> => {
   const clearMessage = logConsoleProgress(`Deleting ${documentIds.length} ${getEntityName(true)}`);
   try {
@@ -66,16 +65,12 @@ export const deleteDocuments = async (
         operationType: BulkOperationType.Delete,
       }));
 
-      const promise = v2Container.items
-        .bulk(operations, undefined, {
-          abortSignal,
-        })
-        .then((bulkResults) => {
-          return bulkResults.map((bulkResult, index) => {
-            const documentId = documentIdsChunk[index];
-            return { ...bulkResult, documentId };
-          });
+      const promise = v2Container.items.bulk(operations).then((bulkResults) => {
+        return bulkResults.map((bulkResult, index) => {
+          const documentId = documentIdsChunk[index];
+          return { ...bulkResult, documentId };
         });
+      });
       promiseArray.push(promise);
     }
 

src/Common/dataAccess/queryDocuments.ts

@@ -26,7 +26,6 @@ export const getCommonQueryOptions = (options: FeedOptions): FeedOptions => {
     options.maxItemCount ||
     (storedItemPerPageSetting !== undefined && storedItemPerPageSetting) ||
     Queries.itemsPerPage;
-  options.enableQueryControl = LocalStorageUtility.getEntryBoolean(StorageKey.QueryControlEnabled);
   options.maxDegreeOfParallelism = LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism);
   options.disableNonStreamingOrderByQuery = !isVectorSearchEnabled();
   return options;

src/Common/dataAccess/queryDocumentsPage.ts

@@ -1,3 +1,4 @@
+import { QueryOperationOptions } from "@azure/cosmos";
 import { QueryResults } from "../../Contracts/ViewModels";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { getEntityName } from "../DocumentUtility";
@@ -8,12 +9,13 @@ export const queryDocumentsPage = async (
   resourceName: string,
   documentsIterator: MinimalQueryIterator,
   firstItemIndex: number,
+  queryOperationOptions?: QueryOperationOptions,
 ): Promise<QueryResults> => {
   const entityName = getEntityName();
   const clearMessage = logConsoleProgress(`Querying ${entityName} for container ${resourceName}`);
 
   try {
-    const result: QueryResults = await nextPage(documentsIterator, firstItemIndex);
+    const result: QueryResults = await nextPage(documentsIterator, firstItemIndex, queryOperationOptions);
     const itemCount = (result.documents && result.documents.length) || 0;
     logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
     return result;

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 &&

src/Common/dataAccess/readCollections.ts

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

src/Contracts/ActionContracts.ts

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

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;
-}
+};

src/Contracts/DataModels.ts

@@ -7,7 +7,6 @@ export interface ArmEntity {
   type: string;
   kind: string;
   tags?: Tags;
-  resourceGroup?: string;
 }
 
 export interface DatabaseAccount extends ArmEntity {
@@ -211,7 +210,7 @@ export interface IndexingPolicy {
 export interface VectorIndex {
   path: string;
   type: "flat" | "diskANN" | "quantizedFlat";
-  vectorIndexShardKey?: string[];
+  diskANNShardKey?: string;
   indexingSearchListSize?: number;
   quantizationByteSize?: number;
 }
@@ -389,7 +388,7 @@ export interface VectorEmbeddingPolicy {
 }
 
 export interface VectorEmbedding {
-  dataType: "float32" | "uint8" | "int8";
+  dataType: "float16" | "float32" | "uint8" | "int8";
   dimensions: number;
   distanceFunction: "euclidean" | "cosine" | "dotproduct";
   path: string;

src/Contracts/FabricMessageTypes.ts

@@ -6,7 +6,6 @@ export enum FabricMessageTypes {
   GetAllResourceTokens = "GetAllResourceTokens",
   GetAccessToken = "GetAccessToken",
   Ready = "Ready",
-  OpenSettings = "OpenSettings",
 }
 
 export interface AuthorizationToken {

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 {

src/Contracts/ViewModels.ts

@@ -1,6 +1,4 @@
 import {
-  ItemDefinition,
-  JSONObject,
   QueryMetrics,
   Resource,
   StoredProcedureDefinition,
@@ -31,11 +29,8 @@ export interface UploadDetailsRecord {
   numFailed: number;
   numThrottled: number;
   errors: string[];
-  resources?: ItemDefinition[];
 }
 
-export type BulkInsertResult = Omit<UploadDetailsRecord, "fileName">;
-
 export interface QueryResultsMetadata {
   hasMoreResults: boolean;
   firstItemIndex: number;
@@ -50,7 +45,6 @@ export interface QueryResults extends QueryResultsMetadata {
   roundTrips?: number;
   headers?: any;
   queryMetrics?: QueryMetrics;
-  ruThresholdExceeded?: boolean;
 }
 
 export interface Button {
@@ -212,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[];
-  }>;
 }
 
 /**

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";
@@ -103,23 +103,17 @@ export const createCollectionContextMenuButton = (
       iconSrc: HostedTerminalIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
+        if (useNotebook.getState().isShellEnabled) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
         }
       },
-      label:
-        useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell
-          ? "Open Mongo Shell"
-          : "New Shell",
+      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
     });
   }
 
-  if (
-    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
-    userContext.apiType === "Cassandra"
-  ) {
+  if (useNotebook.getState().isShellEnabled && userContext.apiType === "Cassandra") {
     items.push({
       iconSrc: HostedTerminalIcon,
       onClick: () => {
@@ -176,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} />,
           );
       },
     });

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>
   ) : (

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"

src/Explorer/Controls/Settings/SettingsComponent.test.tsx

@@ -1,6 +1,7 @@
 import { AuthType } from "AuthType";
 import { shallow } from "enzyme";
 import ko from "knockout";
+import { Features } from "Platform/Hosted/extractFeatures";
 import React from "react";
 import { updateCollection } from "../../../Common/dataAccess/updateCollection";
 import { updateOffer } from "../../../Common/dataAccess/updateOffer";
@@ -252,7 +253,7 @@ describe("SettingsComponent", () => {
   it("should save throughput bucket changes when Save button is clicked", async () => {
     updateUserContext({
       apiType: "SQL",
-      throughputBucketsEnabled: true,
+      features: { enableThroughputBuckets: true } as Features,
       authType: AuthType.AAD,
     });
 

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -12,8 +12,7 @@ import {
   ThroughputBucketsComponentProps,
 } from "Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent";
 import { useDatabases } from "Explorer/useDatabases";
-import { isFabricNative } from "Platform/Fabric/FabricUtil";
-import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import { isFullTextSearchEnabled, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { isRunningOnPublicCloud } from "Utils/CloudUtils";
 import * as React from "react";
 import DiscardIcon from "../../../../images/discard.svg";
@@ -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,13 +184,16 @@ 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 = userContext.apiType === "SQL";
+      this.isFullTextSearchEnabled = isFullTextSearchEnabled() && !hasDatabaseSharedThroughput(this.collection);
 
       this.changeFeedPolicyVisible = userContext.features.enableChangeFeedPolicy;
-      this.throughputBucketsEnabled = userContext.throughputBucketsEnabled;
+      this.throughputBucketsEnabled =
+        userContext.apiType === "SQL" &&
+        userContext.features.enableThroughputBuckets &&
+        userContext.authType === AuthType.AAD;
 
       // Mongo container with system partition key still treat as "Fixed"
       this.isFixedContainer =
@@ -1071,11 +1073,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         databaseId: this.collection.databaseId,
         collectionId: this.collection.id(),
         currentOffer: this.collection.offer(),
-        autopilotThroughput: this.collection.offer?.()?.autoscaleMaxThroughput
-          ? this.collection.offer?.()?.autoscaleMaxThroughput
+        autopilotThroughput: this.collection.offer().autoscaleMaxThroughput
+          ? this.collection.offer().autoscaleMaxThroughput
           : undefined,
-        manualThroughput: this.collection.offer?.()?.manualThroughput
-          ? this.collection.offer?.()?.manualThroughput
+        manualThroughput: this.collection.offer().manualThroughput
+          ? this.collection.offer().manualThroughput
           : undefined,
         throughputBuckets: this.state.throughputBuckets,
       });
@@ -1091,7 +1093,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         currentOffer: this.collection.offer(),
         autopilotThroughput: this.state.isAutoPilotSelected ? this.state.autoPilotThroughput : undefined,
         manualThroughput: this.state.isAutoPilotSelected ? undefined : this.state.throughput,
-        throughputBuckets: this.throughputBucketsEnabled ? this.state.throughputBuckets : undefined,
       };
       if (this.hasProvisioningTypeChanged()) {
         if (this.state.isAutoPilotSelected) {
@@ -1147,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,
@@ -1213,7 +1213,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       isFullTextSearchEnabled: this.isFullTextSearchEnabled,
       shouldDiscardContainerPolicies: this.state.shouldDiscardContainerPolicies,
       resetShouldDiscardContainerPolicyChange: this.resetShouldDiscardContainerPolicies,
-      isGlobalSecondaryIndex: this.isGlobalSecondaryIndex,
     };
 
     const indexingPolicyComponentProps: IndexingPolicyComponentProps = {
@@ -1278,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(),
     };
@@ -1342,17 +1340,17 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       });
     }
 
-    if (this.throughputBucketsEnabled && !hasDatabaseSharedThroughput(this.collection) && this.offer) {
+    if (this.throughputBucketsEnabled) {
       tabs.push({
         tab: SettingsV2TabTypes.ThroughputBucketsTab,
         content: <ThroughputBucketsComponent {...throughputBucketsComponentProps} />,
       });
     }
 
-    if (this.isGlobalSecondaryIndex) {
+    if (this.isMaterializedView) {
       tabs.push({
-        tab: SettingsV2TabTypes.GlobalSecondaryIndexTab,
-        content: <GlobalSecondaryIndexComponent {...globalSecondaryIndexComponentProps} />,
+        tab: SettingsV2TabTypes.MaterializedViewTab,
+        content: <MaterializedViewComponent {...materializedViewComponentProps} />,
       });
     }
 

src/Explorer/Controls/Settings/SettingsSubComponents/ContainerPolicyComponent.tsx

@@ -22,7 +22,6 @@ export interface ContainerPolicyComponentProps {
   isFullTextSearchEnabled: boolean;
   shouldDiscardContainerPolicies: boolean;
   resetShouldDiscardContainerPolicyChange: () => void;
-  isGlobalSecondaryIndex?: boolean;
 }
 
 export const ContainerPolicyComponent: React.FC<ContainerPolicyComponentProps> = ({

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);
-  });
-});

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);
+  });
+});

src/Explorer/Controls/Settings/SettingsSubComponents/MaterializedViewComponent.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>
   );
 };

src/Explorer/Controls/Settings/SettingsSubComponents/MaterializedViewSourceComponent.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" }]);

src/Explorer/Controls/Settings/SettingsSubComponents/MaterializedViewSourceComponent.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} />,
             )
         }
       />

src/Explorer/Controls/Settings/SettingsSubComponents/MaterializedViewTargetComponent.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");
   });
 });

src/Explorer/Controls/Settings/SettingsSubComponents/MaterializedViewTargetComponent.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>

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();
-  });
-});

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>
   );

src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.test.tsx

@@ -9,7 +9,6 @@ describe("ScaleComponent", () => {
     collection: collection,
     database: undefined,
     isFixedContainer: false,
-    isGlobalSecondaryIndex: false,
     onThroughputChange: () => {
       return;
     },

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}
     />
   );
 

src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.test.tsx

@@ -143,39 +143,4 @@ describe("SubSettingsComponent", () => {
     expect(subSettingsComponentInstance.getTtlValue(TtlType.On)).toEqual(TtlOn);
     expect(subSettingsComponentInstance.getTtlValue(TtlType.Off)).toEqual(TtlOff);
   });
-
-  it("uniqueKey is visible", () => {
-    updateUserContext({
-      databaseAccount: {
-        properties: {
-          capabilities: [{ name: "EnableSQL" }],
-        },
-      } as DatabaseAccount,
-    });
-    const subSettingsComponent = new SubSettingsComponent(baseProps);
-    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(true);
-  });
-
-  it("uniqueKey not visible due to no keys", () => {
-    const props = {
-      ...baseProps,
-      ...(baseProps.collection.rawDataModel.uniqueKeyPolicy.uniqueKeys = []),
-    };
-    const subSettingsComponent = new SubSettingsComponent(props);
-    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(false);
-  });
-
-  it("uniqueKey not visible for API", () => {
-    const newContainer = new Explorer();
-    updateUserContext({
-      databaseAccount: {
-        properties: {
-          capabilities: [{ name: "EnableMongo" }],
-        },
-      } as DatabaseAccount,
-    });
-    const props = { ...baseProps, container: newContainer };
-    const subSettingsComponent = new SubSettingsComponent(props);
-    expect(subSettingsComponent.getUniqueKeyVisible()).toEqual(false);
-  });
 });

src/Explorer/Controls/Settings/SettingsSubComponents/SubSettingsComponent.tsx

@@ -63,16 +63,12 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
   private geospatialVisible: boolean;
   private partitionKeyValue: string;
   private partitionKeyName: string;
-  private uniqueKeyName: string;
-  private uniqueKeyValue: string;
 
   constructor(props: SubSettingsComponentProps) {
     super(props);
     this.geospatialVisible = userContext.apiType === "SQL";
     this.partitionKeyName = userContext.apiType === "Mongo" ? "Shard key" : "Partition key";
     this.partitionKeyValue = this.getPartitionKeyValue();
-    this.uniqueKeyName = "Unique keys";
-    this.uniqueKeyValue = this.getUniqueKeyValue();
   }
 
   componentDidMount(): void {
@@ -355,28 +351,6 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
   public isLargePartitionKeyEnabled = (): boolean => this.props.collection.partitionKey?.version >= 2;
   public isHierarchicalPartitionedContainer = (): boolean => this.props.collection.partitionKey?.kind === "MultiHash";
 
-  public getUniqueKeyVisible = (): boolean => {
-    return this.props.collection.rawDataModel.uniqueKeyPolicy?.uniqueKeys.length > 0 && userContext.apiType === "SQL";
-  };
-
-  private getUniqueKeyValue = (): string => {
-    const paths = this.props.collection.rawDataModel.uniqueKeyPolicy?.uniqueKeys?.[0]?.paths;
-    return paths?.join(", ") || "";
-  };
-
-  private getUniqueKeyComponent = (): JSX.Element => (
-    <Stack {...titleAndInputStackProps}>
-      {this.getUniqueKeyVisible() && (
-        <TextField
-          label={this.uniqueKeyName}
-          disabled
-          styles={getTextFieldStyles(undefined, undefined)}
-          defaultValue={this.uniqueKeyValue}
-        />
-      )}
-    </Stack>
-  );
-
   public render(): JSX.Element {
     return (
       <Stack {...subComponentStackProps}>
@@ -389,8 +363,6 @@ export class SubSettingsComponent extends React.Component<SubSettingsComponentPr
         {this.props.changeFeedPolicyVisible && this.getChangeFeedComponent()}
 
         {this.getPartitionKeyComponent()}
-
-        {this.getUniqueKeyComponent()}
       </Stack>
     );
   }

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputBucketsComponent.test.tsx

@@ -26,7 +26,7 @@ describe("ThroughputBucketsComponent", () => {
 
   it("renders the correct number of buckets", () => {
     render(<ThroughputBucketsComponent {...defaultProps} />);
-    expect(screen.getAllByText(/Bucket \d+/)).toHaveLength(5);
+    expect(screen.getAllByText(/Group \d+/)).toHaveLength(5);
   });
 
   it("renders buckets in the correct order even if input is unordered", () => {
@@ -36,14 +36,8 @@ describe("ThroughputBucketsComponent", () => {
     ];
     render(<ThroughputBucketsComponent {...defaultProps} currentBuckets={unorderedBuckets} />);
 
-    const bucketLabels = screen.getAllByText(/Bucket \d+/).map((el) => el.textContent);
-    expect(bucketLabels).toEqual([
-      "Bucket 1 (Data Explorer Query Bucket)",
-      "Bucket 2",
-      "Bucket 3",
-      "Bucket 4",
-      "Bucket 5",
-    ]);
+    const bucketLabels = screen.getAllByText(/Group \d+/).map((el) => el.textContent);
+    expect(bucketLabels).toEqual(["Group 1 (Data Explorer Query Bucket)", "Group 2", "Group 3", "Group 4", "Group 5"]);
   });
 
   it("renders all provided buckets even if they exceed the max default bucket count", () => {
@@ -59,7 +53,7 @@ describe("ThroughputBucketsComponent", () => {
 
     render(<ThroughputBucketsComponent {...defaultProps} currentBuckets={oversizedBuckets} />);
 
-    expect(screen.getAllByText(/Bucket \d+/)).toHaveLength(7);
+    expect(screen.getAllByText(/Group \d+/)).toHaveLength(7);
 
     expect(screen.getByDisplayValue("50")).toBeInTheDocument();
     expect(screen.getByDisplayValue("60")).toBeInTheDocument();
@@ -177,7 +171,7 @@ describe("ThroughputBucketsComponent", () => {
 
   it("ensures default buckets are used when no buckets are provided", () => {
     render(<ThroughputBucketsComponent {...defaultProps} currentBuckets={[]} />);
-    expect(screen.getAllByText(/Bucket \d+/)).toHaveLength(5);
+    expect(screen.getAllByText(/Group \d+/)).toHaveLength(5);
     expect(screen.getAllByDisplayValue("100")).toHaveLength(5);
   });
 });

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

@@ -76,7 +76,7 @@ export const ThroughputBucketsComponent: FC<ThroughputBucketsComponentProps> = (
               value={bucket.maxThroughputPercentage}
               onChange={(newValue) => handleBucketChange(bucket.id, newValue)}
               showValue={false}
-              label={`Bucket ${bucket.id}${bucket.id === 1 ? " (Data Explorer Query Bucket)" : ""}`}
+              label={`Group ${bucket.id}${bucket.id === 1 ? " (Data Explorer Query Bucket)" : ""}`}
               styles={{ root: { flex: 2, maxWidth: 400 } }}
               disabled={bucket.maxThroughputPercentage === 100}
             />

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", () => {

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 {
@@ -285,7 +284,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
         serverId,
         numberOfRegions,
         isMultimaster,
-        false,
+        true,
       );
       return (
         <div>
@@ -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>
     );
   };

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>
-`;

src/Explorer/Controls/Settings/SettingsSubComponents/__snapshots__/SubSettingsComponent.test.tsx.snap

@@ -231,34 +231,6 @@ exports[`SubSettingsComponent analyticalTimeToLive hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;
 
@@ -548,34 +520,6 @@ exports[`SubSettingsComponent analyticalTimeToLiveSeconds hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;
 
@@ -825,34 +769,6 @@ exports[`SubSettingsComponent changeFeedPolicy hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;
 
@@ -1167,34 +1083,6 @@ exports[`SubSettingsComponent renders 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;
 
@@ -1483,33 +1371,5 @@ exports[`SubSettingsComponent timeToLiveSeconds hidden 1`] = `
       Non-hierarchically partitioned container.
     </Text>
   </Stack>
-  <Stack
-    tokens={
-      {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      defaultValue="/id"
-      disabled={true}
-      label="Unique keys"
-      styles={
-        {
-          "fieldGroup": {
-            "borderColor": "",
-            "height": 25,
-            "selectors": {
-              ":disabled": {
-                "backgroundColor": undefined,
-                "borderColor": undefined,
-              },
-            },
-            "width": 300,
-          },
-        }
-      }
-    />
-  </Stack>
 </Stack>
 `;

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}`);
   }

src/Explorer/Controls/Settings/TestUtils.tsx

@@ -17,15 +17,7 @@ export const collection = {
     includedPaths: [],
     excludedPaths: [],
   }),
-  rawDataModel: {
-    uniqueKeyPolicy: {
-      uniqueKeys: [
-        {
-          paths: ["/id"],
-        },
-      ],
-    },
-  },
+  uniqueKeyPolicy: {} as DataModels.UniqueKeyPolicy,
   usageSizeInKB: ko.observable(100),
   offer: ko.observable<DataModels.Offer>({
     autoscaleMaxThroughput: undefined,

src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap

@@ -71,25 +71,14 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
           }
           isAutoPilotSelected={false}
           isFixedContainer={false}
-          isGlobalSecondaryIndex={true}
           onAutoPilotSelected={[Function]}
           onMaxAutoPilotThroughputChange={[Function]}
           onScaleDiscardableChange={[Function]}
@@ -163,18 +152,8 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -198,32 +177,6 @@ exports[`SettingsComponent renders 1`] = `
           timeToLiveSecondsBaseline={5}
         />
       </PivotItem>
-      <PivotItem
-        headerText="Container Policies"
-        itemKey="ContainerVectorPolicyTab"
-        key="ContainerVectorPolicyTab"
-        style={
-          {
-            "marginTop": 20,
-          }
-        }
-      >
-        <ContainerPolicyComponent
-          fullTextPolicy={{}}
-          fullTextPolicyBaseline={{}}
-          isFullTextSearchEnabled={true}
-          isGlobalSecondaryIndex={true}
-          isVectorSearchEnabled={false}
-          onFullTextPolicyChange={[Function]}
-          onFullTextPolicyDirtyChange={[Function]}
-          onVectorEmbeddingPolicyChange={[Function]}
-          onVectorEmbeddingPolicyDirtyChange={[Function]}
-          resetShouldDiscardContainerPolicyChange={[Function]}
-          shouldDiscardContainerPolicies={false}
-          vectorEmbeddingPolicy={{}}
-          vectorEmbeddingPolicyBaseline={{}}
-        />
-      </PivotItem>
       <PivotItem
         headerText="Indexing Policy"
         itemKey="IndexingPolicyTab"
@@ -320,18 +273,8 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -363,7 +306,6 @@ exports[`SettingsComponent renders 1`] = `
               },
             }
           }
-          isReadOnly={false}
         />
       </PivotItem>
       <PivotItem
@@ -401,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],
@@ -460,18 +402,8 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }

src/Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText.tsx

@@ -1,4 +1,4 @@
-import { Stack, Text } from "@fluentui/react";
+import { Text } from "@fluentui/react";
 import React, { FunctionComponent } from "react";
 import { InfoTooltip } from "../../../../Common/Tooltip/InfoTooltip";
 import * as SharedConstants from "../../../../Shared/Constants";
@@ -44,42 +44,33 @@ export const CostEstimateText: FunctionComponent<CostEstimateTextProps> = ({
   const currencySign: string = getCurrencySign(serverId);
   const multiplier = getMultimasterMultiplier(numberOfRegions, multimasterEnabled);
   const pricePerRu = isAutoscale ? getAutoscalePricePerRu(serverId, multiplier) : getPricePerRu(serverId, multiplier);
-  const estimatedMonthlyCost = "Estimated monthly cost";
 
-  const iconWithEstimatedCostDisclaimer: JSX.Element = (
-    <InfoTooltip ariaLabelForTooltip={`${estimatedMonthlyCost} ${currency} ${estimatedCostDisclaimer}`}>
-      {estimatedCostDisclaimer}
-    </InfoTooltip>
-  );
+  const iconWithEstimatedCostDisclaimer: JSX.Element = <InfoTooltip>{estimatedCostDisclaimer}</InfoTooltip>;
 
   if (isAutoscale) {
     return (
-      <Stack style={{ marginBottom: 6 }}>
-        <Text variant="small">
-          {estimatedMonthlyCost} ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
-          <b>
-            {currencySign + calculateEstimateNumber(monthlyPrice / 10)} -{" "}
-            {currencySign + calculateEstimateNumber(monthlyPrice)}{" "}
-          </b>
-          ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits / 10} - {requestUnits}{" "}
-          RU/s, {currencySign + pricePerRu}/RU)
-        </Text>
-      </Stack>
+      <Text variant="small">
+        Estimated monthly cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
+        <b>
+          {currencySign + calculateEstimateNumber(monthlyPrice / 10)} -{" "}
+          {currencySign + calculateEstimateNumber(monthlyPrice)}{" "}
+        </b>
+        ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits / 10} - {requestUnits}{" "}
+        RU/s, {currencySign + pricePerRu}/RU)
+      </Text>
     );
   }
 
   return (
-    <Stack style={{ marginBottom: 8 }}>
-      <Text variant="small">
-        Estimated cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
-        <b>
-          {currencySign + calculateEstimateNumber(hourlyPrice)} hourly /{" "}
-          {currencySign + calculateEstimateNumber(dailyPrice)} daily /{" "}
-          {currencySign + calculateEstimateNumber(monthlyPrice)} monthly{" "}
-        </b>
-        ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits}RU/s,{" "}
-        {currencySign + pricePerRu}/RU)
-      </Text>
-    </Stack>
+    <Text variant="small">
+      Estimated cost ({currency}){iconWithEstimatedCostDisclaimer}:{" "}
+      <b>
+        {currencySign + calculateEstimateNumber(hourlyPrice)} hourly /{" "}
+        {currencySign + calculateEstimateNumber(dailyPrice)} daily /{" "}
+        {currencySign + calculateEstimateNumber(monthlyPrice)} monthly{" "}
+      </b>
+      ({numberOfRegions + (numberOfRegions === 1 ? " region" : " regions")}, {requestUnits}RU/s,{" "}
+      {currencySign + pricePerRu}/RU)
+    </Text>
   );
 };

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -1,6 +1,5 @@
-import { Checkbox, DirectionalHint, Link, Separator, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
+import { Checkbox, DirectionalHint, Link, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
 import { getWorkloadType } from "Common/DatabaseAccountUtility";
-import { CostEstimateText } from "Explorer/Controls/ThroughputInput/CostEstimateText/CostEstimateText";
 import { useDatabases } from "Explorer/useDatabases";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as Constants from "../../../Common/Constants";
@@ -10,8 +9,8 @@ import { userContext } from "../../../UserContext";
 import { getCollectionName } from "../../../Utils/APITypeUtils";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import * as PricingUtils from "../../../Utils/PricingUtils";
+import { CostEstimateText } from "./CostEstimateText/CostEstimateText";
 import "./ThroughputInput.less";
-import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";
 
 export interface ThroughputInputProps {
   isDatabase: boolean;
@@ -19,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;
@@ -32,7 +30,6 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   isFreeTier,
   showFreeTierExceedThroughputTooltip,
   isQuickstart,
-  isGlobalSecondaryIndex,
   setThroughputValue,
   setIsAutoscale,
   setIsThroughputCapExceeded,
@@ -44,8 +41,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   if (
     isFreeTier ||
     isQuickstart ||
-    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType) ||
-    isFabricNative()
+    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType)
   ) {
     defaultThroughput = AutoPilotUtils.autoPilotThroughput1K;
   } else if (workloadType === Constants.WorkloadType.Production) {
@@ -197,127 +193,88 @@ 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 style={{ marginTop: -2, fontSize: 12 }}>
-            Your container throughput will automatically scale up to the maximum value you select, from a minimum of 10%
-            of that value.
-          </Text>
-          <Stack horizontal verticalAlign="end" tokens={{ childrenGap: 8 }}>
-            <Stack tokens={{ childrenGap: 4 }}>
-              <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
-                <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
-                  Minimum RU/s
-                </Text>
-                <InfoTooltip>The minimum RU/s your container will scale to</InfoTooltip>
-              </Stack>
-              <Text
-                style={{
-                  fontFamily: "Segoe UI",
-                  width: 70,
-                  height: 27,
-                  border: "none",
-                  fontSize: 14,
-                  backgroundColor: "transparent",
-                  fontWeight: 400,
-                  display: "flex",
-                  alignItems: "center",
-                  justifyContent: "center",
-                }}
-              >
-                {Math.round(throughput / 10).toString()}
-              </Text>
-            </Stack>
-
-            <Text
-              style={{
-                fontFamily: "Segoe UI",
-                fontSize: 12,
-                fontWeight: 400,
-                paddingBottom: 6,
-              }}
+          <Text variant="small" aria-label="capacity calculator of azure cosmos db">
+            Estimate your required RU/s with{" "}
+            <Link
+              className="underlinedLink outlineNone"
+              target="_blank"
+              href="https://cosmos.azure.com/capacitycalculator/"
+              aria-label="capacity calculator of azure cosmos db"
             >
-              x 10 =
-            </Text>
+              capacity calculator
+            </Link>
+            .
+          </Text>
 
-            <Stack tokens={{ childrenGap: 4 }}>
-              <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
-                <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
-                  Maximum RU/s
-                </Text>
-                <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
-              </Stack>
-              <TextField
-                id="autoscaleRUValueField"
-                type="number"
-                styles={{
-                  fieldGroup: { width: 100, height: 27, flexShrink: 0 },
-                  field: { fontSize: 14, fontWeight: 400 },
-                }}
-                onChange={(_event, newInput?: string) => onThroughputValueChange(newInput)}
-                step={AutoPilotUtils.autoPilotIncrementStep}
-                min={AutoPilotUtils.autoPilotThroughput1K}
-                max={isSharded ? Number.MAX_SAFE_INTEGER.toString() : "10000"}
-                value={throughput.toString()}
-                ariaLabel={`${isDatabase ? "Database" : getCollectionName()} max RU/s`}
-                required={true}
-                errorMessage={throughputError}
-              />
-            </Stack>
+          <Stack horizontal>
+            <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }} aria-label="maxRUDescription">
+              {isDatabase ? "Database" : getCollectionName()} Max RU/s
+            </Text>
+            <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
           </Stack>
 
-          <CostEstimateText requestUnits={throughput} isAutoscale={isAutoscaleSelected} />
-          <Stack className="throughputInputSpacing">
-            <Text variant="small" aria-label="ruDescription">
-              Estimate your required RU/s with&nbsp;
-              <Link
-                className="underlinedLink"
-                target="_blank"
-                href="https://cosmos.azure.com/capacitycalculator/"
-                aria-label="Capacity calculator"
-              >
-                capacity calculator
-              </Link>
-              .
-            </Text>
-          </Stack>
-          <Separator className="panelSeparator" style={{ paddingTop: -8, paddingBottom: -8 }} />
+          <TextField
+            id="autoscaleRUValueField"
+            type="number"
+            styles={{
+              fieldGroup: { width: 300, height: 27 },
+              field: { fontSize: 12 },
+            }}
+            onChange={(event, newInput?: string) => onThroughputValueChange(newInput)}
+            step={AutoPilotUtils.autoPilotIncrementStep}
+            min={AutoPilotUtils.autoPilotThroughput1K}
+            max={isSharded ? Number.MAX_SAFE_INTEGER.toString() : "10000"}
+            value={throughput.toString()}
+            ariaLabel={`${isDatabase ? "Database" : getCollectionName()} max RU/s`}
+            required={true}
+            errorMessage={throughputError}
+          />
+
+          <Text variant="small">
+            Your {isDatabase ? "database" : getCollectionName().toLocaleLowerCase()} throughput will automatically scale
+            from{" "}
+            <b>
+              {AutoPilotUtils.getMinRUsBasedOnUserInput(throughput)} RU/s (10% of max RU/s) - {throughput} RU/s
+            </b>{" "}
+            based on usage.
+          </Text>
         </Stack>
       )}
 
@@ -341,6 +298,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
             </Text>
             <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
           </Stack>
+
           <TooltipHost
             directionalHint={DirectionalHint.topLeftEdge}
             content={
@@ -365,10 +323,11 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
               errorMessage={throughputError}
             />
           </TooltipHost>
-          <CostEstimateText requestUnits={throughput} isAutoscale={isAutoscaleSelected} />
         </Stack>
       )}
 
+      <CostEstimateText requestUnits={throughput} isAutoscale={isAutoscaleSelected} />
+
       {throughput > SharedConstants.CollectionCreation.DefaultCollectionRUs100K && (
         <Stack horizontal verticalAlign="start">
           <Checkbox

src/Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent.tsx

@@ -9,7 +9,6 @@ import {
   Stack,
   TextField,
 } from "@fluentui/react";
-import { InfoTooltip } from "Common/Tooltip/InfoTooltip";
 import { VectorEmbedding, VectorIndex } from "Contracts/DataModels";
 import { CollapsibleSectionComponent } from "Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import {
@@ -30,7 +29,6 @@ export interface IVectorEmbeddingPoliciesComponentProps {
   discardChanges?: boolean;
   onChangesDiscarded?: () => void;
   disabled?: boolean;
-  isGlobalSecondaryIndex?: boolean;
 }
 
 export interface VectorEmbeddingPolicyData {
@@ -41,7 +39,8 @@ export interface VectorEmbeddingPolicyData {
   indexType: VectorIndex["type"] | "none";
   pathError: string;
   dimensionsError: string;
-  vectorIndexShardKey?: string[];
+  diskANNShardKey?: string;
+  diskANNShardKeyError?: string;
   indexingSearchListSize?: number;
   indexingSearchListSizeError?: string;
   quantizationByteSize?: number;
@@ -88,7 +87,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
   discardChanges,
   onChangesDiscarded,
   disabled,
-  isGlobalSecondaryIndex,
 }): JSX.Element => {
   const onVectorEmbeddingPathError = (path: string, index?: number): string => {
     let error = "";
@@ -134,6 +132,12 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
     return error;
   };
 
+  //TODO: no restrictions yet due to this field being removed for now.
+  // Uncomment and replace with validation code when field is reinstated
+  // const onDiskANNShardKeyError = (shardKey: string): string => {
+  //   return "";
+  // };
+
   const initializeData = (vectorEmbeddings: VectorEmbedding[], vectorIndexes: VectorIndex[]) => {
     const mergedData: VectorEmbeddingPolicyData[] = [];
     vectorEmbeddings.forEach((embedding) => {
@@ -143,7 +147,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
         indexType: matchingIndex?.type || "none",
         indexingSearchListSize: matchingIndex?.indexingSearchListSize || undefined,
         quantizationByteSize: matchingIndex?.quantizationByteSize || undefined,
-        vectorIndexShardKey: matchingIndex?.vectorIndexShardKey || undefined,
         pathError: onVectorEmbeddingPathError(embedding.path),
         dimensionsError: onVectorEmbeddingDimensionError(embedding.dimensions, matchingIndex?.type || "none"),
       });
@@ -183,7 +186,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
             type: policy.indexType,
             indexingSearchListSize: policy.indexingSearchListSize,
             quantizationByteSize: policy.quantizationByteSize,
-            vectorIndexShardKey: policy.vectorIndexShardKey,
           }) as VectorIndex,
       );
     const validationPassed = vectorEmbeddingPolicyData.every(
@@ -245,16 +247,20 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
     setVectorEmbeddingPolicyData(vectorEmbeddings);
   };
 
-  const onShardKeyChange = (index: number, event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.target.value.trim();
-    const vectorEmbeddings = [...vectorEmbeddingPolicyData];
-    if (!vectorEmbeddings[index]?.vectorIndexShardKey?.[0] && !value.startsWith("/")) {
-      vectorEmbeddings[index].vectorIndexShardKey = ["/" + value];
-    } else {
-      vectorEmbeddings[index].vectorIndexShardKey = [value];
-    }
-    setVectorEmbeddingPolicyData(vectorEmbeddings);
-  };
+  // TODO: uncomment after Ignite
+  // DiskANNShardKey was removed for Ignite due to backend problems. Leaving this here as it will be reinstated immediately after Ignite
+  // const onDiskANNShardKeyChange = (index: number, event: React.ChangeEvent<HTMLInputElement>) => {
+  //   const value = event.target.value.trim();
+  //   const vectorEmbeddings = [...vectorEmbeddingPolicyData];
+  //   if (!vectorEmbeddings[index]?.diskANNShardKey && !value.startsWith("/")) {
+  //     vectorEmbeddings[index].diskANNShardKey = "/" + value;
+  //   } else {
+  //     vectorEmbeddings[index].diskANNShardKey = value;
+  //   }
+  //   const error = onDiskANNShardKeyError(value);
+  //   vectorEmbeddings[index].diskANNShardKeyError = error;
+  //   setVectorEmbeddingPolicyData(vectorEmbeddings);
+  // }
 
   const onVectorEmbeddingPolicyChange = (
     index: number,
@@ -286,11 +292,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
     setVectorEmbeddingPolicyData(vectorEmbeddings);
   };
 
-  const getQuantizationByteSizeTooltipContent = (): string => {
-    const containerName: string = isGlobalSecondaryIndex ? "global secondary index" : "container";
-    return `This is dynamically set by the ${containerName} if left blank, or it can be set to a fixed number`;
-  };
-
   return (
     <Stack tokens={{ childrenGap: 4 }}>
       {vectorEmbeddingPolicyData &&
@@ -401,7 +402,6 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
                         styles={labelStyles}
                       >
                         Quantization byte size
-                        <InfoTooltip>{getQuantizationByteSizeTooltipContent()}</InfoTooltip>
                       </Label>
                       <TextField
                         disabled={
@@ -431,18 +431,26 @@ export const VectorEmbeddingPoliciesComponent: FunctionComponent<IVectorEmbeddin
                         }
                       />
                     </Stack>
-                    <Stack style={{ marginLeft: "10px" }}>
-                      <Label disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"} styles={labelStyles}>
-                        Vector index shard key
-                      </Label>
+                    {/*TODO: uncomment after Ignite */}
+                    {/* DiskANNShardKey was removed for Ignite due to backend problems. Leaving this here as it will be reinstated immediately after Ignite
+                    <Stack
+                      style={{ marginLeft: "10px" }}
+                    >
+                      <Label
+                        disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"}
+                        styles={labelStyles}
+                      >DiskANN shard key</Label>
                       <TextField
                         disabled={disabled || vectorEmbeddingPolicy.indexType !== "diskANN"}
-                        id={`vector-policy-vectorIndexShardKey-${index + 1}`}
+                        id={`vector-policy-diskANNShardKey-${index + 1}`}
                         styles={textFieldStyles}
-                        value={String(vectorEmbeddingPolicy.vectorIndexShardKey?.[0] ?? "")}
-                        onChange={(event: React.ChangeEvent<HTMLInputElement>) => onShardKeyChange(index, event)}
+                        value={String(vectorEmbeddingPolicy.diskANNShardKey || "")}
+                        onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                          onDiskANNShardKeyChange(index, event)
+                        }
                       />
                     </Stack>
+                    */}
                   </Stack>
                 )}
               </Stack>

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) {}

src/Explorer/Explorer.tsx

@@ -12,7 +12,6 @@ import { isFabricMirrored, isFabricMirroredKey, scheduleRefreshFabricToken } fro
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointUtils";
-import { featureRegistered } from "Utils/FeatureRegistrationUtils";
 import { update } from "Utils/arm/generatedClients/cosmos/databaseAccounts";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import * as ko from "knockout";
@@ -31,7 +30,6 @@ import { readDatabases } from "../Common/dataAccess/readDatabases";
 import * as DataModels from "../Contracts/DataModels";
 import { ContainerConnectionInfo, IPhoenixServiceInfo, IProvisionData, IResponse } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import { UploadDetailsRecord } from "../Contracts/ViewModels";
 import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
 import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
@@ -284,42 +282,6 @@ export default class Explorer {
     }
   }
 
-  public openInVsCode(): void {
-    const activeTab = useTabs.getState().activeTab;
-    const resourceId = encodeURIComponent(userContext.databaseAccount.id);
-    const database = encodeURIComponent(activeTab?.collection?.databaseId);
-    const container = encodeURIComponent(activeTab?.collection?.id());
-    const baseUrl = `vscode://ms-azuretools.vscode-cosmosdb?resourceId=${resourceId}`;
-    const vscodeUrl = activeTab ? `${baseUrl}&database=${database}&container=${container}` : baseUrl;
-
-    const openVSCodeDialogProps: DialogProps = {
-      linkProps: {
-        linkText: "Download Visual Studio Code",
-        linkUrl: "https://code.visualstudio.com/download",
-      },
-      isModal: true,
-      title: `Open your Azure Cosmos DB account in Visual Studio Code`,
-      subText: `Please ensure Visual Studio Code is installed on your device.
-      If you don't have it installed, please download it from the link below.`,
-      primaryButtonText: "Open in VS Code",
-      secondaryButtonText: "Cancel",
-
-      onPrimaryButtonClick: () => {
-        try {
-          window.location.href = vscodeUrl;
-          TelemetryProcessor.traceStart(Action.OpenVSCode);
-        } catch (error) {
-          logConsoleError(`Failed to open VS Code: ${getErrorMessage(error)}`);
-        }
-      },
-      onSecondaryButtonClick: () => {
-        useDialog.getState().closeDialog();
-        TelemetryProcessor.traceCancel(Action.OpenVSCode);
-      },
-    };
-    useDialog.getState().openDialog(openVSCodeDialogProps);
-  }
-
   public async openCESCVAFeedbackBlade(): Promise<void> {
     sendMessage({ type: MessageTypes.OpenCESCVAFeedbackBlade });
     Logger.logInfo(
@@ -948,9 +910,7 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-    if (userContext.features.enableCloudShell) {
-      this.connectToNotebookTerminal(kind);
-    } else if (useNotebook.getState().isPhoenixFeatures) {
+    if (useNotebook.getState().isPhoenixFeatures) {
       await this.allocateContainer(PoolIdType.DefaultPoolId);
       const notebookServerInfo = useNotebook.getState().notebookServerInfo;
       if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
@@ -1116,8 +1076,8 @@ export default class Explorer {
     }
   }
 
-  public openUploadItemsPane(onUpload?: (data: UploadDetailsRecord[]) => void): void {
-    useSidePanel.getState().openSidePanel("Upload " + getUploadName(), <UploadItemsPane onUpload={onUpload} />);
+  public openUploadItemsPane(): void {
+    useSidePanel.getState().openSidePanel("Upload " + getUploadName(), <UploadItemsPane />);
   }
   public openExecuteSprocParamsPanel(storedProcedure: StoredProcedure): void {
     useSidePanel
@@ -1125,7 +1085,7 @@ export default class Explorer {
       .openSidePanel("Input parameters", <ExecuteSprocParamsPane storedProcedure={storedProcedure} />);
   }
 
-  public getDownloadModalContent(fileName: string): JSX.Element {
+  public getDownloadModalConent(fileName: string): JSX.Element {
     if (useNotebook.getState().isPhoenixNotebooks) {
       return (
         <>
@@ -1171,11 +1131,6 @@ export default class Explorer {
       await this.initNotebooks(userContext.databaseAccount);
     }
 
-    if (userContext.authType === AuthType.AAD && userContext.apiType === "SQL") {
-      const throughputBucketsEnabled = await featureRegistered(userContext.subscriptionId, "ThroughputBucketing");
-      updateUserContext({ throughputBucketsEnabled });
-    }
-
     this.refreshSampleData();
   }
 

src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx

@@ -16,12 +16,7 @@ import * as StorageUtility from "../../../Shared/StorageUtility";
 import { LocalStorageUtility, StorageKey } from "../../../Shared/StorageUtility";
 import { Action } from "../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-import {
-  logConsoleError,
-  logConsoleInfo,
-  logConsoleProgress,
-  logConsoleWarning,
-} from "../../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
 import { EditorReact } from "../../Controls/Editor/EditorReact";
 import * as InputTypeaheadComponent from "../../Controls/InputTypeahead/InputTypeaheadComponent";
 import * as TabComponent from "../../Controls/Tabs/TabComponent";
@@ -1088,7 +1083,6 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
   public static reportToConsole(type: ConsoleDataType.InProgress, msg: string, ...errorData: any[]): () => void;
   public static reportToConsole(type: ConsoleDataType.Info, msg: string, ...errorData: any[]): void;
   public static reportToConsole(type: ConsoleDataType.Error, msg: string, ...errorData: any[]): void;
-  public static reportToConsole(type: ConsoleDataType.Warning, msg: string, ...errorData: any[]): void;
   public static reportToConsole(type: ConsoleDataType, msg: string, ...errorData: any[]): void | (() => void) {
     let errorDataStr = "";
     if (errorData && errorData.length > 0) {
@@ -1105,8 +1099,6 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
         return logConsoleInfo(consoleMessage);
       case ConsoleDataType.InProgress:
         return logConsoleProgress(consoleMessage);
-      case ConsoleDataType.Warning:
-        return logConsoleWarning(consoleMessage);
     }
   }
 

src/Explorer/Graph/NewVertexComponent/NewVertexComponent.less

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

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -14,7 +14,6 @@ import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
 import OpenInTabIcon from "../../../../images/open-in-tab.svg";
 import SettingsIcon from "../../../../images/settings_15x15.svg";
 import SynapseIcon from "../../../../images/synapse-link.svg";
-import VSCodeIcon from "../../../../images/vscode.svg";
 import { AuthType } from "../../../AuthType";
 import * as Constants from "../../../Common/Constants";
 import { Platform, configContext } from "../../../ConfigContext";
@@ -61,10 +60,6 @@ export function createStaticCommandBarButtons(
       addDivider();
       buttons.push(addSynapseLink);
     }
-    if (userContext.apiType !== "Gremlin") {
-      const addVsCode = createOpenVsCodeDialogButton(container);
-      buttons.push(addVsCode);
-    }
   }
 
   if (isDataplaneRbacSupported(userContext.apiType)) {
@@ -131,14 +126,13 @@ export function createContextCommandBarButtons(
   const buttons: CommandButtonComponentProps[] = [];
 
   if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const label =
-      useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell ? "Open Mongo Shell" : "New Shell";
+    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
     const newMongoShellBtn: CommandButtonComponentProps = {
       iconSrc: HostedTerminalIcon,
       iconAlt: label,
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
+        if (useNotebook.getState().isShellEnabled) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
@@ -152,7 +146,7 @@ export function createContextCommandBarButtons(
   }
 
   if (
-    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
+    useNotebook.getState().isShellEnabled &&
     !selectedNodeState.isDatabaseNodeOrNoneSelected() &&
     userContext.apiType === "Cassandra"
   ) {
@@ -273,18 +267,6 @@ function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonCo
   };
 }
 
-function createOpenVsCodeDialogButton(container: Explorer): CommandButtonComponentProps {
-  const label = "Visual Studio Code";
-  return {
-    iconSrc: VSCodeIcon,
-    iconAlt: label,
-    onCommandClick: () => container.openInVsCode(),
-    commandButtonLabel: label,
-    hasPopup: false,
-    ariaLabel: label,
-  };
-}
-
 function createLoginForEntraIDButton(container: Explorer): CommandButtonComponentProps {
   if (configContext.platform !== Platform.Portal) {
     return undefined;
@@ -473,7 +455,7 @@ function createOpenTerminalButtonByKind(
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
     onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled || userContext.features.enableCloudShell) {
+      if (useNotebook.getState().isNotebookEnabled) {
         container.openNotebookTerminal(terminalKind);
       }
     },
@@ -517,6 +499,6 @@ export function createPostgreButtons(container: Explorer): CommandButtonComponen
 
 export function createVCoreMongoButtons(container: Explorer): CommandButtonComponentProps[] {
   const openVCoreMongoTerminalButton = createOpenTerminalButtonByKind(container, ViewModels.TerminalKind.VCoreMongo);
-  const addVsCode = createOpenVsCodeDialogButton(container);
-  return [openVCoreMongoTerminalButton, addVsCode];
+
+  return [openVCoreMongoTerminalButton];
 }

src/Explorer/Menus/NotificationConsole/ConsoleData.tsx

@@ -13,5 +13,4 @@ export enum ConsoleDataType {
   Info = 0,
   Error = 1,
   InProgress = 2,
-  Warning = 3,
 }

src/Explorer/Menus/NotificationConsole/NotificationConsole.less

@@ -173,20 +173,8 @@
                 .message {
                     flex-grow: 1;
                     white-space:pre-wrap;
-                    overflow-wrap: break-word;
-                    word-break: break-word;
                 }
             }
         }
     }
-
-  @media (max-width: 768px) {
-    .notificationConsoleContents {
-      overflow-y: auto;
-
-      .notificationConsoleData {
-        overflow: visible;
-      }
-    }
-  }
 }

src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx

@@ -14,7 +14,6 @@ import ErrorRedIcon from "../../../../images/error_red.svg";
 import infoBubbleIcon from "../../../../images/info-bubble-9x9.svg";
 import InfoIcon from "../../../../images/info_color.svg";
 import LoadingIcon from "../../../../images/loading.svg";
-import WarningIcon from "../../../../images/warning.svg";
 import { ClientDefaults, KeyCodes } from "../../../Common/Constants";
 import { userContext } from "../../../UserContext";
 import { useNotificationConsole } from "../../../hooks/useNotificationConsole";
@@ -92,9 +91,6 @@ export class NotificationConsoleComponent extends React.Component<
     const numInfoItems = this.state.allConsoleData.filter(
       (data: ConsoleData) => data.type === ConsoleDataType.Info,
     ).length;
-    const numWarningItems = this.state.allConsoleData.filter(
-      (data: ConsoleData) => data.type === ConsoleDataType.Warning,
-    ).length;
 
     return (
       <div className="notificationConsoleContainer">
@@ -122,10 +118,6 @@ export class NotificationConsoleComponent extends React.Component<
                 <img src={infoBubbleIcon} alt="Info items" />
                 <span className="numInfoItems">{numInfoItems}</span>
               </span>
-              <span className="notificationConsoleHeaderIconWithData">
-                <img src={WarningIcon} alt="Warning items" />
-                <span className="numWarningItems">{numWarningItems}</span>
-              </span>
             </span>
             {userContext.features.pr && <PrPreview pr={userContext.features.pr} />}
             <span className="consoleSplitter" />
@@ -206,7 +198,6 @@ export class NotificationConsoleComponent extends React.Component<
         {item.type === ConsoleDataType.Info && <img className="infoIcon" src={InfoIcon} alt="info" />}
         {item.type === ConsoleDataType.Error && <img className="errorIcon" src={ErrorRedIcon} alt="error" />}
         {item.type === ConsoleDataType.InProgress && <img className="loaderIcon" src={LoaderIcon} alt="in progress" />}
-        {item.type === ConsoleDataType.Warning && <img className="warningIcon" src={WarningIcon} alt="warning" />}
         <span className="date">{item.date}</span>
         <span className="message" role="alert" aria-live="assertive">
           {item.message}

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

@@ -59,19 +59,6 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
             0
           </span>
         </span>
-        <span
-          className="notificationConsoleHeaderIconWithData"
-        >
-          <img
-            alt="Warning items"
-            src={{}}
-          />
-          <span
-            className="numWarningItems"
-          >
-            0
-          </span>
-        </span>
       </span>
       <span
         className="consoleSplitter"
@@ -242,19 +229,6 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
             1
           </span>
         </span>
-        <span
-          className="notificationConsoleHeaderIconWithData"
-        >
-          <img
-            alt="Warning items"
-            src={{}}
-          />
-          <span
-            className="numWarningItems"
-          >
-            0
-          </span>
-        </span>
       </span>
       <span
         className="consoleSplitter"

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) {

src/Explorer/OpenActions/OpenActions.tsx

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

src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx

@@ -25,7 +25,7 @@ import { FullTextPoliciesComponent } from "Explorer/Controls/FullTextSeach/FullT
 import { VectorEmbeddingPoliciesComponent } from "Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent";
 import {
   AllPropertiesIndexed,
-  AnalyticalStoreHeader,
+  AnalyticalStorageContent,
   ContainerVectorPolicyTooltipContent,
   FullTextPolicyDefault,
   getPartitionKey,
@@ -49,18 +49,22 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
 import { getCollectionName } from "Utils/APITypeUtils";
-import { isCapabilityEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
+import {
+  isCapabilityEnabled,
+  isFullTextSearchEnabled,
+  isServerlessAccount,
+  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";
 import { PanelFooterComponent } from "../PanelFooterComponent";
 import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "../PanelLoadingScreen";
-import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 
 export interface AddCollectionPanelProps {
   explorer: Explorer;
@@ -106,7 +110,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   private collectionThroughput: number;
   private isCollectionAutoscale: boolean;
   private isCostAcknowledged: boolean;
-  private showFullTextSearch: boolean;
 
   constructor(props: AddCollectionPanelProps) {
     super(props);
@@ -141,8 +144,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       fullTextIndexes: [],
       fullTextPolicyValidated: true,
     };
-
-    this.showFullTextSearch = userContext.apiType === "SQL";
   }
 
   componentDidMount(): void {
@@ -265,7 +266,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
 
         <div className="panelMainContent">
           {!(isFabricNative() && this.props.databaseId !== undefined) && (
-            <Stack hidden={userContext.apiType === "Tables"} style={{ marginBottom: -2 }}>
+            <Stack hidden={userContext.apiType === "Tables"}>
               <Stack horizontal>
                 <span className="mandatoryStar">*&nbsp;</span>
                 <Text className="panelTextBold" variant="small">
@@ -330,12 +331,13 @@ 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"
                     aria-label="New database id, Type a new database id"
+                    autoFocus
                     tabIndex={0}
                     value={this.state.newDatabaseId}
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
@@ -406,12 +408,12 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                   responsiveMode={999}
                 />
               )}
+              <Separator className="panelSeparator" />
             </Stack>
           )}
-          <Separator className="panelSeparator" style={{ marginTop: -4, marginBottom: -4 }} />
 
           <Stack>
-            <Stack horizontal style={{ marginTop: -5, marginBottom: 1 }}>
+            <Stack horizontal>
               <span className="mandatoryStar">*&nbsp;</span>
               <Text className="panelTextBold" variant="small">
                 {`${getCollectionName()} id`}
@@ -437,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"
@@ -449,10 +451,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               }
             />
           </Stack>
-          <Separator className="panelSeparator" style={{ marginTop: -5, marginBottom: -5 }} />
+
           {this.shouldShowIndexingOptionsForFreeTierAccount() && (
             <Stack>
-              <Stack horizontal style={{ marginTop: -4, marginBottom: -5 }}>
+              <Stack horizontal>
                 <span className="mandatoryStar">*&nbsp;</span>
                 <Text className="panelTextBold" variant="small">
                   Indexing
@@ -498,7 +500,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             (!this.state.isSharedThroughputChecked ||
               this.props.explorer.isFixedCollectionWithSharedThroughputSupported()) && (
               <Stack>
-                <Stack horizontal style={{ marginTop: -5, marginBottom: -4 }}>
+                <Stack horizontal>
                   <span className="mandatoryStar">*&nbsp;</span>
                   <Text className="panelTextBold" variant="small">
                     Sharding
@@ -554,7 +556,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
 
           {this.state.isSharded && (
             <Stack>
-              <Stack horizontal style={{ marginTop: -5, marginBottom: -4 }}>
+              <Stack horizontal>
                 <span className="mandatoryStar">*&nbsp;</span>
                 <Text className="panelTextBold" variant="small">
                   {getPartitionKeyName()}
@@ -598,7 +600,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               {userContext.apiType === "SQL" &&
                 this.state.subPartitionKeys.map((subPartitionKey: string, index: number) => {
                   return (
-                    <Stack style={{ marginBottom: 2, marginTop: -5 }} key={`uniqueKey${index}`} horizontal>
+                    <Stack style={{ marginBottom: 8 }} key={`uniqueKey${index}`} horizontal>
                       <div
                         style={{
                           width: "20px",
@@ -666,7 +668,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                   )}
                 </Stack>
               )}
-              <Separator className="panelSeparator" style={{ marginTop: 2, marginBottom: -4 }} />
             </Stack>
           )}
 
@@ -727,7 +728,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
           )}
 
           {!isFabricNative() && userContext.apiType === "SQL" && (
-            <Stack style={{ marginTop: -2, marginBottom: -4 }}>
+            <Stack>
               {UniqueKeysHeader()}
               {this.state.uniqueKeys.map((uniqueKey: string, i: number): JSX.Element => {
                 return (
@@ -741,6 +742,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                           : "Comma separated paths e.g. /firstName,/address/zipCode"
                       }
                       className="panelTextField"
+                      autoFocus
                       value={uniqueKey}
                       onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                         const uniqueKeys = this.state.uniqueKeys.map((uniqueKey: string, j: number) => {
@@ -775,12 +777,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             </Stack>
           )}
 
-          <Separator className="panelSeparator" style={{ marginTop: -15, marginBottom: -4 }} />
-
           {shouldShowAnalyticalStoreOptions() && (
-            <Stack className="panelGroupSpacing" style={{ marginTop: -4 }}>
+            <Stack className="panelGroupSpacing">
               <Text className="panelTextBold" variant="small">
-                {AnalyticalStoreHeader()}
+                {AnalyticalStorageContent()}
               </Text>
 
               <Stack horizontal verticalAlign="center">
@@ -821,7 +821,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                 <Stack className="panelGroupSpacing">
                   <Text variant="small">
                     Azure Synapse Link is required for creating an analytical store{" "}
-                    {getCollectionName().toLocaleLowerCase()}. Enable Synapse Link for this Cosmos DB account. <br />
+                    {getCollectionName().toLocaleLowerCase()}. Enable Synapse Link for this Cosmos DB account.{" "}
                     <Link
                       href="https://aka.ms/cosmosdb-synapselink"
                       target="_blank"
@@ -1161,7 +1161,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   }
 
   private shouldShowFullTextSearchParameters() {
-    return !isFabricNative() && this.showFullTextSearch;
+    return isFullTextSearchEnabled() && (isServerlessAccount() || this.shouldShowCollectionThroughputInput());
   }
 
   private parseUniqueKeys(): DataModels.UniqueKeyPolicy {
@@ -1316,7 +1316,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       };
     }
 
-    if (this.showFullTextSearch) {
+    if (this.shouldShowFullTextSearchParameters()) {
       indexingPolicy.fullTextIndexes = this.state.fullTextIndexes;
     }
 
@@ -1350,12 +1350,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
     let offerThroughput: number;
     let autoPilotMaxThroughput: number;
 
-    // Throughput
-    if (isFabricNative()) {
-      // Fabric Native accounts are always autoscale and have a fixed throughput of 1K
-      autoPilotMaxThroughput = AutoPilotUtils.autoPilotThroughput1K;
-      offerThroughput = undefined;
-    } else if (databaseLevelThroughput) {
+    if (databaseLevelThroughput) {
       if (this.state.createNewDatabase) {
         if (this.isNewDatabaseAutoscale) {
           autoPilotMaxThroughput = this.newDatabaseThroughput;

src/Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility.tsx

@@ -73,7 +73,7 @@ export function UniqueKeysHeader(): JSX.Element {
     "Unique keys provide developers with the ability to add a layer of data integrity to their database. By creating a unique key policy when a container is created, you ensure the uniqueness of one or more values per partition key.";
 
   return (
-    <Stack horizontal style={{ marginBottom: -2 }}>
+    <Stack horizontal>
       <Text className="panelTextBold" variant="small">
         Unique keys
       </Text>
@@ -98,21 +98,6 @@ export function shouldShowAnalyticalStoreOptions(): boolean {
   }
 }
 
-export function AnalyticalStoreHeader(): JSX.Element {
-  const tooltipContent =
-    "Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads.";
-  return (
-    <Stack horizontal style={{ marginBottom: -2 }}>
-      <Text className="panelTextBold" variant="small">
-        Analytical Store
-      </Text>
-      <TooltipHost directionalHint={DirectionalHint.bottomLeftEdge} content={tooltipContent}>
-        <Icon iconName="Info" className="panelInfoIcon" tabIndex={0} ariaLabel={tooltipContent} />
-      </TooltipHost>
-    </Stack>
-  );
-}
-
 export function AnalyticalStorageContent(): JSX.Element {
   return (
     <Text variant="small">

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

@@ -11,11 +11,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
   >
     <Stack
       hidden={false}
-      style={
-        {
-          "marginBottom": -2,
-        }
-      }
     >
       <Stack
         horizontal={true}
@@ -93,11 +88,12 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
           aria-label="New database id, Type a new database id"
           aria-required={true}
           autoComplete="off"
+          autoFocus={true}
           className="panelTextField"
           id="newDatabaseId"
           name="newDatabaseId"
           onChange={[Function]}
-          pattern="[^\\/?#\\\\]*[^\\/?# \\\\]"
+          pattern="[^/?#\\\\]*[^/?# \\\\]"
           placeholder="Type a new database id"
           required={true}
           size={40}
@@ -142,25 +138,13 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
           </StyledTooltipHostBase>
         </Stack>
       </Stack>
+      <Separator
+        className="panelSeparator"
+      />
     </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -4,
-        }
-      }
-    />
     <Stack>
       <Stack
         horizontal={true}
-        style={
-          {
-            "marginBottom": 1,
-            "marginTop": -5,
-          }
-        }
       >
         <span
           className="mandatoryStar"
@@ -194,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}
@@ -203,24 +187,9 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
         value=""
       />
     </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -5,
-          "marginTop": -5,
-        }
-      }
-    />
     <Stack>
       <Stack
         horizontal={true}
-        style={
-          {
-            "marginBottom": -4,
-            "marginTop": -5,
-          }
-        }
       >
         <span
           className="mandatoryStar"
@@ -285,15 +254,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
           Add hierarchical partition key
         </CustomizedDefaultButton>
       </Stack>
-      <Separator
-        className="panelSeparator"
-        style={
-          {
-            "marginBottom": -4,
-            "marginTop": 2,
-          }
-        }
-      />
     </Stack>
     <ThroughputInput
       isDatabase={false}
@@ -303,21 +263,9 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
       setIsThroughputCapExceeded={[Function]}
       setThroughputValue={[Function]}
     />
-    <Stack
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -2,
-        }
-      }
-    >
+    <Stack>
       <Stack
         horizontal={true}
-        style={
-          {
-            "marginBottom": -2,
-          }
-        }
       >
         <Text
           className="panelTextBold"
@@ -358,53 +306,26 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
         Add unique key
       </CustomizedActionButton>
     </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -15,
-        }
-      }
-    />
     <Stack
       className="panelGroupSpacing"
-      style={
-        {
-          "marginTop": -4,
-        }
-      }
     >
       <Text
         className="panelTextBold"
         variant="small"
       >
-        <Stack
-          horizontal={true}
-          style={
-            {
-              "marginBottom": -2,
-            }
-          }
+        <Text
+          variant="small"
         >
-          <Text
-            className="panelTextBold"
-            variant="small"
+          Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads.
+           
+          <StyledLinkBase
+            aria-label="Learn more about analytical store."
+            href="https://aka.ms/analytical-store-overview"
+            target="_blank"
           >
-            Analytical Store
-          </Text>
-          <StyledTooltipHostBase
-            content="Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads."
-            directionalHint={4}
-          >
-            <Icon
-              ariaLabel="Enable analytical store capability to perform near real-time analytics on your operational data, without impacting the performance of transactional workloads."
-              className="panelInfoIcon"
-              iconName="Info"
-              tabIndex={0}
-            />
-          </StyledTooltipHostBase>
-        </Stack>
+            Learn more
+          </StyledLinkBase>
+        </Text>
       </Text>
       <Stack
         horizontal={true}
@@ -460,8 +381,8 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
           Azure Synapse Link is required for creating an analytical store
            
           container
-          . Enable Synapse Link for this Cosmos DB account. 
-          <br />
+          . Enable Synapse Link for this Cosmos DB account.
+           
           <StyledLinkBase
             aria-label="Learn more about Azure Synapse Link."
             className="capacitycalculator-link"
@@ -490,44 +411,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
         />
       </Stack>
     </Stack>
-    <Stack>
-      <CollapsibleSectionComponent
-        isExpandedByDefault={false}
-        onExpand={[Function]}
-        title="Container Full Text Search Policy"
-      >
-        <Stack
-          id="collapsibleFullTextPolicySectionContent"
-          styles={
-            {
-              "root": {
-                "position": "relative",
-              },
-            }
-          }
-        >
-          <Stack
-            styles={
-              {
-                "root": {
-                  "paddingLeft": 40,
-                },
-              }
-            }
-          >
-            <FullTextPoliciesComponent
-              fullTextPolicy={
-                {
-                  "defaultLanguage": "en-US",
-                  "fullTextPaths": [],
-                }
-              }
-              onFullTextPathChange={[Function]}
-            />
-          </Stack>
-        </Stack>
-      </CollapsibleSectionComponent>
-    </Stack>
     <CollapsibleSectionComponent
       isExpandedByDefault={false}
       onExpand={[Function]}

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}

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={

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();
-  });
-});

src/Explorer/Panes/AddMaterializedViewPanel/AddMVAdvancedComponent.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");
       }}
     >

src/Explorer/Panes/AddMaterializedViewPanel/AddMVAnalyticalStoreComponent.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 => {

src/Explorer/Panes/AddMaterializedViewPanel/AddMVFullTextSearchComponent.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 (

src/Explorer/Panes/AddMaterializedViewPanel/AddMVPartitionKeyComponent.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}

src/Explorer/Panes/AddMaterializedViewPanel/AddMVThroughputComponent.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;
@@ -47,14 +49,15 @@ export const ThroughputComponent = (props: ThroughputComponentProps): JSX.Elemen
         <ThroughputInput
           showFreeTierExceedThroughputTooltip={isFreeTierAccount() && !useDatabases.getState().isFirstResourceCreated()}
           isDatabase={false}
-          isSharded={true}
+          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);
           }}

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>
+  );
+};

src/Explorer/Panes/AddMaterializedViewPanel/AddMVVectorSearchComponent.tsx

@@ -8,23 +8,21 @@ 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[];
   setVectorIndexingPolicy: React.Dispatch<React.SetStateAction<VectorIndex[]>>;
   setVectorPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
-  isGlobalSecondaryIndex?: boolean;
 }
 
-export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.Element => {
+export const AddMVVectorSearchComponent = (props: AddMVVectorSearchComponentProps): JSX.Element => {
   const {
     vectorEmbeddingPolicy,
     setVectorEmbeddingPolicy,
     vectorIndexingPolicy,
     setVectorIndexingPolicy,
     setVectorPolicyValidated,
-    isGlobalSecondaryIndex,
   } = props;
 
   return (
@@ -51,7 +49,6 @@ export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.El
                 setVectorIndexingPolicy(vectorIndexingPolicy);
                 setVectorPolicyValidated(vectorPolicyValidated);
               }}
-              isGlobalSecondaryIndex={isGlobalSecondaryIndex}
             />
           </Stack>
         </Stack>

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();
+  });
+});

src/Explorer/Panes/AddMaterializedViewPanel/AddMaterializedViewPanel.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,61 +22,61 @@ 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";
 import { useDatabases } from "Explorer/useDatabases";
 import { useSidePanel } from "hooks/useSidePanel";
-import React, { MutableRefObject, useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { CollectionCreation } from "Shared/Constants";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "UserContext";
-import { isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
-import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
+import { isFullTextSearchEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 
-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>();
 
-  const showFullTextSearch: MutableRefObject<boolean> = useRef<boolean>(userContext.apiType === "SQL");
-
   useEffect(() => {
     const sourceContainerOptions: IDropdownOption[] = [];
     useDatabases.getState().databases.forEach((database: Database) => {
@@ -87,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,
         });
@@ -107,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 => {
@@ -142,6 +147,10 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
     return isVectorSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
   };
 
+  const showFullTextSearchParameters = (): boolean => {
+    return isFullTextSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
+  };
+
   const getAnalyticalStorageTtl = (): number => {
     if (!isSynapseLinkEnabled()) {
       return undefined;
@@ -167,12 +176,19 @@ 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 (materializedViewThroughput > CollectionCreation.MaxRUPerPartition) {
+      setErrorMessage("Unsharded collections support up to 10,000 RUs");
+      return false;
+    }
+
     if (showVectorSearchParameters()) {
       if (!vectorPolicyValidated) {
         setErrorMessage("Please fix errors in container vector policy");
@@ -195,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
       ? {
@@ -226,7 +243,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
       };
     }
 
-    if (showFullTextSearch) {
+    if (showFullTextSearchParameters()) {
       indexingPolicy.fullTextIndexes = fullTextIndexes;
     }
 
@@ -236,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,
@@ -249,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,
     };
@@ -267,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} />
       )}
@@ -298,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)}
@@ -307,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}
@@ -336,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>
               }
             >
@@ -344,7 +373,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
             </TooltipHost>
           </Stack>
           <input
-            id="globalSecondaryIndexDefinition"
+            id="materializedViewDefinition"
             type="text"
             aria-required
             required
@@ -355,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,
@@ -381,16 +412,15 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
                 setVectorIndexingPolicy,
                 vectorPolicyValidated,
                 setVectorPolicyValidated,
-                isGlobalSecondaryIndex: true,
               }}
             />
           )}
-          {showFullTextSearch && (
-            <FullTextSearchComponent
+          {showFullTextSearchParameters() && (
+            <AddMVFullTextSearchComponent
               {...{ fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated }}
             />
           )}
-          <AdvancedComponent {...{ useHashV1, setUseHashV1, setSubPartitionKeys }} />
+          <AddMVAdvancedComponent {...{ useHashV1, setUseHashV1, setSubPartitionKeys }} />
         </Stack>
       </div>
       <PanelFooterComponent buttonLabel="OK" isButtonDisabled={isThroughputCapExceeded} />

src/Explorer/Panes/AddMaterializedViewPanel/__snapshots__/AddMaterializedViewPanel.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,18 +177,7 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
         }
         setEnableAnalyticalStore={[Function]}
       />
-      <FullTextSearchComponent
-        fullTextPolicy={
-          {
-            "defaultLanguage": "en-US",
-            "fullTextPaths": [],
-          }
-        }
-        setFullTextIndexes={[Function]}
-        setFullTextPolicy={[Function]}
-        setFullTextPolicyValidated={[Function]}
-      />
-      <AdvancedComponent
+      <AddMVAdvancedComponent
         setSubPartitionKeys={[Function]}
         setUseHashV1={[Function]}
       />

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}

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"

src/Explorer/Panes/PanelComponent.less

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

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

@@ -12,7 +12,6 @@ exports[`Settings Pane should render Default properly 1`] = `
   >
     <Accordion
       className="customAccordion ___1uf6361_0000000 fz7g6wx"
-      collapsible={true}
     >
       <AccordionItem
         value="1"
@@ -108,7 +107,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="4"
+        value="3"
       >
         <AccordionHeader>
           <div
@@ -149,7 +148,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="5"
+        value="4"
       >
         <AccordionHeader>
           <div
@@ -220,7 +219,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="6"
+        value="5"
       >
         <AccordionHeader>
           <div
@@ -282,7 +281,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="7"
+        value="6"
       >
         <AccordionHeader>
           <div
@@ -424,7 +423,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="8"
+        value="7"
       >
         <AccordionHeader>
           <div
@@ -460,7 +459,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="9"
+        value="8"
       >
         <AccordionHeader>
           <div
@@ -496,52 +495,7 @@ exports[`Settings Pane should render Default properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="10"
-      >
-        <AccordionHeader>
-          <div
-            className="___15c001r_0000000 fq02s40"
-          >
-            Enhanced query control
-          </div>
-        </AccordionHeader>
-        <AccordionPanel>
-          <div
-            className="___1dfa554_0000000 fo7qwa0"
-          >
-            <div
-              className="___10gar1i_0000000 f1fow5ox f1ugzwwg"
-            >
-              Query up to the max degree of parallelism.
-              <a
-                href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/performance-tips-query-sdk?tabs=v3&pivots=programming-language-nodejs#enhanced-query-control"
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                 
-                Learn more
-                 
-              </a>
-            </div>
-            <StyledCheckboxBase
-              ariaLabel="EnableQueryControl"
-              checked={false}
-              className="padding"
-              label="Enable query control"
-              onChange={[Function]}
-              styles={
-                {
-                  "label": {
-                    "padding": 0,
-                  },
-                }
-              }
-            />
-          </div>
-        </AccordionPanel>
-      </AccordionItem>
-      <AccordionItem
-        value="10"
+        value="9"
       >
         <AccordionHeader>
           <div
@@ -619,10 +573,9 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
   >
     <Accordion
       className="customAccordion ___1uf6361_0000000 fz7g6wx"
-      collapsible={true}
     >
       <AccordionItem
-        value="7"
+        value="6"
       >
         <AccordionHeader>
           <div
@@ -764,7 +717,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="8"
+        value="7"
       >
         <AccordionHeader>
           <div
@@ -800,7 +753,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
         </AccordionPanel>
       </AccordionItem>
       <AccordionItem
-        value="12"
+        value="11"
       >
         <AccordionHeader>
           <div

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

@@ -356,7 +356,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
             value=""
           >
             <div
-              className="ms-TextField is-required root-116"
+              className="ms-TextField is-required root-110"
             >
               <div
                 className="ms-TextField-wrapper"
@@ -647,7 +647,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                     }
                   >
                     <label
-                      className="ms-Label root-127"
+                      className="ms-Label root-121"
                       htmlFor="TextField0"
                       id="TextFieldLabel2"
                     >
@@ -656,13 +656,13 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                   </LabelBase>
                 </StyledLabelBase>
                 <div
-                  className="ms-TextField-fieldGroup fieldGroup-117"
+                  className="ms-TextField-fieldGroup fieldGroup-111"
                 >
                   <input
                     aria-invalid={false}
                     aria-labelledby="TextFieldLabel2"
                     autoFocus={true}
-                    className="ms-TextField-field field-118"
+                    className="ms-TextField-field field-112"
                     id="TextField0"
                     name="collectionIdConfirmation"
                     onBlur={[Function]}
@@ -2464,7 +2464,7 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                       >
                         <button
                           aria-label="Create"
-                          className="ms-Button ms-Button--primary root-128"
+                          className="ms-Button ms-Button--primary root-122"
                           data-is-focusable={true}
                           data-test="Panel/OkButton"
                           id="sidePanelOkButton"
@@ -2477,14 +2477,14 @@ exports[`StringInput Pane should render Create new directory properly 1`] = `
                           type="submit"
                         >
                           <span
-                            className="ms-Button-flexContainer flexContainer-129"
+                            className="ms-Button-flexContainer flexContainer-123"
                             data-automationid="splitbuttonprimary"
                           >
                             <span
-                              className="ms-Button-textContainer textContainer-130"
+                              className="ms-Button-textContainer textContainer-124"
                             >
                               <span
-                                className="ms-Button-label label-132"
+                                className="ms-Button-label label-126"
                                 id="id__5"
                                 key="id__5"
                               >

src/Explorer/Panes/UploadItemsPane/UploadItemsPane.tsx

@@ -2,13 +2,9 @@ import {
   DetailsList,
   DetailsListLayoutMode,
   DirectionalHint,
-  FontIcon,
   IColumn,
   SelectionMode,
   TooltipHost,
-  getTheme,
-  mergeStyles,
-  mergeStyleSets,
 } from "@fluentui/react";
 import { Upload } from "Common/Upload/Upload";
 import { UploadDetailsRecord } from "Contracts/ViewModels";
@@ -18,41 +14,7 @@ import { getErrorMessage } from "../../Tables/Utilities";
 import { useSelectedNode } from "../../useSelectedNode";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 
-const theme = getTheme();
-const iconClass = mergeStyles({
-  verticalAlign: "middle",
-  maxHeight: "16px",
-  maxWidth: "16px",
-});
-
-const classNames = mergeStyleSets({
-  fileIconHeaderIcon: {
-    padding: 0,
-    fontSize: "16px",
-  },
-  fileIconCell: {
-    textAlign: "center",
-    selectors: {
-      "&:before": {
-        content: ".",
-        display: "inline-block",
-        verticalAlign: "middle",
-        height: "100%",
-        width: "0px",
-        visibility: "hidden",
-      },
-    },
-  },
-  error: [{ color: theme.semanticColors.errorIcon }, iconClass],
-  accept: [{ color: theme.semanticColors.successIcon }, iconClass],
-  warning: [{ color: theme.semanticColors.warningIcon }, iconClass],
-});
-
-export type UploadItemsPaneProps = {
-  onUpload?: (data: UploadDetailsRecord[]) => void;
-};
-
-export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpload }) => {
+export const UploadItemsPane: FunctionComponent = () => {
   const [files, setFiles] = useState<FileList>();
   const [uploadFileData, setUploadFileData] = useState<UploadDetailsRecord[]>([]);
   const [formError, setFormError] = useState<string>("");
@@ -75,8 +37,6 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
         (uploadDetails) => {
           setUploadFileData(uploadDetails.data);
           setFiles(undefined);
-          // Emit the upload details to the parent component
-          onUpload && onUpload(uploadDetails.data);
         },
         (error: Error) => {
           const errorMessage = getErrorMessage(error);
@@ -100,94 +60,44 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
   };
 
   const columns: IColumn[] = [
-    {
-      key: "icons",
-      name: "",
-      fieldName: "",
-      className: classNames.fileIconCell,
-      iconClassName: classNames.fileIconHeaderIcon,
-      isIconOnly: true,
-      minWidth: 16,
-      maxWidth: 16,
-      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
-        if (item.numFailed) {
-          const errorList = (
-            <ul
-              aria-label={"error list"}
-              style={{
-                margin: "5px 0",
-                paddingLeft: "20px",
-                listStyleType: "disc", // Explicitly set to use bullets (dots)
-              }}
-            >
-              {item.errors.map((error, i) => (
-                <li key={i} style={{ display: "list-item" }}>
-                  {error}
-                </li>
-              ))}
-            </ul>
-          );
-
-          return (
-            <TooltipHost
-              content={errorList}
-              id={`tooltip-${index}-${column.key}`}
-              directionalHint={DirectionalHint.bottomAutoEdge}
-            >
-              <FontIcon iconName="Error" className={classNames.error} aria-label="error" />
-            </TooltipHost>
-          );
-        } else if (item.numThrottled) {
-          return <FontIcon iconName="Warning" className={classNames.warning} aria-label="warning" />;
-        } else {
-          return <FontIcon iconName="Accept" className={classNames.accept} aria-label="accept" />;
-        }
-      },
-    },
     {
       key: "fileName",
       name: "FILE NAME",
       fieldName: "fileName",
-      minWidth: 120,
+      minWidth: 140,
       maxWidth: 140,
-      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
-        const fieldContent = item.fileName;
-        return (
-          <TooltipHost
-            content={fieldContent}
-            id={`tooltip-${index}-${column.key}`}
-            directionalHint={DirectionalHint.bottomAutoEdge}
-          >
-            {fieldContent}
-          </TooltipHost>
-        );
-      },
     },
     {
       key: "status",
       name: "STATUS",
       fieldName: "numSucceeded",
-      minWidth: 120,
+      minWidth: 140,
       maxWidth: 140,
       isRowHeader: true,
       isResizable: true,
       data: "string",
       isPadded: true,
-      onRender: (item: UploadDetailsRecord, index: number, column: IColumn) => {
-        const fieldContent = `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
-        return (
-          <TooltipHost
-            content={fieldContent}
-            id={`tooltip-${index}-${column.key}`}
-            directionalHint={DirectionalHint.bottomAutoEdge}
-          >
-            {fieldContent}
-          </TooltipHost>
-        );
-      },
     },
   ];
 
+  const _renderItemColumn = (item: UploadDetailsRecord, index: number, column: IColumn) => {
+    let fieldContent: string;
+    const tooltipId = `tooltip-${index}-${column.key}`;
+
+    switch (column.key) {
+      case "status":
+        fieldContent = `${item.numSucceeded} created, ${item.numThrottled} throttled, ${item.numFailed} errors`;
+        break;
+      default:
+        fieldContent = item.fileName;
+    }
+    return (
+      <TooltipHost content={fieldContent} id={tooltipId} directionalHint={DirectionalHint.rightCenter}>
+        {fieldContent}
+      </TooltipHost>
+    );
+  };
+
   return (
     <RightPaneForm {...props}>
       <div className="paneMainContent">
@@ -205,6 +115,7 @@ export const UploadItemsPane: FunctionComponent<UploadItemsPaneProps> = ({ onUpl
             <DetailsList
               items={uploadFileData}
               columns={columns}
+              onRenderItemColumn={_renderItemColumn}
               selectionMode={SelectionMode.none}
               layoutMode={DetailsListLayoutMode.justified}
               isHeaderVisible={true}

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">