Fix merge conflicts

.eslintignore

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

.github/workflows/ci.yml

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

.github/workflows/cleanup.yml

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

.npmrc

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

configs/mpac.json

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

configs/prod.json

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

images/AzureOpenAi.svg

@@ -1 +0,0 @@
-<svg id="uuid-adbdae8e-5a41-46d1-8c18-aa73cdbfee32" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><path d="m0,2.7v12.6c0,1.491,1.209,2.7,2.7,2.7h12.6c1.491,0,2.7-1.209,2.7-2.7V2.7c0-1.491-1.209-2.7-2.7-2.7H2.7C1.209,0,0,1.209,0,2.7ZM10.8,0v3.6c0,3.976,3.224,7.2,7.2,7.2h-3.6c-3.976,0-7.199,3.222-7.2,7.198v-3.598c0-3.976-3.224-7.2-7.2-7.2h3.6c3.976,0,7.2-3.224,7.2-7.2Z" fill="#000000" stroke-width="0" /></svg>

images/github-black-and-white.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 0C8.73438 0 9.44271 0.0960961 10.125 0.288288C10.8073 0.48048 11.4427 0.758091 12.0312 1.12112C12.6198 1.48415 13.1589 1.91124 13.6484 2.4024C14.138 2.89356 14.5573 3.44611 14.9062 4.06006C15.2552 4.67401 15.5234 5.32799 15.7109 6.02202C15.8984 6.71605 15.9948 7.44211 16 8.2002C16 9.08108 15.8698 9.92993 15.6094 10.7467C15.349 11.5636 14.9766 12.3136 14.4922 12.997C14.0078 13.6803 13.4323 14.2783 12.7656 14.7908C12.099 15.3033 11.3542 15.701 10.5312 15.984C10.5156 15.9893 10.4922 15.992 10.4609 15.992C10.4297 15.992 10.4062 15.9947 10.3906 16C10.2656 16 10.1667 15.9626 10.0938 15.8879C10.0208 15.8131 9.98438 15.7144 9.98438 15.5916V14.4705C9.98438 14.1021 9.98698 13.7257 9.99219 13.3413C9.99219 13.0691 9.95312 12.7941 9.875 12.5165C9.79688 12.2389 9.65625 12.0067 9.45312 11.8198C10.0573 11.7504 10.5859 11.625 11.0391 11.4434C11.4922 11.2619 11.8724 11.0057 12.1797 10.6747C12.487 10.3437 12.7161 9.94328 12.8672 9.47347C13.0182 9.00367 13.0964 8.43777 13.1016 7.77578C13.1016 7.35936 13.0339 6.96697 12.8984 6.5986C12.763 6.23023 12.5573 5.88856 12.2812 5.57357C12.3385 5.42409 12.3802 5.26927 12.4062 5.10911C12.4323 4.94895 12.4453 4.78879 12.4453 4.62863C12.4453 4.42042 12.4245 4.21488 12.3828 4.01201C12.3411 3.80914 12.2812 3.60627 12.2031 3.4034C12.1771 3.39273 12.1484 3.38739 12.1172 3.38739C12.0859 3.38739 12.0573 3.38739 12.0312 3.38739C11.8646 3.38739 11.6901 3.41408 11.5078 3.46747C11.3255 3.52085 11.1458 3.59026 10.9688 3.67568C10.7917 3.76109 10.6172 3.85452 10.4453 3.95596C10.2734 4.05739 10.125 4.15349 10 4.24424C9.34896 4.05739 8.68229 3.96396 8 3.96396C7.31771 3.96396 6.65104 4.05739 6 4.24424C5.86979 4.15349 5.72135 4.05739 5.55469 3.95596C5.38802 3.85452 5.21615 3.76376 5.03906 3.68368C4.86198 3.6036 4.67969 3.5342 4.49219 3.47548C4.30469 3.41675 4.13021 3.38739 3.96875 3.38739H3.88281C3.85156 3.38739 3.82292 3.39273 3.79688 3.4034C3.72396 3.60093 3.66667 3.80113 3.625 4.004C3.58333 4.20687 3.5599 4.41508 3.55469 4.62863C3.55469 4.78879 3.56771 4.94895 3.59375 5.10911C3.61979 5.26927 3.66146 5.42409 3.71875 5.57357C3.44271 5.88322 3.23698 6.22222 3.10156 6.59059C2.96615 6.95896 2.89844 7.35402 2.89844 7.77578C2.89844 8.42709 2.97396 8.99032 3.125 9.46547C3.27604 9.94061 3.50521 10.341 3.8125 10.6667C4.11979 10.9923 4.5 11.2513 4.95312 11.4434C5.40625 11.6356 5.9349 11.7638 6.53906 11.8278C6.38802 11.9666 6.27344 12.1321 6.19531 12.3243C6.11719 12.5165 6.0625 12.7167 6.03125 12.9249C5.89062 12.9943 5.74219 13.0477 5.58594 13.0851C5.42969 13.1225 5.27344 13.1411 5.11719 13.1411C4.78385 13.1411 4.50781 13.0611 4.28906 12.9009C4.07031 12.7407 3.875 12.5219 3.70312 12.2442C3.64062 12.1428 3.5651 12.0414 3.47656 11.9399C3.38802 11.8385 3.29167 11.7477 3.1875 11.6677C3.08333 11.5876 2.97135 11.5235 2.85156 11.4755C2.73177 11.4274 2.60677 11.4007 2.47656 11.3954H2.38281C2.34115 11.3954 2.30208 11.4034 2.26562 11.4194C2.22917 11.4354 2.19271 11.4515 2.15625 11.4675C2.11979 11.4835 2.10417 11.5102 2.10938 11.5475C2.10938 11.6116 2.14583 11.673 2.21875 11.7317C2.29167 11.7905 2.35156 11.8385 2.39844 11.8759L2.42188 11.8919C2.53646 11.9826 2.63542 12.0681 2.71875 12.1481C2.80208 12.2282 2.88021 12.3163 2.95312 12.4124C3.02604 12.5085 3.08594 12.6099 3.13281 12.7167C3.17969 12.8235 3.23958 12.9489 3.3125 13.0931C3.48958 13.5095 3.73698 13.8111 4.05469 13.998C4.3724 14.1849 4.75521 14.2809 5.20312 14.2863C5.33854 14.2863 5.47396 14.2783 5.60938 14.2623C5.74479 14.2462 5.88021 14.2222 6.01562 14.1902V15.5836C6.01562 15.7117 5.97917 15.8131 5.90625 15.8879C5.83333 15.9626 5.73177 16 5.60156 16H5.53906C5.51302 16 5.48958 15.9947 5.46875 15.984C4.65104 15.7117 3.90625 15.3193 3.23438 14.8068C2.5625 14.2943 1.98698 13.6937 1.50781 13.005C1.02865 12.3163 0.658854 11.5636 0.398438 10.7467C0.138021 9.92993 0.00520833 9.08108 0 8.2002C0 7.44745 0.09375 6.72139 0.28125 6.02202C0.46875 5.32266 0.739583 4.67134 1.09375 4.06807C1.44792 3.4648 1.86458 2.91225 2.34375 2.41041C2.82292 1.90858 3.36198 1.47881 3.96094 1.12112C4.5599 0.76343 5.19792 0.488488 5.875 0.296296C6.55208 0.104104 7.26042 0.00533867 8 0Z" fill="#000000"/>
-</svg>

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

@@ -2869,7 +2869,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.5.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",
@@ -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,25 +377,23 @@
       "license": "0BSD"
     },
     "node_modules/@azure/cosmos": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.5.0.tgz",
-      "integrity": "sha512-JsTh4twb6FcwP7rJwxQiNZQ/LGtuF6gmciaxY9Rnp6/A325Lhsw/SH4R2ArpT0yCvozbZpweIwdPfUkXVBtp5w==",
-      "license": "MIT",
+      "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.1.2",
-        "@azure/core-auth": "^1.9.0",
-        "@azure/core-rest-pipeline": "^1.19.1",
-        "@azure/core-tracing": "^1.2.0",
-        "@azure/core-util": "^1.11.0",
-        "@azure/keyvault-keys": "^4.9.0",
-        "@azure/logger": "^1.1.4",
+        "@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",
         "fast-json-stable-stringify": "^2.1.0",
+        "jsbi": "^4.3.0",
         "priorityqueuejs": "^2.0.0",
         "semaphore": "^1.1.0",
-        "tslib": "^2.8.1"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@azure/cosmos-language-service": {
@@ -439,9 +423,8 @@
       }
     },
     "node_modules/@azure/cosmos/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=="
+      "version": "2.6.2",
+      "license": "0BSD"
     },
     "node_modules/@azure/identity": {
       "version": "4.5.0",
@@ -507,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": {
@@ -13141,56 +13072,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"
@@ -13359,19 +13240,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"
@@ -27180,6 +27048,11 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbi": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-4.3.0.tgz",
+      "integrity": "sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g=="
+    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "license": "MIT"

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.5.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",

preview/.azure/config

@@ -1,6 +1,6 @@
 [defaults]
 group = dataexplorer-preview
-sku = P1v2
+sku = P1V2
 appserviceplan = dataexplorer-preview
 location = westus2
 web = dataexplorer-preview

preview/package.json

@@ -4,18 +4,16 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "deploy": "az webapp up --name \"dataexplorer-preview\" --subscription \"cosmosdb-portalteam-runners\" --resource-group \"dataexplorer-preview\" --runtime \"NODE:20-lts\" --sku P1V2",
+    "deploy": "az webapp up --name \"dataexplorer-preview\" --subscription \"cosmosdb-portalteam-runners\" --resource-group \"dataexplorer-preview\" --runtime \"NODE:18-lts\" --sku P1V2",
     "start": "node index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
   "author": "Microsoft Corporation",
   "dependencies": {
-    "body-parser": "^1.20.3",
-    "express": "^4.21.2",
+    "express": "^4.17.1",
     "http-proxy-middleware": "^3.0.3",
-    "node": "^20.19.5",
-    "node-fetch": "^2.6.1",
-    "path-to-regexp": "^0.1.12"
+    "node": "^18.20.6",
+    "node-fetch": "^2.6.1"
   }
 }

src/Common/Constants.ts

@@ -138,12 +138,13 @@ export enum MongoBackendEndpointType {
   remote,
 }
 
-export class AadScopeEndpoints {
-  public static readonly Development: string = "https://cosmos.azure.com";
-  public static readonly MPAC: string = "https://cosmos.azure.com";
-  public static readonly Prod: string = "https://cosmos.azure.com";
-  public static readonly Fairfax: string = "https://cosmos.azure.us";
-  public static readonly Mooncake: string = "https://cosmos.azure.cn";
+export class BackendApi {
+  public static readonly GenerateToken: string = "GenerateToken";
+  public static readonly PortalSettings: string = "PortalSettings";
+  public static readonly AccountRestrictions: string = "AccountRestrictions";
+  public static readonly RuntimeProxy: string = "RuntimeProxy";
+  public static readonly DisallowedLocations: string = "DisallowedLocations";
+  public static readonly SampleData: string = "SampleData";
 }
 
 export class PortalBackendEndpoints {
@@ -256,14 +257,12 @@ 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 {
   public static activityId: string = "x-ms-activity-id";
   public static apiType: string = "x-ms-cosmos-apitype";
   public static authorization: string = "authorization";
-  public static entraIdToken: string = "x-ms-entraid-token";
   public static collectionIndexTransformationProgress: string =
     "x-ms-documentdb-collection-index-transformation-progress";
   public static continuation: string = "x-ms-continuation";
@@ -774,10 +773,3 @@ export const ShortenedQueryCopilotSampleContainerSchema = {
 
   userPrompt: "find all products",
 };
-
-export enum MongoGuidRepresentation {
-  Standard = "Standard",
-  CSharpLegacy = "CSharpLegacy",
-  JavaLegacy = "JavaLegacy",
-  PythonLegacy = "PythonLegacy",
-}

src/Common/CosmosClient.ts

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

src/Common/EnvironmentUtility.test.ts

@@ -28,39 +28,3 @@ describe("Environment Utility Test", () => {
     expect(EnvironmentUtility.getEnvironment()).toBe(EnvironmentUtility.Environment.Development);
   });
 });
-describe("normalizeArmEndpoint", () => {
-  it("should append '/' if not present", () => {
-    expect(EnvironmentUtility.normalizeArmEndpoint("https://example.com")).toBe("https://example.com/");
-  });
-
-  it("should return the same uri if '/' is present at the end", () => {
-    expect(EnvironmentUtility.normalizeArmEndpoint("https://example.com/")).toBe("https://example.com/");
-  });
-
-  it("should handle empty string", () => {
-    expect(EnvironmentUtility.normalizeArmEndpoint("")).toBe("");
-  });
-});
-
-describe("getEnvironment", () => {
-  it("should return Prod environment", () => {
-    updateConfigContext({
-      PORTAL_BACKEND_ENDPOINT: PortalBackendEndpoints.Prod,
-    });
-    expect(EnvironmentUtility.getEnvironment()).toBe(EnvironmentUtility.Environment.Prod);
-  });
-
-  it("should return Fairfax environment", () => {
-    updateConfigContext({
-      PORTAL_BACKEND_ENDPOINT: PortalBackendEndpoints.Fairfax,
-    });
-    expect(EnvironmentUtility.getEnvironment()).toBe(EnvironmentUtility.Environment.Fairfax);
-  });
-
-  it("should return Mooncake environment", () => {
-    updateConfigContext({
-      PORTAL_BACKEND_ENDPOINT: PortalBackendEndpoints.Mooncake,
-    });
-    expect(EnvironmentUtility.getEnvironment()).toBe(EnvironmentUtility.Environment.Mooncake);
-  });
-});

src/Common/EnvironmentUtility.ts

@@ -1,5 +1,4 @@
-import { AadScopeEndpoints, PortalBackendEndpoints } from "Common/Constants";
-import * as Logger from "Common/Logger";
+import { PortalBackendEndpoints } from "Common/Constants";
 import { configContext } from "ConfigContext";
 
 export function normalizeArmEndpoint(uri: string): string {
@@ -28,17 +27,3 @@ export const getEnvironment = (): Environment => {
 
   return environmentMap[configContext.PORTAL_BACKEND_ENDPOINT];
 };
-
-export const getEnvironmentScopeEndpoint = (): string => {
-  const environment = getEnvironment();
-  const endpoint = AadScopeEndpoints[environment];
-  if (!endpoint) {
-    throw new Error("Cannot determine AAD scope endpoint");
-  }
-  const hrefEndpoint = new URL(endpoint).href.replace(/\/+$/, "/.default");
-  Logger.logInfo(
-    `Using AAD scope endpoint: ${hrefEndpoint}, Environment: ${environment}`,
-    "EnvironmentUtility/getEnvironmentScopeEndpoint",
-  );
-  return hrefEndpoint;
-};

src/Common/IteratorUtilities.ts

@@ -1,3 +1,4 @@
+import { QueryOperationOptions } from "@azure/cosmos";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import * as Constants from "../Common/Constants";
 import { QueryResults } from "../Contracts/ViewModels";
@@ -13,14 +14,18 @@ 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> {
+export function nextPage(
+  documentsIterator: MinimalQueryIterator,
+  firstItemIndex: number,
+  queryOperationOptions?: QueryOperationOptions,
+): Promise<QueryResults> {
   TelemetryProcessor.traceStart(Action.ExecuteQuery);
-  return documentsIterator.fetchNext().then((response) => {
+  return documentsIterator.fetchNext(queryOperationOptions).then((response) => {
     TelemetryProcessor.traceSuccess(Action.ExecuteQuery, { dataExplorerArea: Constants.Areas.Tab });
     const documents = response.resources;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/Common/MongoProxyClient.test.ts

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

src/Common/MongoProxyClient.ts

@@ -1,5 +1,4 @@
 import { Constants as CosmosSDKConstants } from "@azure/cosmos";
-import { getMongoGuidRepresentation } from "Shared/StorageUtility";
 import { AuthType } from "../AuthType";
 import { configContext } from "../ConfigContext";
 import * as DataModels from "../Contracts/DataModels";
@@ -7,7 +6,6 @@ import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { Collection } from "../Contracts/ViewModels";
 import DocumentId from "../Explorer/Tree/DocumentId";
 import { userContext } from "../UserContext";
-import { isDataplaneRbacEnabledForProxyApi } from "../Utils/AuthorizationUtils";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
 import { ApiType, ContentType, HttpHeaders, HttpStatusCodes } from "./Constants";
 import { MinimalQueryIterator } from "./IteratorUtilities";
@@ -23,13 +21,7 @@ function authHeaders() {
   if (userContext.authType === AuthType.EncryptedToken) {
     return { [HttpHeaders.guestAccessToken]: userContext.accessToken };
   } else {
-    const headers: { [key: string]: string } = {
-      [HttpHeaders.authorization]: userContext.authorizationToken,
-    };
-    if (isDataplaneRbacEnabledForProxyApi(userContext)) {
-      headers[HttpHeaders.entraIdToken] = userContext.aadToken;
-    }
-    return headers;
+    return { [HttpHeaders.authorization]: userContext.authorizationToken };
   }
 }
 
@@ -147,9 +139,6 @@ export function readDocument(
       documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
         ? documentId.partitionKeyProperties?.[0]
         : "",
-    clientSettings: {
-      guidRepresentation: getMongoGuidRepresentation(),
-    },
   };
 
   const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
@@ -192,9 +181,6 @@ export function createDocument(
     partitionKey:
       collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : "",
     documentContent: JSON.stringify(documentContent),
-    clientSettings: {
-      guidRepresentation: getMongoGuidRepresentation(),
-    },
   };
 
   const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
@@ -242,9 +228,6 @@ export function updateDocument(
         ? documentId.partitionKeyProperties?.[0]
         : "",
     documentContent,
-    clientSettings: {
-      guidRepresentation: getMongoGuidRepresentation(),
-    },
   };
   const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
 
@@ -291,9 +274,6 @@ export function deleteDocuments(
     subscriptionID: userContext.subscriptionId,
     resourceGroup: userContext.resourceGroup,
     databaseAccountName: databaseAccount.name,
-    clientSettings: {
-      guidRepresentation: getMongoGuidRepresentation(),
-    },
   };
   const endpoint = getEndpoint(configContext.MONGO_PROXY_ENDPOINT);
 

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

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

src/Common/dataAccess/createCollection.ts

@@ -1,6 +1,4 @@
 import { ContainerRequest, ContainerResponse, DatabaseRequest, DatabaseResponse, RequestOptions } from "@azure/cosmos";
-import { sendMessage } from "Common/MessageHandler";
-import { FabricMessageTypes } from "Contracts/FabricMessageTypes";
 import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
@@ -45,14 +43,6 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
     }
 
     logConsoleInfo(`Successfully created container ${params.collectionId}`);
-
-    if (isFabricNative()) {
-      sendMessage({
-        type: FabricMessageTypes.ContainerUpdated,
-        params: { updateType: "created" },
-      });
-    }
-
     return collection;
   } catch (error) {
     handleError(error, "CreateCollection", `Error while creating container ${params.collectionId}`);

src/Common/dataAccess/deleteCollection.ts

@@ -1,5 +1,3 @@
-import { sendMessage } from "Common/MessageHandler";
-import { FabricMessageTypes } from "Contracts/FabricMessageTypes";
 import { isFabric } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { userContext } from "../../UserContext";
@@ -21,11 +19,6 @@ export async function deleteCollection(databaseId: string, collectionId: string)
       await client().database(databaseId).container(collectionId).delete();
     }
     logConsoleInfo(`Successfully deleted container ${collectionId}`);
-
-    sendMessage({
-      type: FabricMessageTypes.ContainerUpdated,
-      params: { updateType: "deleted" },
-    });
   } catch (error) {
     handleError(error, "DeleteCollection", `Error while deleting container ${collectionId}`);
     throw error;

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/getCollectionDataUsageSize.ts

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

src/Common/dataAccess/queryDocuments.ts

@@ -1,4 +1,5 @@
 import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { LocalStorageUtility, StorageKey } from "../../Shared/StorageUtility";
 import { Queries } from "../Constants";
 import { client } from "../CosmosClient";
@@ -25,7 +26,7 @@ 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/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/Common/dataAccess/updateDocument.ts

@@ -1,6 +1,5 @@
 import { Item, RequestOptions } from "@azure/cosmos";
 import { HttpHeaders } from "Common/Constants";
-import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { CollectionBase } from "../../Contracts/ViewModels";
 import DocumentId from "../../Explorer/Tree/DocumentId";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
@@ -24,17 +23,10 @@ export const updateDocument = async (
             [HttpHeaders.partitionKey]: documentId.partitionKeyValue,
           }
         : {};
-
-    // If user has chosen to ignore partition key on update, pass null instead of actual partition key value
-    const ignorePartitionKeyOnDocumentUpdateFlag = LocalStorageUtility.getEntryBoolean(
-      StorageKey.IgnorePartitionKeyOnDocumentUpdate,
-    );
-    const partitionKey = ignorePartitionKeyOnDocumentUpdateFlag ? undefined : getPartitionKeyValue(documentId);
-
     const response = await client()
       .database(collection.databaseId)
       .container(collection.id())
-      .item(documentId.id(), partitionKey)
+      .item(documentId.id(), getPartitionKeyValue(documentId))
       .replace(newDocument, options);
 
     logConsoleInfo(`Successfully updated ${entityName} ${documentId.id()}`);

src/ConfigContext.ts

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

src/Contracts/ActionContracts.ts

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

src/Contracts/DataExplorerMessagesContract.ts

@@ -1,5 +1,4 @@
 import { FabricMessageTypes } from "./FabricMessageTypes";
-import { MessageTypes } from "./MessageTypes";
 
 // This is the current version of these messages
 export const DATA_EXPLORER_RPC_VERSION = "3";
@@ -20,32 +19,9 @@ export type DataExploreMessageV3 =
       type: FabricMessageTypes.GetAllResourceTokens;
       id: string;
     }
-  | {
-      type: FabricMessageTypes.GetAccessToken;
-      id: string;
-    }
-  | {
-      type: MessageTypes.TelemetryInfo;
-      data: {
-        action: string;
-        actionModifier: string;
-        data: unknown;
-        timestamp: number;
-      };
-    }
   | {
       type: FabricMessageTypes.OpenSettings;
-      params: [{ settingsId?: "About" | "Connection" }];
-    }
-  | {
-      type: FabricMessageTypes.RestoreContainer;
-      params: [];
-    }
-  | {
-      type: FabricMessageTypes.ContainerUpdated;
-      params: {
-        updateType: "created" | "deleted" | "settings";
-      };
+      settingsId: string;
     };
 export interface GetCosmosTokenMessageOptions {
   verb: "connect" | "delete" | "get" | "head" | "options" | "patch" | "post" | "put" | "trace";

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" | "float16" | "uint8" | "int8";
+  dataType: "float16" | "float32" | "uint8" | "int8";
   dimensions: number;
   distanceFunction: "euclidean" | "cosine" | "dotproduct";
   path: string;

src/Contracts/FabricMessageTypes.ts

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

src/Contracts/ViewModels.ts

@@ -1,5 +1,4 @@
 import {
-  ItemDefinition,
   JSONObject,
   QueryMetrics,
   Resource,
@@ -31,11 +30,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 +46,6 @@ export interface QueryResults extends QueryResultsMetadata {
   roundTrips?: number;
   headers?: any;
   queryMetrics?: QueryMetrics;
-  ruThresholdExceeded?: boolean;
 }
 
 export interface Button {
@@ -443,7 +438,6 @@ export interface DataExplorerInputsFrame {
     [key: string]: string;
   };
   feedbackPolicies?: any;
-  aadToken?: string;
 }
 
 export interface SelfServeFrameInputs {

src/Controls/Heatmap/Heatmap.html

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

src/Controls/Heatmap/Heatmap.less

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

src/Controls/Heatmap/Heatmap.test.ts

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

src/Controls/Heatmap/Heatmap.ts

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

src/Controls/Heatmap/HeatmapDatatypes.ts

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

src/Explorer/ContextMenuButtonFactory.tsx

@@ -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: () => {

src/Explorer/Controls/FullTextSeach/FullTextPoliciesComponent.tsx

@@ -22,7 +22,6 @@ export interface FullTextPoliciesComponentProps {
   ) => void;
   discardChanges?: boolean;
   onChangesDiscarded?: () => void;
-  englishOnly?: boolean;
 }
 
 export interface FullTextPolicyData {
@@ -67,7 +66,6 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
   onFullTextPathChange,
   discardChanges,
   onChangesDiscarded,
-  englishOnly,
 }): JSX.Element => {
   const getFullTextPathError = (path: string, index?: number): string => {
     let error = "";
@@ -89,7 +87,6 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
     if (!fullTextPolicy) {
       fullTextPolicy = { defaultLanguage: getFullTextLanguageOptions()[0].key as never, fullTextPaths: [] };
     }
-
     return fullTextPolicy.fullTextPaths.map((fullTextPath: FullTextPath) => ({
       ...fullTextPath,
       pathError: getFullTextPathError(fullTextPath.path),
@@ -169,7 +166,7 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
         <Dropdown
           required={true}
           styles={dropdownStyles}
-          options={getFullTextLanguageOptions(englishOnly)}
+          options={getFullTextLanguageOptions()}
           selectedKey={defaultLanguage}
           onChange={(_event: React.FormEvent<HTMLDivElement>, option: IDropdownOption) =>
             setDefaultLanguage(option.key as never)
@@ -214,7 +211,7 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
                   <Dropdown
                     required={true}
                     styles={dropdownStyles}
-                    options={getFullTextLanguageOptions(englishOnly)}
+                    options={getFullTextLanguageOptions()}
                     selectedKey={fullTextPolicy.language}
                     onChange={(_event: React.FormEvent<HTMLDivElement>, option: IDropdownOption) =>
                       onFullTextPathPolicyChange(index, option)
@@ -232,25 +229,11 @@ export const FullTextPoliciesComponent: React.FunctionComponent<FullTextPolicies
   );
 };
 
-export const getFullTextLanguageOptions = (englishOnly?: boolean): IDropdownOption[] => {
-  const fullTextLanguageOptions: IDropdownOption[] = [
+export const getFullTextLanguageOptions = (): IDropdownOption[] => {
+  return [
     {
       key: "en-US",
       text: "English (US)",
     },
-    {
-      key: "fr-FR",
-      text: "French",
-    },
-    {
-      key: "de-DE",
-      text: "German",
-    },
-    {
-      key: "es-ES",
-      text: "Spanish",
-    },
   ];
-
-  return englishOnly ? [fullTextLanguageOptions[0]] : fullTextLanguageOptions;
 };

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

@@ -1,6 +1,4 @@
 import { IPivotItemProps, IPivotProps, Pivot, PivotItem } from "@fluentui/react";
-import { sendMessage } from "Common/MessageHandler";
-import { FabricMessageTypes } from "Contracts/FabricMessageTypes";
 import {
   ComputedPropertiesComponent,
   ComputedPropertiesComponentProps,
@@ -15,7 +13,7 @@ import {
 } 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";
@@ -190,10 +188,13 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.isGlobalSecondaryIndex =
         !!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 =
@@ -433,15 +434,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       );
     } finally {
       this.props.settingsTab.isExecuting(false);
-
-      // Send message to Fabric no matter success or failure.
-      // In case of failure, saveCollectionSettings might have partially succeeded and Fabric needs to refresh
-      if (isFabricNative() && this.isCollectionSettingsTab) {
-        sendMessage({
-          type: FabricMessageTypes.ContainerUpdated,
-          params: { updateType: "settings" },
-        });
-      }
     }
   };
 
@@ -1082,11 +1074,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,
       });
@@ -1102,7 +1094,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) {
@@ -1224,7 +1215,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 = {
@@ -1353,7 +1343,7 @@ 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} />,

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/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.tsx

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

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

@@ -157,148 +157,35 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
           }
         }
       >
-        <Stack
-          horizontal={true}
-          tokens={
+        <StyledTextFieldBase
+          disabled={true}
+          id="autopilotInput"
+          key="auto pilot throughput input"
+          label="Maximum RU/s required by this resource"
+          min={1000}
+          onChange={[Function]}
+          onGetErrorMessage={[Function]}
+          required={true}
+          step={1000}
+          styles={
             {
-              "childrenGap": 8,
+              "fieldGroup": {
+                "borderColor": "",
+                "height": 25,
+                "selectors": {
+                  ":disabled": {
+                    "backgroundColor": undefined,
+                    "borderColor": undefined,
+                  },
+                },
+                "width": 300,
+              },
             }
           }
-          verticalAlign="end"
-        >
-          <Stack
-            tokens={
-              {
-                "childrenGap": 4,
-              }
-            }
-          >
-            <Stack
-              horizontal={true}
-              tokens={
-                {
-                  "childrenGap": 4,
-                }
-              }
-              verticalAlign="center"
-            >
-              <Text
-                style={
-                  {
-                    "fontWeight": 600,
-                    "lineHeight": "20px",
-                  }
-                }
-                variant="small"
-              >
-                Minimum RU/s
-              </Text>
-              <FontIcon
-                iconName="Info"
-                style={
-                  {
-                    "color": "#666",
-                    "fontSize": 12,
-                  }
-                }
-              />
-            </Stack>
-            <Text
-              style={
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "transparent",
-                  "border": "none",
-                  "boxSizing": "border-box",
-                  "display": "flex",
-                  "fontFamily": "Segoe UI",
-                  "fontSize": 14,
-                  "fontWeight": 400,
-                  "height": 28,
-                  "justifyContent": "center",
-                  "width": 70,
-                }
-              }
-            >
-              400
-            </Text>
-          </Stack>
-          <Text
-            style={
-              {
-                "fontFamily": "Segoe UI",
-                "fontSize": 12,
-                "fontWeight": 400,
-                "paddingBottom": 6,
-              }
-            }
-          >
-            x 10 =
-          </Text>
-          <Stack
-            tokens={
-              {
-                "childrenGap": 4,
-              }
-            }
-          >
-            <Stack
-              horizontal={true}
-              tokens={
-                {
-                  "childrenGap": 4,
-                }
-              }
-              verticalAlign="center"
-            >
-              <Text
-                style={
-                  {
-                    "fontWeight": 600,
-                    "lineHeight": "20px",
-                  }
-                }
-                variant="small"
-              >
-                Maximum RU/s
-              </Text>
-              <FontIcon
-                iconName="Info"
-                style={
-                  {
-                    "color": "#666",
-                    "fontSize": 12,
-                  }
-                }
-              />
-            </Stack>
-            <StyledTextFieldBase
-              disabled={true}
-              id="autopilotInput"
-              key="auto pilot throughput input"
-              min={1000}
-              onChange={[Function]}
-              onGetErrorMessage={[Function]}
-              required={true}
-              step={1000}
-              styles={
-                {
-                  "field": {
-                    "fontSize": 14,
-                    "fontWeight": 400,
-                  },
-                  "fieldGroup": {
-                    "height": 28,
-                    "width": 100,
-                  },
-                }
-              }
-              type="number"
-              validateOnLoad={false}
-              value=""
-            />
-          </Stack>
-        </Stack>
+          type="number"
+          validateOnLoad={false}
+          value=""
+        />
         <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/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,18 +71,8 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -163,18 +153,8 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -198,32 +178,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 +274,8 @@ exports[`SettingsComponent renders 1`] = `
               "partitionKeyProperties": [
                 "partitionKey",
               ],
-              "rawDataModel": {
-                "uniqueKeyPolicy": {
-                  "uniqueKeys": [
-                    {
-                      "paths": [
-                        "/id",
-                      ],
-                    },
-                  ],
-                },
-              },
               "readSettings": [Function],
+              "uniqueKeyPolicy": {},
               "usageSizeInKB": [Function],
               "vectorEmbeddingPolicy": [Function],
             }
@@ -460,18 +404,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,16 +1,15 @@
-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";
 import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
-import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";
 import * as SharedConstants from "../../../Shared/Constants";
 import { userContext } from "../../../UserContext";
 import { getCollectionName } from "../../../Utils/APITypeUtils";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import * as PricingUtils from "../../../Utils/PricingUtils";
+import { CostEstimateText } from "./CostEstimateText/CostEstimateText";
 import "./ThroughputInput.less";
 
 export interface ThroughputInputProps {
@@ -41,9 +40,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   let defaultThroughput: number;
   const workloadType: Constants.WorkloadType = getWorkloadType();
 
-  if (isFabricNative()) {
-    defaultThroughput = AutoPilotUtils.autoPilotThroughput5K;
-  } else if (
+  if (
     isFreeTier ||
     isQuickstart ||
     [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType)
@@ -233,92 +230,53 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
           </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>
       )}
 
@@ -342,6 +300,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
             </Text>
             <InfoTooltip>{getAutoScaleTooltip()}</InfoTooltip>
           </Stack>
+
           <TooltipHost
             directionalHint={DirectionalHint.topLeftEdge}
             content={
@@ -366,10 +325,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/Controls/VectorSearch/VectorSearchUtils.ts

@@ -1,6 +1,6 @@
 import { IDropdownOption } from "@fluentui/react";
 
-const dataTypes = ["float32", "float16", "uint8", "int8"];
+const dataTypes = ["float32", "uint8", "int8"];
 const distanceFunctions = ["euclidean", "cosine", "dotproduct"];
 const indexTypes = ["none", "flat", "diskANN", "quantizedFlat"];
 

src/Explorer/DataSamples/ContainerSampleGenerator.ts

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

src/Explorer/Explorer.tsx

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

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

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

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

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

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

src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts

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

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

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

src/Explorer/Graph/NewVertexComponent/NewVertexComponent.less

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

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -5,7 +5,6 @@
  */
 import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
-import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane";
 import { KeyboardActionGroup, useKeyboardActionGroup } from "KeyboardShortcuts";
 import { isFabric } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
@@ -31,7 +30,7 @@ export interface CommandBarStore {
 }
 
 export const useCommandBar: UseStore<CommandBarStore> = create((set) => ({
-  contextButtons: [] as CommandButtonComponentProps[],
+  contextButtons: [],
   setContextButtons: (contextButtons: CommandButtonComponentProps[]) => set((state) => ({ ...state, contextButtons })),
   isHidden: false,
   setIsHidden: (isHidden: boolean) => set((state) => ({ ...state, isHidden })),
@@ -44,15 +43,6 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
   const backgroundColor = StyleConstants.BaseLight;
   const setKeyboardHandlers = useKeyboardActionGroup(KeyboardActionGroup.COMMAND_BAR);
 
-  // Subscribe to the store changes that affect button creation
-  const dataPlaneRbacEnabled = useDataPlaneRbac((state) => state.dataPlaneRbacEnabled);
-  const aadTokenUpdated = useDataPlaneRbac((state) => state.aadTokenUpdated);
-
-  // Memoize the expensive button creation
-  const staticButtons = React.useMemo(() => {
-    return CommandBarComponentButtonFactory.createStaticCommandBarButtons(container, selectedNodeState);
-  }, [container, selectedNodeState, dataPlaneRbacEnabled, aadTokenUpdated]);
-
   if (userContext.apiType === "Postgres" || userContext.apiType === "VCoreMongo") {
     const buttons =
       userContext.apiType === "Postgres"
@@ -72,6 +62,7 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
     );
   }
 
+  const staticButtons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(container, selectedNodeState);
   const contextButtons = (buttons || []).concat(
     CommandBarComponentButtonFactory.createContextCommandBarButtons(container, selectedNodeState),
   );

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -1,6 +1,7 @@
 import { KeyboardAction } from "KeyboardShortcuts";
 import { isDataplaneRbacSupported } from "Utils/APITypeUtils";
 import * as React from "react";
+import { useEffect, useState } from "react";
 import AddSqlQueryIcon from "../../../../images/AddSqlQuery_16x16.svg";
 import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
 import AddTriggerIcon from "../../../../images/AddTrigger.svg";
@@ -13,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";
@@ -60,14 +60,18 @@ export function createStaticCommandBarButtons(
       addDivider();
       buttons.push(addSynapseLink);
     }
-    if (userContext.apiType !== "Gremlin") {
-      const addVsCode = createOpenVsCodeDialogButton(container);
-      buttons.push(addVsCode);
-    }
   }
 
   if (isDataplaneRbacSupported(userContext.apiType)) {
-    const loginButtonProps = createLoginForEntraIDButton(container);
+    const [loginButtonProps, setLoginButtonProps] = useState<CommandButtonComponentProps | undefined>(undefined);
+    const dataPlaneRbacEnabled = useDataPlaneRbac((state) => state.dataPlaneRbacEnabled);
+    const aadTokenUpdated = useDataPlaneRbac((state) => state.aadTokenUpdated);
+
+    useEffect(() => {
+      const buttonProps = createLoginForEntraIDButton(container);
+      setLoginButtonProps(buttonProps);
+    }, [dataPlaneRbacEnabled, aadTokenUpdated, container]);
+
     if (loginButtonProps) {
       addDivider();
       buttons.push(loginButtonProps);
@@ -122,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();
@@ -143,7 +146,7 @@ export function createContextCommandBarButtons(
   }
 
   if (
-    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
+    useNotebook.getState().isShellEnabled &&
     !selectedNodeState.isDatabaseNodeOrNoneSelected() &&
     userContext.apiType === "Cassandra"
   ) {
@@ -264,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;
@@ -464,7 +455,7 @@ function createOpenTerminalButtonByKind(
     iconSrc: HostedTerminalIcon,
     iconAlt: label,
     onCommandClick: () => {
-      if (useNotebook.getState().isNotebookEnabled || userContext.features.enableCloudShell) {
+      if (useNotebook.getState().isNotebookEnabled) {
         container.openNotebookTerminal(terminalKind);
       }
     },
@@ -508,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/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,
@@ -42,14 +42,19 @@ import {
 } from "Explorer/Panes/AddCollectionPanel/AddCollectionPanelUtility";
 import { useSidePanel } from "hooks/useSidePanel";
 import { useTeachingBubble } from "hooks/useTeachingBubble";
-import { DEFAULT_FABRIC_NATIVE_CONTAINER_THROUGHPUT, isFabricNative } from "Platform/Fabric/FabricUtil";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import React 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 { 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";
@@ -105,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);
@@ -122,7 +126,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       isSharded: userContext.apiType !== "Tables",
       partitionKey: getPartitionKey(props.isQuickstart),
       subPartitionKeys: [],
-      enableDedicatedThroughput: isFabricNative(), // Dedicated throughput is only enabled in Fabric Native by default
+      enableDedicatedThroughput: false,
       createMongoWildCardIndex:
         isCapabilityEnabled("EnableMongo") && !isCapabilityEnabled("EnableMongo16MBDocumentSupport"),
       useHashV1: false,
@@ -140,8 +144,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       fullTextIndexes: [],
       fullTextPolicyValidated: true,
     };
-
-    this.showFullTextSearch = userContext.apiType === "SQL";
   }
 
   componentDidMount(): void {
@@ -264,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">
@@ -335,6 +337,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     size={40}
                     className="panelTextField"
                     aria-label="New database id, Type a new database id"
+                    autoFocus
                     tabIndex={0}
                     value={this.state.newDatabaseId}
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
@@ -405,12 +408,12 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                   responsiveMode={999}
                 />
               )}
-              <Separator className="panelSeparator" style={{ marginTop: -4, marginBottom: -4 }} />
+              <Separator className="panelSeparator" />
             </Stack>
           )}
 
           <Stack>
-            <Stack horizontal style={{ marginTop: -5, marginBottom: 1 }}>
+            <Stack horizontal>
               <span className="mandatoryStar">*&nbsp;</span>
               <Text className="panelTextBold" variant="small">
                 {`${getCollectionName()} id`}
@@ -447,12 +450,11 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                 this.setState({ collectionId: event.target.value })
               }
             />
-            <Separator className="panelSeparator" style={{ marginTop: -5, marginBottom: -5 }} />
           </Stack>
 
           {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",
@@ -644,7 +646,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     </Stack>
                   );
                 })}
-              {userContext.apiType === "SQL" && (
+              {!isFabricNative() && userContext.apiType === "SQL" && (
                 <Stack className="panelGroupSpacing">
                   <DefaultButton
                     styles={{ root: { padding: 0, width: 200, height: 30 }, label: { fontSize: 12 } }}
@@ -666,7 +668,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                   )}
                 </Stack>
               )}
-              <Separator className="panelSeparator" style={{ marginTop: 2, marginBottom: -4 }} />
             </Stack>
           )}
 
@@ -708,7 +709,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             </Stack>
           )}
 
-          {this.shouldShowCollectionThroughputInput() && !isFabricNative() && (
+          {this.shouldShowCollectionThroughputInput() && (
             <ThroughputInput
               showFreeTierExceedThroughputTooltip={isFreeTierAccount() && !isFirstResourceCreated}
               isDatabase={false}
@@ -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,14 +777,10 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             </Stack>
           )}
 
-          {!isFabricNative() && userContext.apiType === "SQL" && (
-            <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">
@@ -823,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"
@@ -893,7 +891,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                       ) => {
                         this.setState({ fullTextPolicy, fullTextIndexes, fullTextPolicyValidated });
                       }}
-                      englishOnly={true}
                     />
                   </Stack>
                 </Stack>
@@ -1134,7 +1131,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   // }
 
   private shouldShowCollectionThroughputInput(): boolean {
-    if (isServerlessAccount()) {
+    if (isFabricNative() || isServerlessAccount()) {
       return false;
     }
 
@@ -1164,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 {
@@ -1319,7 +1316,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       };
     }
 
-    if (this.showFullTextSearch) {
+    if (this.shouldShowFullTextSearchParameters()) {
       indexingPolicy.fullTextIndexes = this.state.fullTextIndexes;
     }
 
@@ -1353,11 +1350,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
     let offerThroughput: number;
     let autoPilotMaxThroughput: number;
 
-    // Throughput
-    if (isFabricNative()) {
-      autoPilotMaxThroughput = DEFAULT_FABRIC_NATIVE_CONTAINER_THROUGHPUT;
-      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,6 +88,7 @@ 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"
@@ -144,23 +140,11 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
       </Stack>
       <Separator
         className="panelSeparator"
-        style={
-          {
-            "marginBottom": -4,
-            "marginTop": -4,
-          }
-        }
       />
     </Stack>
     <Stack>
       <Stack
         horizontal={true}
-        style={
-          {
-            "marginBottom": 1,
-            "marginTop": -5,
-          }
-        }
       >
         <span
           className="mandatoryStar"
@@ -202,25 +186,10 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
         type="text"
         value=""
       />
-      <Separator
-        className="panelSeparator"
-        style={
-          {
-            "marginBottom": -5,
-            "marginTop": -5,
-          }
-        }
-      />
     </Stack>
     <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/AddGlobalSecondaryIndexPanel/AddGlobalSecondaryIndexPanel.tsx

@@ -40,12 +40,12 @@ 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 { isFullTextSearchEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
 
 export interface AddGlobalSecondaryIndexPanelProps {
@@ -75,8 +75,6 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
   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) => {
@@ -142,6 +140,10 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
     return isVectorSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
   };
 
+  const showFullTextSearchParameters = (): boolean => {
+    return isFullTextSearchEnabled() && (isServerlessAccount() || showCollectionThroughputInput());
+  };
+
   const getAnalyticalStorageTtl = (): number => {
     if (!isSynapseLinkEnabled()) {
       return undefined;
@@ -173,6 +175,11 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
       return false;
     }
 
+    if (globalSecondaryIndexThroughput > CollectionCreation.MaxRUPerPartition) {
+      setErrorMessage("Unsharded collections support up to 10,000 RUs");
+      return false;
+    }
+
     if (showVectorSearchParameters()) {
       if (!vectorPolicyValidated) {
         setErrorMessage("Please fix errors in container vector policy");
@@ -226,7 +233,7 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
       };
     }
 
-    if (showFullTextSearch) {
+    if (showFullTextSearchParameters()) {
       indexingPolicy.fullTextIndexes = fullTextIndexes;
     }
 
@@ -381,11 +388,10 @@ export const AddGlobalSecondaryIndexPanel = (props: AddGlobalSecondaryIndexPanel
                 setVectorIndexingPolicy,
                 vectorPolicyValidated,
                 setVectorPolicyValidated,
-                isGlobalSecondaryIndex: true,
               }}
             />
           )}
-          {showFullTextSearch && (
+          {showFullTextSearchParameters() && (
             <FullTextSearchComponent
               {...{ fullTextPolicy, setFullTextPolicy, setFullTextIndexes, setFullTextPolicyValidated }}
             />

src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/ThroughputComponent.tsx

@@ -47,7 +47,7 @@ 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}

src/Explorer/Panes/AddGlobalSecondaryIndexPanel/Components/VectorSearchComponent.tsx

@@ -14,7 +14,6 @@ export interface VectorSearchComponentProps {
   vectorIndexingPolicy: VectorIndex[];
   setVectorIndexingPolicy: React.Dispatch<React.SetStateAction<VectorIndex[]>>;
   setVectorPolicyValidated: React.Dispatch<React.SetStateAction<boolean>>;
-  isGlobalSecondaryIndex?: boolean;
 }
 
 export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.Element => {
@@ -24,7 +23,6 @@ export const VectorSearchComponent = (props: VectorSearchComponentProps): JSX.El
     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/AddGlobalSecondaryIndexPanel/__snapshots__/AddGlobalSecondaryIndexPanel.test.tsx.snap

@@ -172,17 +172,6 @@ exports[`AddGlobalSecondaryIndexPanel render default panel 1`] = `
         }
         setEnableAnalyticalStore={[Function]}
       />
-      <FullTextSearchComponent
-        fullTextPolicy={
-          {
-            "defaultLanguage": "en-US",
-            "fullTextPaths": [],
-          }
-        }
-        setFullTextIndexes={[Function]}
-        setFullTextPolicy={[Function]}
-        setFullTextPolicyValidated={[Function]}
-      />
       <AdvancedComponent
         setSubPartitionKeys={[Function]}
         setUseHashV1={[Function]}

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/SettingsPane.tsx

@@ -180,11 +180,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       ? LocalStorageUtility.getEntryNumber(StorageKey.MaxWaitTimeInSeconds)
       : Constants.Queries.DefaultMaxWaitTimeInSeconds,
   );
-  const [queryControlEnabled, setQueryControlEnabled] = useState<boolean>(
-    LocalStorageUtility.hasItem(StorageKey.QueryControlEnabled)
-      ? LocalStorageUtility.getEntryString(StorageKey.QueryControlEnabled) === "true"
-      : false,
-  );
   const [maxDegreeOfParallelism, setMaxDegreeOfParallelism] = useState<number>(
     LocalStorageUtility.hasItem(StorageKey.MaxDegreeOfParellism)
       ? LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism)
@@ -199,15 +194,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     LocalStorageUtility.getEntryString(StorageKey.CopilotSampleDBEnabled) === "true",
   );
 
-  const [mongoGuidRepresentation, setMongoGuidRepresentation] = useState<Constants.MongoGuidRepresentation>(
-    LocalStorageUtility.hasItem(StorageKey.MongoGuidRepresentation)
-      ? (LocalStorageUtility.getEntryString(StorageKey.MongoGuidRepresentation) as Constants.MongoGuidRepresentation)
-      : Constants.MongoGuidRepresentation.CSharpLegacy,
-  );
-  const [ignorePartitionKeyOnDocumentUpdate, setIgnorePartitionKeyOnDocumentUpdate] = useState<boolean>(
-    LocalStorageUtility.getEntryBoolean(StorageKey.IgnorePartitionKeyOnDocumentUpdate),
-  );
-
   const styles = useStyles();
 
   const explorerVersion = configContext.gitSha;
@@ -218,7 +204,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     !isEmulator;
   const shouldShowGraphAutoVizOption = userContext.apiType === "Gremlin" && !isEmulator;
   const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin" && !isEmulator;
-  const shouldShowEnhancedQueryControl = userContext.apiType === "SQL";
   const shouldShowParallelismOption = userContext.apiType !== "Gremlin" && !isEmulator;
   const showEnableEntraIdRbac =
     isDataplaneRbacSupported(userContext.apiType) &&
@@ -270,8 +255,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     useDatabases.getState().sampleDataResourceTokenCollection &&
     !isEmulator;
 
-  const shouldShowMongoGuidRepresentationOption = userContext.apiType === "Mongo";
-
   const handlerOnSubmit = async () => {
     setIsExecuting(true);
 
@@ -398,7 +381,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     LocalStorageUtility.setEntryNumber(StorageKey.MaxWaitTimeInSeconds, MaxWaitTimeInSeconds);
     LocalStorageUtility.setEntryString(StorageKey.ContainerPaginationEnabled, containerPaginationEnabled.toString());
     LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, crossPartitionQueryEnabled.toString());
-    LocalStorageUtility.setEntryString(StorageKey.QueryControlEnabled, queryControlEnabled.toString());
     LocalStorageUtility.setEntryNumber(StorageKey.MaxDegreeOfParellism, maxDegreeOfParallelism);
     LocalStorageUtility.setEntryString(StorageKey.PriorityLevel, priorityLevel.toString());
     LocalStorageUtility.setEntryString(StorageKey.CopilotSampleDBEnabled, copilotSampleDBEnabled.toString());
@@ -423,22 +405,11 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       );
     }
 
-    if (shouldShowMongoGuidRepresentationOption) {
-      LocalStorageUtility.setEntryString(StorageKey.MongoGuidRepresentation, mongoGuidRepresentation);
-    }
-
-    // Advanced settings
-    LocalStorageUtility.setEntryBoolean(
-      StorageKey.IgnorePartitionKeyOnDocumentUpdate,
-      ignorePartitionKeyOnDocumentUpdate,
-    );
-
     setIsExecuting(false);
     logConsoleInfo(
       `Updated items per page setting to ${LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage)}`,
     );
     logConsoleInfo(`${crossPartitionQueryEnabled ? "Enabled" : "Disabled"} cross-partition query feed option`);
-    logConsoleInfo(`${queryControlEnabled ? "Enabled" : "Disabled"} query control option`);
     logConsoleInfo(
       `Updated the max degree of parallelism query feed option to ${LocalStorageUtility.getEntryNumber(
         StorageKey.MaxDegreeOfParellism,
@@ -454,18 +425,9 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       );
     }
 
-    if (shouldShowMongoGuidRepresentationOption) {
-      logConsoleInfo(
-        `Updated Mongo Guid Representation to ${LocalStorageUtility.getEntryString(
-          StorageKey.MongoGuidRepresentation,
-        )}`,
-      );
-    }
-
     logConsoleInfo(
-      `${ignorePartitionKeyOnDocumentUpdate ? "Enabled" : "Disabled"} ignoring partition key on document update`,
+      `Updated query setting to ${LocalStorageUtility.getEntryString(StorageKey.SetPartitionKeyUndefined)}`,
     );
-
     refreshExplorer && (await explorer.refreshExplorer());
     closeSidePanel();
   };
@@ -510,13 +472,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     { key: SplitterDirection.Horizontal, text: "Horizontal" },
   ];
 
-  const mongoGuidRepresentationDropdownOptions: IDropdownOption[] = [
-    { key: Constants.MongoGuidRepresentation.CSharpLegacy, text: Constants.MongoGuidRepresentation.CSharpLegacy },
-    { key: Constants.MongoGuidRepresentation.JavaLegacy, text: Constants.MongoGuidRepresentation.JavaLegacy },
-    { key: Constants.MongoGuidRepresentation.PythonLegacy, text: Constants.MongoGuidRepresentation.PythonLegacy },
-    { key: Constants.MongoGuidRepresentation.Standard, text: Constants.MongoGuidRepresentation.Standard },
-  ];
-
   const handleOnPriorityLevelOptionChange = (
     ev: React.FormEvent<HTMLInputElement>,
     option: IChoiceGroupOption,
@@ -599,20 +554,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     setRefreshExplorer(false);
   };
 
-  const handleOnMongoGuidRepresentationOptionChange = (
-    ev: React.FormEvent<HTMLInputElement>,
-    option: IDropdownOption,
-  ): void => {
-    setMongoGuidRepresentation(option.key as Constants.MongoGuidRepresentation);
-  };
-
-  const handleOnIgnorePartitionKeyOnDocumentUpdateChange = (
-    ev: React.MouseEvent<HTMLElement>,
-    checked?: boolean,
-  ): void => {
-    setIgnorePartitionKeyOnDocumentUpdate(!!checked);
-  };
-
   const choiceButtonStyles = {
     root: {
       clear: "both",
@@ -667,7 +608,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
     <RightPaneForm {...genericPaneProps}>
       <div className={`paneMainContent ${styles.container}`}>
         {!isFabricNative() && (
-          <Accordion className={`customAccordion ${styles.firstItem}`} collapsible>
+          <Accordion className={`customAccordion ${styles.firstItem}`}>
             {shouldShowQueryPageOptions && (
               <AccordionItem value="1">
                 <AccordionHeader>
@@ -819,6 +760,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                     )}
                   </AccordionPanel>
                 </AccordionItem>
+
                 <AccordionItem value="5">
                   <AccordionHeader>
                     <div className={styles.header}>RU Limit</div>
@@ -1001,38 +943,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                 </AccordionPanel>
               </AccordionItem>
             )}
-            {shouldShowEnhancedQueryControl && (
-              <AccordionItem value="10">
-                <AccordionHeader>
-                  <div className={styles.header}>Enhanced query control</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      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"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
-                        {" "}
-                        Learn more{" "}
-                      </a>
-                    </div>
-                    <Checkbox
-                      styles={{
-                        label: { padding: 0 },
-                      }}
-                      className="padding"
-                      ariaLabel="EnableQueryControl"
-                      checked={queryControlEnabled}
-                      onChange={() => setQueryControlEnabled(!queryControlEnabled)}
-                      label="Enable query control"
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
             {shouldShowParallelismOption && (
               <AccordionItem value="10">
                 <AccordionHeader>
@@ -1119,15 +1029,15 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                   <div className={styles.settingsSectionContainer}>
                     <div className={styles.settingsSectionDescription}>
                       This is a sample database and collection with synthetic product data you can use to explore using
-                      NoSQL queries. This will appear as another database in the Data Explorer UI, and is created by,
-                      and maintained by Microsoft at no cost to you.
+                      NoSQL queries and Query Advisor. This will appear as another database in the Data Explorer UI, and
+                      is created by, and maintained by Microsoft at no cost to you.
                     </div>
                     <Checkbox
                       styles={{
                         label: { padding: 0 },
                       }}
                       className="padding"
-                      ariaLabel="Enable sample db for query exploration"
+                      ariaLabel="Enable sample db for Query Advisor"
                       checked={copilotSampleDBEnabled}
                       onChange={handleSampleDatabaseChange}
                       label="Enable sample database"
@@ -1136,44 +1046,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
                 </AccordionPanel>
               </AccordionItem>
             )}
-            {shouldShowMongoGuidRepresentationOption && (
-              <AccordionItem value="14">
-                <AccordionHeader>
-                  <div className={styles.header}>Guid Representation</div>
-                </AccordionHeader>
-                <AccordionPanel>
-                  <div className={styles.settingsSectionContainer}>
-                    <div className={styles.settingsSectionDescription}>
-                      GuidRepresentation in MongoDB refers to how Globally Unique Identifiers (GUIDs) are serialized and
-                      deserialized when stored in BSON documents. This will apply to all document operations.
-                    </div>
-                    <Dropdown
-                      aria-labelledby="mongoGuidRepresentation"
-                      selectedKey={mongoGuidRepresentation}
-                      options={mongoGuidRepresentationDropdownOptions}
-                      onChange={handleOnMongoGuidRepresentationOptionChange}
-                    />
-                  </div>
-                </AccordionPanel>
-              </AccordionItem>
-            )}
-            <AccordionItem value="15">
-              <AccordionHeader>
-                <div className={styles.header}>Advanced Settings</div>
-              </AccordionHeader>
-              <AccordionPanel>
-                <div className={styles.settingsSectionContainer}>
-                  <Checkbox
-                    styles={{ label: { padding: 0 } }}
-                    className="padding"
-                    ariaLabel="Ignore partition key on document update"
-                    checked={ignorePartitionKeyOnDocumentUpdate}
-                    onChange={handleOnIgnorePartitionKeyOnDocumentUpdateChange}
-                    label="Ignore partition key on document update"
-                  />
-                </div>
-              </AccordionPanel>
-            </AccordionItem>
           </Accordion>
         )}
 

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"
@@ -495,51 +494,6 @@ exports[`Settings Pane should render Default properly 1`] = `
           </div>
         </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"
       >
@@ -575,37 +529,6 @@ exports[`Settings Pane should render Default properly 1`] = `
           </div>
         </AccordionPanel>
       </AccordionItem>
-      <AccordionItem
-        value="15"
-      >
-        <AccordionHeader>
-          <div
-            className="___15c001r_0000000 fq02s40"
-          >
-            Advanced Settings
-          </div>
-        </AccordionHeader>
-        <AccordionPanel>
-          <div
-            className="___1dfa554_0000000 fo7qwa0"
-          >
-            <StyledCheckboxBase
-              ariaLabel="Ignore partition key on document update"
-              checked={false}
-              className="padding"
-              label="Ignore partition key on document update"
-              onChange={[Function]}
-              styles={
-                {
-                  "label": {
-                    "padding": 0,
-                  },
-                }
-              }
-            />
-          </div>
-        </AccordionPanel>
-      </AccordionItem>
     </Accordion>
     <div
       className="settingsSection"
@@ -650,7 +573,6 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
   >
     <Accordion
       className="customAccordion ___1uf6361_0000000 fz7g6wx"
-      collapsible={true}
     >
       <AccordionItem
         value="7"
@@ -869,37 +791,6 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
           </div>
         </AccordionPanel>
       </AccordionItem>
-      <AccordionItem
-        value="15"
-      >
-        <AccordionHeader>
-          <div
-            className="___15c001r_0000000 fq02s40"
-          >
-            Advanced Settings
-          </div>
-        </AccordionHeader>
-        <AccordionPanel>
-          <div
-            className="___1dfa554_0000000 fo7qwa0"
-          >
-            <StyledCheckboxBase
-              ariaLabel="Ignore partition key on document update"
-              checked={false}
-              className="padding"
-              label="Ignore partition key on document update"
-              onChange={[Function]}
-              styles={
-                {
-                  "label": {
-                    "padding": 0,
-                  },
-                }
-              }
-            />
-          </div>
-        </AccordionPanel>
-      </AccordionItem>
     </Accordion>
     <div
       className="settingsSection"

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/QueryCopilotTab.tsx

@@ -1,9 +1,11 @@
 /* eslint-disable no-console */
 import { Stack } from "@fluentui/react";
+import { QueryCopilotSampleContainerId, QueryCopilotSampleDatabaseId } from "Common/Constants";
 import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import { SaveQueryPane } from "Explorer/Panes/SaveQueryPane/SaveQueryPane";
+import { QueryCopilotPromptbar } from "Explorer/QueryCopilot/QueryCopilotPromptbar";
 import { readCopilotToggleStatus, saveCopilotToggleStatus } from "Explorer/QueryCopilot/QueryCopilotUtilities";
 import { OnExecuteQueryClick } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { QueryCopilotProps } from "Explorer/QueryCopilot/Shared/QueryCopilotInterfaces";
@@ -11,6 +13,7 @@ import { QueryCopilotResults } from "Explorer/QueryCopilot/Shared/QueryCopilotRe
 import { userContext } from "UserContext";
 import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
 import { useSidePanel } from "hooks/useSidePanel";
+import { ReactTabKind, TabsState, useTabs } from "hooks/useTabs";
 import React, { useState } from "react";
 import SplitterLayout from "react-splitter-layout";
 import QueryCommandIcon from "../../../images/CopilotCommand.svg";
@@ -23,8 +26,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
   const [copilotActive, setCopilotActive] = useState<boolean>(() =>
     readCopilotToggleStatus(userContext.databaseAccount),
   );
-  //TODO: Uncomment this useState when query copilot is reinstated in DE
-  // const [tabActive, setTabActive] = useState<boolean>(true);
+  const [tabActive, setTabActive] = useState<boolean>(true);
 
   const getCommandbarButtons = (): CommandButtonComponentProps[] => {
     const executeQueryBtnLabel = selectedQuery ? "Execute Selection" : "Execute Query";
@@ -68,18 +70,17 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
     useCommandBar.getState().setContextButtons(getCommandbarButtons());
   }, [query, selectedQuery, copilotActive]);
 
-  //TODO: Uncomment this effect when query copilot is reinstated in DE
-  // React.useEffect(() => {
-  //   return () => {
-  //     useTabs.subscribe((state: TabsState) => {
-  //       if (state.activeReactTab === ReactTabKind.QueryCopilot) {
-  //         setTabActive(true);
-  //       } else {
-  //         setTabActive(false);
-  //       }
-  //     });
-  //   };
-  // }, []);
+  React.useEffect(() => {
+    return () => {
+      useTabs.subscribe((state: TabsState) => {
+        if (state.activeReactTab === ReactTabKind.QueryCopilot) {
+          setTabActive(true);
+        } else {
+          setTabActive(false);
+        }
+      });
+    };
+  }, []);
 
   const toggleCopilot = (toggle: boolean) => {
     setCopilotActive(toggle);
@@ -89,7 +90,6 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
   return (
     <Stack className="tab-pane" style={{ width: "100%" }}>
       <div style={isGeneratingQuery ? { height: "100%" } : { overflowY: "auto", height: "100%" }}>
-        {/*TODO: Uncomment this section when query copilot is reinstated in DE
         {tabActive && copilotActive && (
           <QueryCopilotPromptbar
             explorer={explorer}
@@ -97,7 +97,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
             databaseId={QueryCopilotSampleDatabaseId}
             containerId={QueryCopilotSampleContainerId}
           ></QueryCopilotPromptbar>
-        )} */}
+        )}
         <Stack className="tabPaneContentContainer">
           <SplitterLayout percentage={true} vertical={true} primaryIndex={0} primaryMinSize={30} secondaryMinSize={70}>
             <EditorReact

src/Explorer/Sidebar.tsx

@@ -27,13 +27,11 @@ import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/T
 import { ResourceTree } from "Explorer/Tree/ResourceTree";
 import { useDatabases } from "Explorer/useDatabases";
 import { KeyboardAction, KeyboardActionGroup, KeyboardActionHandler, useKeyboardActionGroup } from "KeyboardShortcuts";
-import { isFabric, isFabricMirrored, isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
+import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import { getCollectionName, getDatabaseName } from "Utils/APITypeUtils";
-import { conditionalClass } from "Utils/StyleUtils";
 import { Allotment, AllotmentHandle } from "allotment";
 import { useSidePanel } from "hooks/useSidePanel";
-import useZoomLevel from "hooks/useZoomLevel";
 import { debounce } from "lodash";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 
@@ -106,23 +104,6 @@ const useSidebarStyles = makeStyles({
       display: "flex",
     },
   },
-  accessibleContent: {
-    "@media (max-width: 420px)": {
-      overflow: "scroll",
-    },
-  },
-  minHeightResponsive: {
-    "@media (max-width: 420px)": {
-      minHeight: "400px",
-    },
-  },
-  accessibleContentZoom: {
-    overflow: "scroll",
-  },
-
-  minHeightZoom: {
-    minHeight: "400px",
-  },
 });
 
 interface GlobalCommandsProps {
@@ -294,7 +275,6 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
   const [expandedSize, setExpandedSize] = React.useState(300);
   const hasSidebar = userContext.apiType !== "Postgres" && userContext.apiType !== "VCoreMongo";
   const allotment = useRef<AllotmentHandle>(null);
-  const isZoomed = useZoomLevel();
 
   const expand = useCallback(() => {
     if (!expanded) {
@@ -338,30 +318,17 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
 
   const hasGlobalCommands = !(
     isFabricMirrored() ||
-    isFabricNativeReadOnly() ||
     userContext.apiType === "Postgres" ||
     userContext.apiType === "VCoreMongo"
   );
 
   return (
     <div className="sidebarContainer">
-      <Allotment
-        ref={allotment}
-        onChange={onChange}
-        onDragEnd={onDragEnd}
-        className={`resourceTreeAndTabs ${styles.accessibleContent} ${conditionalClass(
-          isZoomed,
-          styles.accessibleContentZoom,
-        )}`}
-      >
+      <Allotment ref={allotment} onChange={onChange} onDragEnd={onDragEnd} className="resourceTreeAndTabs">
         {/* Collections Tree - Start */}
         {hasSidebar && (
           // When collapsed, we force the pane to 24 pixels wide and make it non-resizable.
-          <Allotment.Pane
-            className={`${styles.minHeightResponsive} ${conditionalClass(isZoomed, styles.minHeightZoom)}`}
-            minSize={24}
-            preferredSize={250}
-          >
+          <Allotment.Pane minSize={24} preferredSize={250}>
             <CosmosFluentProvider className={mergeClasses(styles.sidebar)}>
               <div className={styles.sidebarContainer}>
                 {loading && (
@@ -417,10 +384,7 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
             </CosmosFluentProvider>
           </Allotment.Pane>
         )}
-        <Allotment.Pane
-          className={`${styles.minHeightResponsive} ${conditionalClass(isZoomed, styles.minHeightZoom)}`}
-          minSize={200}
-        >
+        <Allotment.Pane minSize={200}>
           <Tabs explorer={explorer} />
         </Allotment.Pane>
       </Allotment>

src/Explorer/SplashScreen/FabricHome.tsx

@@ -2,16 +2,14 @@
  * Accordion top class
  */
 import { Link, makeStyles, tokens } from "@fluentui/react-components";
-import { DocumentAddRegular, LinkMultipleRegular, OpenRegular } from "@fluentui/react-icons";
-import { SampleDataConfiguration, SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
-import { SampleDataFile } from "Explorer/SplashScreen/SampleUtil";
+import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
+import { SampleDataImportDialog } from "Explorer/SplashScreen/SampleDataImportDialog";
 import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
-import { isFabricNative, isFabricNativeReadOnly } from "Platform/Fabric/FabricUtil";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import * as React from "react";
 import { userContext } from "UserContext";
-import AzureOpenAiIcon from "../../../images/AzureOpenAi.svg";
 import CosmosDbBlackIcon from "../../../images/CosmosDB_black.svg";
-import GithubIcon from "../../../images/github-black-and-white.svg";
+import LinkIcon from "../../../images/Link_blue.svg";
 import Explorer from "../Explorer";
 
 export interface SplashScreenProps {
@@ -29,11 +27,11 @@ const useStyles = makeStyles({
     fontWeight: "bold",
   },
   buttonsContainer: {
-    width: "760px",
+    width: "584px",
     margin: "auto",
     display: "grid",
     padding: "16px",
-    gridTemplateColumns: "repeat(4, 1fr)",
+    gridTemplateColumns: "repeat(3, 1fr)",
     gap: "10px",
     gridAutoRows: "minmax(184px, auto)",
   },
@@ -56,15 +54,6 @@ const useStyles = makeStyles({
     },
   },
   three: {
-    gridColumn: "4",
-    gridRow: "1",
-    "& img": {
-      width: "32px",
-      height: "32px",
-      margin: "auto",
-    },
-  },
-  four: {
     gridColumn: "3",
     gridRow: "2",
     "& svg": {
@@ -73,24 +62,6 @@ const useStyles = makeStyles({
       margin: "auto",
     },
   },
-  five: {
-    gridColumn: "4",
-    gridRow: "2",
-    "& img": {
-      width: "32px",
-      height: "32px",
-      margin: "auto",
-    },
-  },
-  single: {
-    gridColumn: "1 / 4",
-    gridRow: "1 / 3",
-    "& svg": {
-      width: "64px",
-      height: "64px",
-      margin: "auto",
-    },
-  },
   buttonContainer: {
     height: "100%",
     display: "flex",
@@ -140,7 +111,7 @@ const FabricHomeScreenButton: React.FC<FabricHomeScreenButtonProps & { className
 }) => {
   const styles = useStyles();
   return (
-    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick} tabIndex={0}>
+    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick}>
       <div className={styles.buttonUpperPart}>{icon}</div>
       <div aria-label={title} className={styles.buttonLowerPart}>
         <div>{title}</div>
@@ -153,8 +124,6 @@ const FabricHomeScreenButton: React.FC<FabricHomeScreenButtonProps & { className
 export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScreenProps) => {
   const styles = useStyles();
   const [openSampleDataImportDialog, setOpenSampleDataImportDialog] = React.useState(false);
-  const [selectedSampleDataConfiguration, setSelectedSampleDataConfiguration] =
-    React.useState<SampleDataConfiguration>(undefined);
 
   const getSplashScreenButtons = (): JSX.Element => {
     const buttons: FabricHomeScreenButtonProps[] = [
@@ -168,30 +137,10 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
         },
       },
       {
-        title: "Sample Data",
-        description: "Load sample data in your database",
-        icon: <img src={CosmosDbBlackIcon} alt={"Azure Cosmos DB icon"} aria-hidden="true" />,
-        onClick: () => {
-          setSelectedSampleDataConfiguration({
-            databaseName: userContext.fabricContext?.databaseName,
-            newContainerName: "SampleData",
-            sampleDataFile: SampleDataFile.FABRIC_SAMPLE_DATA,
-          });
-          setOpenSampleDataImportDialog(true);
-        },
-      },
-      {
-        title: "Sample Vector Data",
-        description: "Load sample vector data in your database",
-        icon: <img src={AzureOpenAiIcon} alt={"Azure Open AI icon"} aria-hidden="true" />,
-        onClick: () => {
-          setSelectedSampleDataConfiguration({
-            databaseName: userContext.fabricContext?.databaseName,
-            newContainerName: "SampleVectorData",
-            sampleDataFile: SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA,
-          });
-          setOpenSampleDataImportDialog(true);
-        },
+        title: "Sample data",
+        description: "Automatically load sample data in your database",
+        icon: <img src={CosmosDbBlackIcon} />,
+        onClick: () => setOpenSampleDataImportDialog(true),
       },
       {
         title: "App development",
@@ -199,30 +148,18 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
         icon: <LinkMultipleRegular />,
         onClick: () => window.open("https://aka.ms/cosmosdbfabricsdk", "_blank"),
       },
-      {
-        title: "Sample Gallery",
-        description: "Get real-world end-to-end samples",
-        icon: <img src={GithubIcon} alt={"GitHub icon"} aria-hidden="true" />,
-        onClick: () => window.open("https://azurecosmosdb.github.io/gallery/?tags=example&tags=analytics", "_blank"),
-      },
     ];
 
-    return isFabricNativeReadOnly() ? (
-      <div className={styles.buttonsContainer}>
-        <FabricHomeScreenButton className={styles.single} {...buttons[3]} />
-      </div>
-    ) : (
+    return (
       <div className={styles.buttonsContainer}>
         <FabricHomeScreenButton className={styles.one} {...buttons[0]} />
         <FabricHomeScreenButton className={styles.two} {...buttons[1]} />
         <FabricHomeScreenButton className={styles.three} {...buttons[2]} />
-        <FabricHomeScreenButton className={styles.four} {...buttons[3]} />
-        <FabricHomeScreenButton className={styles.five} {...buttons[4]} />
       </div>
     );
   };
 
-  const title = isFabricNativeReadOnly() ? "Use your database" : "Build your database";
+  const title = "Build your database";
   return (
     <>
       <CosmosFluentProvider className={styles.homeContainer}>
@@ -230,20 +167,18 @@ export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScree
           open={openSampleDataImportDialog}
           setOpen={setOpenSampleDataImportDialog}
           explorer={props.explorer}
-          sampleDataConfiguration={selectedSampleDataConfiguration}
+          databaseName={userContext.fabricContext?.databaseName}
         />
-        <div className={styles.title} role="heading" aria-label={title} aria-level={1}>
+        <div className={styles.title} role="heading" aria-label={title}>
           {title}
         </div>
         {getSplashScreenButtons()}
-        {
-          <div className={styles.footer}>
-            Need help?{" "}
-            <Link href="https://learn.microsoft.com/fabric/database/cosmos-db/overview" target="_blank">
-              Learn more <OpenRegular />
-            </Link>
-          </div>
-        }
+        <div className={styles.footer}>
+          Need help?{" "}
+          <Link href="https://aka.ms/cosmosdbfabricdocs" target="_blank">
+            Learn more <img src={LinkIcon} alt="Learn more" />
+          </Link>
+        </div>
       </CosmosFluentProvider>
     </>
   );

src/Explorer/SplashScreen/SampleDataImportDialog.tsx

@@ -11,10 +11,12 @@ import {
   tokens,
 } from "@fluentui/react-components";
 import Explorer from "Explorer/Explorer";
-import { checkContainerExists, createContainer, importData, SampleDataFile } from "Explorer/SplashScreen/SampleUtil";
+import { checkContainerExists, createContainer, importData } from "Explorer/SplashScreen/SampleUtil";
 import React, { useEffect, useState } from "react";
 import * as ViewModels from "../../Contracts/ViewModels";
 
+const SAMPLE_DATA_CONTAINER_NAME = "SampleData";
+
 const useStyles = makeStyles({
   dialogContent: {
     alignItems: "center",
@@ -22,12 +24,6 @@ const useStyles = makeStyles({
   },
 });
 
-export interface SampleDataConfiguration {
-  databaseName: string;
-  newContainerName: string;
-  sampleDataFile: SampleDataFile;
-}
-
 /**
  * This dialog:
  * - creates a container
@@ -39,11 +35,11 @@ export const SampleDataImportDialog: React.FC<{
   open: boolean;
   setOpen: (open: boolean) => void;
   explorer: Explorer;
-  sampleDataConfiguration: SampleDataConfiguration | undefined;
+  databaseName: string;
 }> = (props) => {
   const [status, setStatus] = useState<"idle" | "creating" | "importing" | "completed" | "error">("idle");
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const containerName = props.sampleDataConfiguration?.newContainerName;
+  const containerName = SAMPLE_DATA_CONTAINER_NAME;
   const [collection, setCollection] = useState<ViewModels.Collection>(undefined);
   const styles = useStyles();
 
@@ -57,7 +53,7 @@ export const SampleDataImportDialog: React.FC<{
 
   const handleStartImport = async (): Promise<void> => {
     setStatus("creating");
-    const databaseName = props.sampleDataConfiguration.databaseName;
+    const databaseName = props.databaseName;
     if (checkContainerExists(databaseName, containerName)) {
       const msg = `The container "${containerName}" in database "${databaseName}" already exists. Please delete it and retry.`;
       setStatus("error");
@@ -67,12 +63,7 @@ export const SampleDataImportDialog: React.FC<{
 
     let collection;
     try {
-      collection = await createContainer(
-        databaseName,
-        containerName,
-        props.explorer,
-        props.sampleDataConfiguration.sampleDataFile,
-      );
+      collection = await createContainer(databaseName, containerName, props.explorer);
     } catch (error) {
       setStatus("error");
       setErrorMessage(`Failed to create container: ${error instanceof Error ? error.message : String(error)}`);
@@ -81,7 +72,7 @@ export const SampleDataImportDialog: React.FC<{
 
     try {
       setStatus("importing");
-      await importData(props.sampleDataConfiguration.sampleDataFile, collection);
+      await importData(collection);
       setCollection(collection);
       setStatus("completed");
     } catch (error) {

src/Explorer/SplashScreen/SampleUtil.ts

@@ -1,13 +1,9 @@
-import { JSONObject } from "@azure/cosmos";
 import { BackendDefaults } from "Common/Constants";
 import { createCollection } from "Common/dataAccess/createCollection";
 import Explorer from "Explorer/Explorer";
 import { useDatabases } from "Explorer/useDatabases";
-import { DEFAULT_FABRIC_NATIVE_CONTAINER_THROUGHPUT, isFabricNative } from "Platform/Fabric/FabricUtil";
-import { Action, ActionModifiers } from "Shared/Telemetry/TelemetryConstants";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
-import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 
 /**
  * Public for unit tests
@@ -30,20 +26,12 @@ const hasContainer = (
 export const checkContainerExists = (databaseName: string, containerName: string) =>
   hasContainer(databaseName, containerName, useDatabases.getState().databases);
 
-export enum SampleDataFile {
-  COPILOT = "Copilot",
-  FABRIC_SAMPLE_DATA = "FabricSampleData",
-  FABRIC_SAMPLE_VECTOR_DATA = "FabricSampleVectorData",
-}
-
 export const createContainer = async (
   databaseName: string,
   containerName: string,
   explorer: Explorer,
-  sampleDataFile: SampleDataFile,
 ): Promise<ViewModels.Collection> => {
   const createRequest: DataModels.CreateCollectionParams = {
-    autoPilotMaxThroughput: isFabricNative() ? DEFAULT_FABRIC_NATIVE_CONTAINER_THROUGHPUT : undefined,
     createNewDatabase: false,
     collectionId: containerName,
     databaseId: databaseName,
@@ -53,44 +41,6 @@ export const createContainer = async (
       kind: "Hash",
       version: BackendDefaults.partitionKeyVersion,
     },
-    vectorEmbeddingPolicy:
-      sampleDataFile === SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA
-        ? {
-            vectorEmbeddings: [
-              {
-                path: "/descriptionVector",
-                dataType: "float32",
-                distanceFunction: "cosine",
-                dimensions: 512,
-              },
-            ],
-          }
-        : undefined,
-    indexingPolicy:
-      sampleDataFile === SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA
-        ? {
-            automatic: true,
-            indexingMode: "consistent",
-            includedPaths: [
-              {
-                path: "/*",
-              },
-            ],
-            excludedPaths: [
-              {
-                path: '/"_etag"/?',
-              },
-            ],
-            fullTextIndexes: [],
-            vectorIndexes: [
-              {
-                path: "/descriptionVector",
-                type: "quantizedFlat",
-                quantizationByteSize: 64,
-              },
-            ],
-          }
-        : undefined,
   };
   await createCollection(createRequest);
   await explorer.refreshAllDatabases();
@@ -105,39 +55,10 @@ export const createContainer = async (
 
 const SAMPLE_DATA_PARTITION_KEY = "category"; // This pkey is specifically set for queryCopilotSampleData.json below
 
-export const importData = async (sampleDataFile: SampleDataFile, collection: ViewModels.Collection): Promise<void> => {
-  let documents: JSONObject[] = undefined;
-  switch (sampleDataFile) {
-    case SampleDataFile.COPILOT:
-      documents = (
-        await import(/* webpackChunkName: "queryCopilotSampleData" */ "../../../sampleData/queryCopilotSampleData.json")
-      ).data;
-      break;
-    case SampleDataFile.FABRIC_SAMPLE_DATA:
-      documents = (await import(/* webpackChunkName: "fabricSampleData" */ "../../../sampleData/fabricSampleData.json"))
-        .default;
-      break;
-    case SampleDataFile.FABRIC_SAMPLE_VECTOR_DATA:
-      documents = (
-        await import(
-          /* webpackChunkName: "fabricSampleDataVectors" */ "../../../sampleData/fabricSampleDataVectors.json"
-        )
-      ).default;
-      break;
-    default:
-      throw new Error(`Unknown sample data file: ${sampleDataFile}`);
-  }
-  if (!documents) {
-    throw new Error(`Failed to load sample data file: ${sampleDataFile}`);
-  }
-
-  // Time it
-  const start = performance.now();
-  await collection.bulkInsertDocuments(documents);
-  const end = performance.now();
-  TelemetryProcessor.trace(Action.ImportSampleData, ActionModifiers.Success, {
-    documentsCount: documents.length,
-    durationMs: end - start,
-    sampleDataFile,
-  });
+export const importData = async (collection: ViewModels.Collection): Promise<void> => {
+  // TODO: keep same chunk as ContainerSampleGenerator
+  const dataFileContent = await import(
+    /* webpackChunkName: "queryCopilotSampleData" */ "../../../sampleData/queryCopilotSampleData.json"
+  );
+  await collection.bulkInsertDocuments(dataFileContent.data);
 };

src/Explorer/SplashScreen/SplashScreen.less

@@ -30,21 +30,6 @@
       margin: 0px auto;
       text-align: center;
     }
-    .splashStackContainer {
-      .splashStackRow {
-        display: flex;
-        gap: 0 16px;
-
-        @media (max-width: 768px) {
-          flex-direction: column;
-          gap: 16px 0;
-        }
-      }
-
-      @media (max-width: 768px) {
-        width: 85% !important;
-      }
-    }
 
     .mainButtonsContainer {
       .flex-display();