testing icons

testing
2025-12-24 19:31:36 +00:00 · 2025-01-14 17:16:02 -06:00 · 2025-01-14 14:45:19 -06:00
49 changed files with 1065 additions and 1405 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1 +1 @@
-[Preview this branch](https://dataexplorer-preview.azurewebsites.net/pull/EDIT_THIS_NUMBER_IN_THE_PR_DESCRIPTION?feature.someFeatureFlagYouMightNeed=true)
+[Preview this branch](https://cosmos-explorer-preview.azurewebsites.net/pull/EDIT_THIS_NUMBER_IN_THE_PR_DESCRIPTION?feature.someFeatureFlagYouMightNeed=true)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,7 +83,7 @@ jobs:
      - run: npm ci
      - run: npm run build:contracts
      - name: Restore Build Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
        with:
          path: .cache
          key: ${{ runner.os }}-build-cache
@@ -96,16 +96,14 @@ jobs:
        with:
          name: dist
          path: dist/
-      - name: "Az CLI login"
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          subscription-id: ${{ secrets.PREVIEW_SUBSCRIPTION_ID }}
      - name: Upload build to preview blob storage
-        run: az storage blob upload-batch -d '$web' -s 'dist' --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} --destination-path "${{github.event.pull_request.head.sha || github.sha}}" --auth-mode login --overwrite true
+        run: az storage blob upload-batch -d '$web' -s 'dist' --account-name cosmosexplorerpreview --destination-path "${{github.event.pull_request.head.sha || github.sha}}" --account-key="${PREVIEW_STORAGE_KEY}" --overwrite true
+        env:
+          PREVIEW_STORAGE_KEY: ${{ secrets.PREVIEW_STORAGE_KEY }}
      - name: Upload preview config to blob storage
-        run: az storage blob upload -c '$web' -f ./preview/config.json --account-name ${{ secrets.PREVIEW_STORAGE_ACCOUNT_NAME }} --name "${{github.event.pull_request.head.sha || github.sha}}/config.json" --auth-mode login --overwrite true
+        run: az storage blob upload -c '$web' -f ./preview/config.json --account-name cosmosexplorerpreview --name "${{github.event.pull_request.head.sha || github.sha}}/config.json" --account-key="${PREVIEW_STORAGE_KEY}" --overwrite true
+        env:
+          PREVIEW_STORAGE_KEY: ${{ secrets.PREVIEW_STORAGE_KEY }}
  nuget:
    name: Publish Nuget
    if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
@@ -115,21 +113,21 @@ jobs:
      NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
      AZURE_DEVOPS_PAT: ${{ secrets.AZURE_DEVOPS_PAT }}
    steps:
+      - uses: nuget/setup-nuget@v2
+        with:
+          nuget-api-key: ${{ secrets.NUGET_API_KEY }}
      - name: Download Dist Folder
        uses: actions/download-artifact@v4
        with:
          name: dist
      - run: cp ./configs/prod.json config.json
-      - run: dotnet nuget add source "$NUGET_SOURCE" --name "ADO" --username "jawelton@microsoft.com" --password "$AZURE_DEVOPS_PAT" --store-password-in-clear-text
-      - run: dotnet pack DataExplorer.proj /p:PackageVersion="2.0.0-github-${GITHUB_SHA}"
-      - run: dotnet nuget push "bin/Release/*.nupkg" --skip-duplicate --api-key Az --source="$NUGET_SOURCE"
-      - run: dotnet nuget remove source "ADO"
+      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "jawelton@microsoft.com" -Password "$AZURE_DEVOPS_PAT"
+      - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
+      - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
      - uses: actions/upload-artifact@v4
-        name: Upload package to Artifacts
+        name: packages
        with:
-          name: prod-package
-          path: "bin/Release/*.nupkg"
-
+          path: "*.nupkg"
  nugetmpac:
    name: Publish Nuget MPAC
    if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
@@ -139,21 +137,22 @@ jobs:
      NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
      AZURE_DEVOPS_PAT: ${{ secrets.AZURE_DEVOPS_PAT }}
    steps:
+      - uses: nuget/setup-nuget@v2
+        with:
+          nuget-api-key: ${{ secrets.NUGET_API_KEY }}
      - name: Download Dist Folder
        uses: actions/download-artifact@v4
        with:
          name: dist
      - run: cp ./configs/mpac.json config.json
      - run: sed -i 's/Azure.Cosmos.DB.Data.Explorer/Azure.Cosmos.DB.Data.Explorer.MPAC/g' DataExplorer.nuspec
-      - run: dotnet nuget add source "$NUGET_SOURCE" --name "ADO" --username "jawelton@microsoft.com" --password "$AZURE_DEVOPS_PAT" --store-password-in-clear-text
-      - run: dotnet pack DataExplorer.proj /p:PackageVersion="2.0.0-github-${GITHUB_SHA}"
-      - run: dotnet nuget push "bin/Release/*.nupkg" --skip-duplicate --api-key Az --source="$NUGET_SOURCE"
-      - run: dotnet nuget remove source "ADO"
+      - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "jawelton@microsoft.com" -Password "$AZURE_DEVOPS_PAT"
+      - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
+      - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
      - uses: actions/upload-artifact@v4
-        name: Upload package to Artifacts
+        name: packages
        with:
-          name: mpac-package
-          path: "bin/Release/*.nupkg"
+          path: "*.nupkg"

  playwright-tests:
    name: "Run Playwright Tests (Shard ${{ matrix.shardIndex }} of ${{ matrix.shardTotal }})"
--- a/DataExplorer.proj
+++ b/DataExplorer.proj
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <NoBuild>true</NoBuild>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <NuspecFile>DataExplorer.nuspec</NuspecFile>
-    <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
-  </PropertyGroup>
-</Project>
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@

 UI for Azure Cosmos DB. Powers the [Azure Portal](https://portal.azure.com/), https://cosmos.azure.com/, and the [Cosmos DB Emulator](https://docs.microsoft.com/en-us/azure/cosmos-db/local-emulator)

-
 ![](https://sdkctlstore.blob.core.windows.net/exe/dataexplorer.gif)

 ## Getting Started
--- a/less/documentDB.less
+++ b/less/documentDB.less
@@ -1830,14 +1830,6 @@ input::-webkit-calendar-picker-indicator::after {
  transform: rotate(90deg);
 }

-.customAccordion button:focus {
-  .focus();
-}
-
-.customAccordion {
-  margin-top: 1px;
-}
-
 .datalist-arrow:after:hover {
  content: "\276F";
  position: absolute;
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
        "@azure/arm-cosmosdb": "9.1.0",
        "@azure/cosmos": "4.2.0-beta.1",
        "@azure/cosmos-language-service": "0.0.5",
-        "@azure/identity": "4.5.0",
+        "@azure/identity": "1.5.2",
+        "@azure/ms-rest-nodeauth": "3.1.1",
        "@azure/msal-browser": "2.14.2",
        "@babel/plugin-proposal-class-properties": "7.12.1",
        "@babel/plugin-proposal-decorators": "7.12.12",
@@ -427,68 +428,47 @@
      "license": "0BSD"
    },
    "node_modules/@azure/identity": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.5.0.tgz",
-      "integrity": "sha512-EknvVmtBuSIic47xkOqyNabAme0RYTw52BTMz8eBgU1ysTyMrD1uOoM+JdS0J/4Yfp98IBT3osqq3BfwSaNaGQ==",
+      "version": "1.5.2",
+      "license": "MIT",
      "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.9.0",
-        "@azure/core-client": "^1.9.2",
-        "@azure/core-rest-pipeline": "^1.17.0",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.11.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-client": "^1.0.0",
+        "@azure/core-rest-pipeline": "^1.1.0",
+        "@azure/core-tracing": "1.0.0-preview.12",
        "@azure/logger": "^1.0.0",
-        "@azure/msal-browser": "^3.26.1",
-        "@azure/msal-node": "^2.15.0",
+        "@azure/msal-node": "1.0.0-beta.6",
+        "@types/stoppable": "^1.1.0",
+        "axios": "^0.21.1",
        "events": "^3.0.0",
        "jws": "^4.0.0",
-        "open": "^8.0.0",
+        "msal": "^1.0.2",
+        "open": "^7.0.0",
+        "qs": "^6.7.0",
        "stoppable": "^1.1.0",
+        "tslib": "^2.0.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.3.0"
+      }
+    },
+    "node_modules/@azure/identity/node_modules/@azure/core-tracing": {
+      "version": "1.0.0-preview.12",
+      "license": "MIT",
+      "dependencies": {
+        "@opentelemetry/api": "^1.0.0",
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@azure/identity/node_modules/@azure/msal-browser": {
-      "version": "3.28.1",
-      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.28.1.tgz",
-      "integrity": "sha512-OHHEWMB5+Zrix8yKvLVzU3rKDFvh7SOzAzXfICD7YgUXLxfHpTPX2pzOotrri1kskwhHqIj4a5LvhZlIqE7C7g==",
-      "dependencies": {
-        "@azure/msal-common": "14.16.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@azure/identity/node_modules/@azure/msal-common": {
-      "version": "14.16.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.0.tgz",
-      "integrity": "sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@azure/identity/node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12.0.0"
      }
    },
    "node_modules/@azure/identity/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/logger": {
      "version": "1.0.4",
@@ -504,6 +484,10 @@
      "version": "2.6.2",
      "license": "0BSD"
    },
+    "node_modules/@azure/ms-rest-azure-env": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
    "node_modules/@azure/ms-rest-azure-js": {
      "version": "2.1.0",
      "license": "MIT",
@@ -575,6 +559,15 @@
        "node": ">=4.0"
      }
    },
+    "node_modules/@azure/ms-rest-nodeauth": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "@azure/ms-rest-azure-env": "^2.0.0",
+        "@azure/ms-rest-js": "^2.0.4",
+        "adal-node": "^0.2.2"
+      }
+    },
    "node_modules/@azure/msal-browser": {
      "version": "2.14.2",
      "license": "MIT",
@@ -596,24 +589,13 @@
      }
    },
    "node_modules/@azure/msal-node": {
-      "version": "2.16.2",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.16.2.tgz",
-      "integrity": "sha512-An7l1hEr0w1HMMh1LU+rtDtqL7/jw74ORlc9Wnh06v7TU/xpG39/Zdr1ZJu3QpjUfKJ+E0/OXMW8DRSWTlh7qQ==",
+      "version": "1.0.0-beta.6",
+      "license": "MIT",
      "dependencies": {
-        "@azure/msal-common": "14.16.0",
-        "jsonwebtoken": "^9.0.0",
+        "@azure/msal-common": "^4.0.0",
+        "axios": "^0.21.1",
+        "jsonwebtoken": "^8.5.1",
        "uuid": "^8.3.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
-      "version": "14.16.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.0.tgz",
-      "integrity": "sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==",
-      "engines": {
-        "node": ">=0.8.0"
      }
    },
    "node_modules/@babel/code-frame": {
@@ -10091,6 +10073,13 @@
        "@octokit/openapi-types": "^19.0.2"
      }
    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.8.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
    "node_modules/@phosphor/algorithm": {
      "version": "1.2.0",
      "license": "BSD-3-Clause"
@@ -12736,6 +12725,13 @@
      "devOptional": true,
      "license": "MIT"
    },
+    "node_modules/@types/stoppable": {
+      "version": "1.1.3",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
    "node_modules/@types/styled-components": {
      "version": "5.1.1",
      "dev": true,
@@ -13338,6 +13334,61 @@
        "node": ">=0.4.0"
      }
    },
+    "node_modules/adal-node": {
+      "version": "0.2.4",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.3",
+        "async": "^2.6.3",
+        "axios": "^0.21.1",
+        "date-utils": "*",
+        "jws": "3.x.x",
+        "underscore": ">= 1.3.1",
+        "uuid": "^3.1.0",
+        "xpath.js": "~1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.6.15"
+      }
+    },
+    "node_modules/adal-node/node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/adal-node/node_modules/async": {
+      "version": "2.6.4",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/adal-node/node_modules/jwa": {
+      "version": "1.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/adal-node/node_modules/jws": {
+      "version": "3.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/adal-node/node_modules/uuid": {
+      "version": "3.4.0",
+      "license": "MIT",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
    "node_modules/address": {
      "version": "1.1.2",
      "dev": true,
@@ -13970,6 +14021,13 @@
      "version": "1.12.0",
      "license": "MIT"
    },
+    "node_modules/axios": {
+      "version": "0.21.4",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
    "node_modules/babel-core": {
      "version": "7.0.0-bridge.0",
      "dev": true,
@@ -14673,7 +14731,7 @@
    },
    "node_modules/base64-js": {
      "version": "1.5.1",
-      "dev": true,
+      "devOptional": true,
      "funding": [
        {
          "type": "github",
@@ -14745,9 +14803,8 @@
    },
    "node_modules/bl": {
      "version": "4.1.0",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "buffer": "^5.5.0",
        "inherits": "^2.0.4",
@@ -14756,7 +14813,7 @@
    },
    "node_modules/bl/node_modules/buffer": {
      "version": "5.7.1",
-      "dev": true,
+      "devOptional": true,
      "funding": [
        {
          "type": "github",
@@ -14772,7 +14829,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "base64-js": "^1.3.1",
        "ieee754": "^1.1.13"
@@ -14780,9 +14836,8 @@
    },
    "node_modules/bl/node_modules/readable-stream": {
      "version": "3.6.2",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "inherits": "^2.0.3",
        "string_decoder": "^1.1.1",
@@ -15352,6 +15407,11 @@
        "node": ">=8.0"
      }
    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "license": "ISC",
+      "optional": true
+    },
    "node_modules/chrome-trace-event": {
      "version": "1.0.3",
      "license": "MIT",
@@ -17115,6 +17175,13 @@
      "version": "1.29.0",
      "license": "MIT"
    },
+    "node_modules/date-utils": {
+      "version": "1.2.21",
+      "license": "MIT",
+      "engines": {
+        "node": ">0.4.0"
+      }
+    },
    "node_modules/dayjs": {
      "version": "1.8.19",
      "license": "MIT"
@@ -17209,6 +17276,14 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
    "node_modules/deep-is": {
      "version": "0.1.4",
      "license": "MIT"
@@ -17269,6 +17344,7 @@
    },
    "node_modules/define-lazy-prop": {
      "version": "2.0.0",
+      "dev": true,
      "license": "MIT",
      "engines": {
        "node": ">=8"
@@ -18900,6 +18976,14 @@
      "version": "2.0.0",
      "license": "MIT"
    },
+    "node_modules/expand-template": {
+      "version": "2.0.3",
+      "license": "(MIT OR WTFPL)",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
    "node_modules/expect": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
@@ -19587,7 +19671,6 @@
    },
    "node_modules/follow-redirects": {
      "version": "1.15.3",
-      "dev": true,
      "funding": [
        {
          "type": "individual",
@@ -19895,6 +19978,11 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/fs-extra": {
      "version": "7.0.0",
      "dev": true,
@@ -20109,6 +20197,11 @@
        "assert-plus": "^1.0.0"
      }
    },
+    "node_modules/github-from-package": {
+      "version": "0.0.0",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/glob": {
      "version": "7.2.3",
      "license": "ISC",
@@ -21240,7 +21333,7 @@
    },
    "node_modules/ieee754": {
      "version": "1.2.1",
-      "dev": true,
+      "devOptional": true,
      "funding": [
        {
          "type": "github",
@@ -21429,7 +21522,7 @@
    },
    "node_modules/ini": {
      "version": "1.3.8",
-      "dev": true,
+      "devOptional": true,
      "license": "ISC"
    },
    "node_modules/internal-slot": {
@@ -27465,9 +27558,8 @@
      }
    },
    "node_modules/jsonwebtoken": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
-      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+      "version": "8.5.1",
+      "license": "MIT",
      "dependencies": {
        "jws": "^3.2.2",
        "lodash.includes": "^4.3.0",
@@ -27478,17 +27570,16 @@
        "lodash.isstring": "^4.0.1",
        "lodash.once": "^4.0.0",
        "ms": "^2.1.1",
-        "semver": "^7.5.4"
+        "semver": "^5.6.0"
      },
      "engines": {
-        "node": ">=12",
-        "npm": ">=6"
+        "node": ">=4",
+        "npm": ">=1.4.28"
      }
    },
    "node_modules/jsonwebtoken/node_modules/jwa": {
      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "license": "MIT",
      "dependencies": {
        "buffer-equal-constant-time": "1.0.1",
        "ecdsa-sig-formatter": "1.0.11",
@@ -27497,24 +27588,12 @@
    },
    "node_modules/jsonwebtoken/node_modules/jws": {
      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "license": "MIT",
      "dependencies": {
        "jwa": "^1.4.1",
        "safe-buffer": "^5.0.1"
      }
    },
-    "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
    "node_modules/jsprim": {
      "version": "1.4.2",
      "license": "MIT",
@@ -27567,6 +27646,16 @@
      "version": "2.6.0",
      "license": "MIT"
    },
+    "node_modules/keytar": {
+      "version": "7.9.0",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-addon-api": "^4.3.0",
+        "prebuild-install": "^7.0.1"
+      }
+    },
    "node_modules/keyv": {
      "version": "4.5.4",
      "license": "MIT",
@@ -27883,8 +27972,7 @@
    },
    "node_modules/lodash.includes": {
      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
+      "license": "MIT"
    },
    "node_modules/lodash.invokemap": {
      "version": "4.6.0",
@@ -27893,8 +27981,7 @@
    },
    "node_modules/lodash.isboolean": {
      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
+      "license": "MIT"
    },
    "node_modules/lodash.isequal": {
      "version": "4.5.0",
@@ -27902,23 +27989,19 @@
    },
    "node_modules/lodash.isinteger": {
      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
+      "license": "MIT"
    },
    "node_modules/lodash.isnumber": {
      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
+      "license": "MIT"
    },
    "node_modules/lodash.isplainobject": {
      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
+      "license": "MIT"
    },
    "node_modules/lodash.isstring": {
      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+      "license": "MIT"
    },
    "node_modules/lodash.memoize": {
      "version": "4.1.2",
@@ -27930,8 +28013,7 @@
    },
    "node_modules/lodash.once": {
      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
+      "license": "MIT"
    },
    "node_modules/lodash.pullall": {
      "version": "4.2.0",
@@ -29444,6 +29526,11 @@
        "node": ">=10"
      }
    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/moment": {
      "version": "2.29.4",
      "license": "MIT",
@@ -29510,6 +29597,16 @@
      "version": "2.1.3",
      "license": "MIT"
    },
+    "node_modules/msal": {
+      "version": "1.4.18",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
    "node_modules/multicast-dns": {
      "version": "7.2.5",
      "dev": true,
@@ -29570,6 +29667,11 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/napi-build-utils": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/native-promise-only": {
      "version": "0.8.1",
      "dev": true,
@@ -29654,12 +29756,58 @@
        "node": ">=12.0.0"
      }
    },
+    "node_modules/node-abi": {
+      "version": "3.60.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/semver": {
+      "version": "7.6.0",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abi/node_modules/yallist": {
+      "version": "4.0.0",
+      "license": "ISC",
+      "optional": true
+    },
    "node_modules/node-abort-controller": {
      "version": "3.1.1",
      "dev": true,
      "license": "MIT",
      "peer": true
    },
+    "node_modules/node-addon-api": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/node-dir": {
      "version": "0.1.17",
      "dev": true,
@@ -30858,6 +31006,80 @@
      "version": "4.2.0",
      "license": "MIT"
    },
+    "node_modules/prebuild-install": {
+      "version": "7.1.2",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "expand-template": "^2.0.3",
+        "github-from-package": "0.0.0",
+        "minimist": "^1.2.3",
+        "mkdirp-classic": "^0.5.3",
+        "napi-build-utils": "^1.0.1",
+        "node-abi": "^3.3.0",
+        "pump": "^3.0.0",
+        "rc": "^1.2.7",
+        "simple-get": "^4.0.0",
+        "tar-fs": "^2.0.0",
+        "tunnel-agent": "^0.6.0"
+      },
+      "bin": {
+        "prebuild-install": "bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/decompress-response": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/prebuild-install/node_modules/simple-get": {
+      "version": "4.0.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^6.0.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
    "node_modules/prelude-ls": {
      "version": "1.2.1",
      "license": "MIT",
@@ -31287,6 +31509,28 @@
      "version": "0.5.1",
      "dev": true
    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "optional": true,
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/re-resizable": {
      "version": "6.9.11",
      "license": "MIT",
@@ -34195,6 +34439,45 @@
        "node": ">=10"
      }
    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/tar/node_modules/chownr": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -36532,6 +36815,13 @@
      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
      "dev": true
    },
+    "node_modules/xpath.js": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
    "node_modules/xtend": {
      "version": "4.0.2",
      "license": "MIT",
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
    "@azure/arm-cosmosdb": "9.1.0",
    "@azure/cosmos": "4.2.0-beta.1",
    "@azure/cosmos-language-service": "0.0.5",
-    "@azure/identity": "4.5.0",
+    "@azure/identity": "1.5.2",
+    "@azure/ms-rest-nodeauth": "3.1.1",
    "@azure/msal-browser": "2.14.2",
    "@babel/plugin-proposal-class-properties": "7.12.1",
    "@babel/plugin-proposal-decorators": "7.12.12",
--- a/preview/.azure/config
+++ b/preview/.azure/config
@@ -1,7 +1,7 @@
 [defaults]
-group = dataexplorer-preview
-sku = P1V2
-appserviceplan = dataexplorer-preview
-location = westus2
-web = dataexplorer-preview
+group = stfaul
+sku = P1v2
+appserviceplan = stfaul_asp_Linux_centralus_0
+location = centralus
+web = cosmos-explorer-preview

--- a/preview/README.md
+++ b/preview/README.md
@@ -4,8 +4,8 @@ Cosmos Explorer Preview makes it possible to try a working version of any commit

 Initial support is for Hosted (Connection string only) or the Azure Portal. Examples:

-Connection string URLs: https://dataexplorer-preview.azurewebsites.net/commit/COMMIT_SHA/hostedExplorer.html
-Portal URLs: https://ms.portal.azure.com/?dataExplorerSource=https://dataexplorer-preview.azurewebsites.net/commit/COMMIT_SHA/explorer.html#home
+Connection string URLs: https://cosmos-explorer-preview.azurewebsites.net/commit/COMMIT_SHA/hostedExplorer.html
+Portal URLs: https://ms.portal.azure.com/?dataExplorerSource=https://cosmos-explorer-preview.azurewebsites.net/commit/COMMIT_SHA/explorer.html#home

 In both cases replace `COMMIT_SHA` with the commit you want to view. It must have already completed its build on GitHub Actions.

--- a/preview/config.json
+++ b/preview/config.json
@@ -1,4 +1,4 @@
 {
  "PROXY_PATH": "/proxy",
-  "msalRedirectURI": "https://dataexplorer-preview.azurewebsites.net/"
+  "msalRedirectURI": "https://cosmos-explorer-preview.azurewebsites.net/"
 }
--- a/preview/index.js
+++ b/preview/index.js
@@ -3,15 +3,8 @@ const { createProxyMiddleware } = require("http-proxy-middleware");
 const port = process.env.PORT || 3000;
 const fetch = require("node-fetch");

-const backendEndpoint = "https://cdb-ms-mpac-pbe.cosmos.azure.com";
-const previewSiteEndpoint = "https://dataexplorer-preview.azurewebsites.net";
-const previewStorageWebsiteEndpoint = "https://dataexplorerpreview.z5.web.core.windows.net/";
-const githubApiUrl = "https://api.github.com/repos/Azure/cosmos-explorer";
-const githubPullRequestUrl = "https://github.com/Azure/cosmos-explorer/pull";
-const azurePortalMpacEndpoint = "https://ms.portal.azure.com/";
-
-const api = createProxyMiddleware({
-  target: backendEndpoint,
+const api = createProxyMiddleware("/api", {
+  target: "https://cdb-ms-mpac-pbe.cosmos.azure.com",
  changeOrigin: true,
  logLevel: "debug",
  bypass: (req, res) => {
@@ -22,8 +15,8 @@ const api = createProxyMiddleware({
  },
 });

-const proxy = createProxyMiddleware({
-  target: backendEndpoint,
+const proxy = createProxyMiddleware("/proxy", {
+  target: "https://cdb-ms-mpac-pbe.cosmos.azure.com",
  changeOrigin: true,
  secure: false,
  logLevel: "debug",
@@ -34,38 +27,35 @@ const proxy = createProxyMiddleware({
  },
 });

-const commit = createProxyMiddleware({
-  target: previewStorageWebsiteEndpoint,
+const commit = createProxyMiddleware("/commit", {
+  target: "https://cosmosexplorerpreview.blob.core.windows.net",
  changeOrigin: true,
  secure: false,
  logLevel: "debug",
-  pathRewrite: { "^/commit": "/" },
+  pathRewrite: { "^/commit": "$web/" },
 });

 const app = express();

-app.use("/api", api);
-app.use("/proxy", proxy);
-app.use("/commit", commit);
+app.use(api);
+app.use(proxy);
+app.use(commit);
 app.get("/pull/:pr(\\d+)", (req, res) => {
  const pr = req.params.pr;
-  if (!/^\d+$/.test(pr)) {
-    return res.status(400).send("Invalid pull request number");
-  }
  const [, query] = req.originalUrl.split("?");
  const search = new URLSearchParams(query);

-  fetch(`${githubApiUrl}/pulls/${pr}`)
+  fetch("https://api.github.com/repos/Azure/cosmos-explorer/pulls/" + pr)
    .then((response) => response.json())
    .then(({ head: { ref, sha } }) => {
-      const prUrl = new URL(`${githubPullRequestUrl}/${pr}`);
+      const prUrl = new URL("https://github.com/Azure/cosmos-explorer/pull/" + pr);
      prUrl.hash = ref;
      search.set("feature.pr", prUrl.href);

-      const explorer = new URL(`${previewSiteEndpoint}/commit/${sha}/explorer.html`);
+      const explorer = new URL("https://cosmos-explorer-preview.azurewebsites.net/commit/" + sha + "/explorer.html");
      explorer.search = search.toString();

-      const portal = new URL(azurePortalMpacEndpoint);
+      const portal = new URL("https://ms.portal.azure.com/");
      portal.searchParams.set("dataExplorerSource", explorer.href);

      return res.redirect(portal.href);
@@ -73,10 +63,12 @@ app.get("/pull/:pr(\\d+)", (req, res) => {
    .catch(() => res.sendStatus(500));
 });
 app.get("/", (req, res) => {
-  fetch(`${githubApiUrl}/branches/master`)
+  fetch("https://api.github.com/repos/Azure/cosmos-explorer/branches/master")
    .then((response) => response.json())
    .then(({ commit: { sha } }) => {
-      const explorer = new URL(`${previewSiteEndpoint}/commit/${sha}/hostedExplorer.html`);
+      const explorer = new URL(
+        "https://cosmos-explorer-preview.azurewebsites.net/commit/" + sha + "/hostedExplorer.html"
+      );
      return res.redirect(explorer.href);
    })
    .catch(() => res.sendStatus(500));
--- a/preview/package-lock.json
+++ b/preview/package-lock.json
--- a/preview/package.json
+++ b/preview/package.json
@@ -4,7 +4,7 @@
  "description": "",
  "main": "index.js",
  "scripts": {
-    "deploy": "az webapp up --name \"dataexplorer-preview\" --subscription \"cosmosdb-portalteam-runners\" --resource-group \"dataexplorer-preview\" --runtime \"NODE:18-lts\" --sku P1V2",
+    "deploy": "az webapp up --name \"cosmos-explorer-preview\" --subscription \"cosmosdb-portalteam-generaltest-msft\" --resource-group \"stfaul\"",
    "start": "node index.js",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
@@ -12,8 +12,7 @@
  "author": "Microsoft Corporation",
  "dependencies": {
    "express": "^4.17.1",
-    "http-proxy-middleware": "^3.0.3",
-    "node": "^18.20.6",
+    "http-proxy-middleware": "^1.1.0",
    "node-fetch": "^2.6.1"
  }
-}
+}
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -97,12 +97,6 @@ export enum CapacityMode {
  Serverless = "Serverless",
 }

-export enum WorkloadType {
-  Learning = "Learning",
-  DevelopmentTesting = "Development/Testing",
-  Production = "Production",
-  None = "None",
-}
 // flight names returned from the portal are always lowercase
 export class Flights {
  public static readonly SettingsV2 = "settingsv2";
@@ -125,7 +119,6 @@ export class AfecFeatures {

 export class TagNames {
  public static defaultExperience: string = "defaultExperience";
-  public static WorkloadType: string = "hidden-workload-type";
 }

 export class MongoDBAccounts {
@@ -525,11 +518,6 @@ export class PriorityLevel {
  public static readonly Default = "low";
 }

-export class ariaLabelForLearnMoreLink {
-  public static readonly AnalyticalStore = "Learn more about analytical store.";
-  public static readonly AzureSynapseLink = "Learn more about Azure Synapse Link.";
-}
-
 export const QueryCopilotSampleDatabaseId = "CopilotSampleDB";
 export const QueryCopilotSampleContainerId = "SampleContainer";

--- a/src/Common/DatabaseAccountUtility.test.ts
+++ b/src/Common/DatabaseAccountUtility.test.ts
@@ -1,34 +0,0 @@
-import { WorkloadType } from "Common/Constants";
-import { getWorkloadType } from "Common/DatabaseAccountUtility";
-import { DatabaseAccount, Tags } from "Contracts/DataModels";
-import { updateUserContext } from "UserContext";
-
-describe("Database Account Utility", () => {
-  describe("Workload Type", () => {
-    beforeEach(() => {
-      updateUserContext({
-        databaseAccount: {
-          tags: {} as Tags,
-        } as DatabaseAccount,
-      });
-    });
-
-    it("Workload Type should return Learning", () => {
-      updateUserContext({
-        databaseAccount: {
-          tags: {
-            "hidden-workload-type": WorkloadType.Learning,
-          } as Tags,
-        } as DatabaseAccount,
-      });
-
-      const workloadType: WorkloadType = getWorkloadType();
-      expect(workloadType).toBe(WorkloadType.Learning);
-    });
-
-    it("Workload Type should return None", () => {
-      const workloadType: WorkloadType = getWorkloadType();
-      expect(workloadType).toBe(WorkloadType.None);
-    });
-  });
-});
--- a/src/Common/DatabaseAccountUtility.ts
+++ b/src/Common/DatabaseAccountUtility.ts
@@ -1,5 +1,3 @@
-import { TagNames, WorkloadType } from "Common/Constants";
-import { Tags } from "Contracts/DataModels";
 import { userContext } from "../UserContext";

 function isVirtualNetworkFilterEnabled() {
@@ -17,12 +15,3 @@ function isPrivateEndpointConnectionsEnabled() {
 export function isPublicInternetAccessAllowed(): boolean {
  return !isVirtualNetworkFilterEnabled() && !isIpRulesEnabled() && !isPrivateEndpointConnectionsEnabled();
 }
-
-export function getWorkloadType(): WorkloadType {
-  const tags: Tags = userContext?.databaseAccount?.tags;
-  const workloadType: WorkloadType = tags && (tags[TagNames.WorkloadType] as WorkloadType);
-  if (!workloadType) {
-    return WorkloadType.None;
-  }
-  return workloadType;
-}
--- a/src/Common/IteratorUtilities.ts
+++ b/src/Common/IteratorUtilities.ts
@@ -1,4 +1,4 @@
-import { QueryOperationOptions } from "@azure/cosmos";
+// import { QueryOperationOptions } from "@azure/cosmos";
 import { QueryResults } from "../Contracts/ViewModels";

 interface QueryResponse {
@@ -11,17 +11,13 @@ interface QueryResponse {
 }

 export interface MinimalQueryIterator {
-  fetchNext: (queryOperationOptions?: QueryOperationOptions) => Promise<QueryResponse>;
+  fetchNext: () => Promise<QueryResponse>;
 }

 // Pick<QueryIterator<any>, "fetchNext">;

-export function nextPage(
-  documentsIterator: MinimalQueryIterator,
-  firstItemIndex: number,
-  queryOperationOptions?: QueryOperationOptions,
-): Promise<QueryResults> {
-  return documentsIterator.fetchNext(queryOperationOptions).then((response) => {
+export function nextPage(documentsIterator: MinimalQueryIterator, firstItemIndex: number): Promise<QueryResults> {
+  return documentsIterator.fetchNext().then((response) => {
    const documents = response.resources;
    // eslint-disable-next-line @typescript-eslint/no-explicit-any
    const headers = (response as any).headers || {}; // TODO this is a private key. Remove any
--- a/src/Common/dataAccess/queryDocumentsPage.ts
+++ b/src/Common/dataAccess/queryDocumentsPage.ts
@@ -1,4 +1,4 @@
-import { QueryOperationOptions } from "@azure/cosmos";
+// import { QueryOperationOptions } from "@azure/cosmos";
 import { QueryResults } from "../../Contracts/ViewModels";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { getEntityName } from "../DocumentUtility";
@@ -9,13 +9,13 @@ export const queryDocumentsPage = async (
  resourceName: string,
  documentsIterator: MinimalQueryIterator,
  firstItemIndex: number,
-  queryOperationOptions?: QueryOperationOptions,
+  // queryOperationOptions?: QueryOperationOptions,
 ): Promise<QueryResults> => {
  const entityName = getEntityName();
  const clearMessage = logConsoleProgress(`Querying ${entityName} for container ${resourceName}`);

  try {
-    const result: QueryResults = await nextPage(documentsIterator, firstItemIndex, queryOperationOptions);
+    const result: QueryResults = await nextPage(documentsIterator, firstItemIndex);
    const itemCount = (result.documents && result.documents.length) || 0;
    logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
    return result;
--- a/src/ConfigContext.ts
+++ b/src/ConfigContext.ts
@@ -91,7 +91,7 @@ let configContext: Readonly<ConfigContext> = {
    `^https:\\/\\/.*\\.analysis-df\\.net$`,
    `^https:\\/\\/.*\\.analysis-df\\.windows\\.net$`,
    `^https:\\/\\/.*\\.azure-test\\.net$`,
-    `^https:\\/\\/dataexplorer-preview\\.azurewebsites\\.net$`,
+    `^https:\\/\\/cosmos-explorer-preview\\.azurewebsites\\.net$`,
  ], // Webpack injects this at build time
  gitSha: process.env.GIT_SHA,
  hostedExplorerURL: "https://cosmos.azure.com/",
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -6,7 +6,6 @@ export interface ArmEntity {
  location: string;
  type: string;
  kind: string;
-  tags?: Tags;
 }

 export interface DatabaseAccount extends ArmEntity {
@@ -664,5 +663,3 @@ export interface FeatureRegistration {
    state: string;
  };
 }
-
-export type Tags = { [key: string]: string };
--- a/src/Contracts/MessageTypes.ts
+++ b/src/Contracts/MessageTypes.ts
@@ -41,7 +41,7 @@ export enum MessageTypes {
  OpenPostgreSQLPasswordReset,
  OpenPostgresNetworkingBlade,
  OpenCosmosDBNetworkingBlade,
-  DisplayNPSSurvey, // unused
+  DisplayNPSSurvey,
  OpenVCoreMongoNetworkingBlade,
  OpenVCoreMongoConnectionStringsBlade,
  GetAuthorizationToken, // unused. Can be removed if the portal uses the same list of enums.
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/PartitionKeyComponent.tsx
@@ -14,7 +14,6 @@ import * as ViewModels from "../../../../Contracts/ViewModels";

 import { handleError } from "Common/ErrorHandlingUtils";
 import { cancelDataTransferJob, pollDataTransferJob } from "Common/dataAccess/dataTransfers";
-import { Platform, configContext } from "ConfigContext";
 import Explorer from "Explorer/Explorer";
 import { ChangePartitionKeyPane } from "Explorer/Panes/ChangePartitionKeyPane/ChangePartitionKeyPane";
 import {
@@ -178,14 +177,12 @@ export const PartitionKeyComponent: React.FC<PartitionKeyComponentProps> = ({ da
        To change the partition key, a new destination container must be created or an existing destination container
        selected. Data will then be copied to the destination container.
      </Text>
-      {configContext.platform !== Platform.Emulator && (
-        <PrimaryButton
-          styles={{ root: { width: "fit-content" } }}
-          text="Change"
-          onClick={startPartitionkeyChangeWorkflow}
-          disabled={isCurrentJobInProgress(portalDataTransferJob)}
-        />
-      )}
+      <PrimaryButton
+        styles={{ root: { width: "fit-content" } }}
+        text="Change"
+        onClick={startPartitionkeyChangeWorkflow}
+        disabled={isCurrentJobInProgress(portalDataTransferJob)}
+      />
      {portalDataTransferJob && (
        <Stack>
          <Text styles={textHeadingStyle}>{partitionKeyName} change job</Text>
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx
@@ -17,13 +17,14 @@ import {
 } from "@fluentui/react";
 import React from "react";
 import * as DataModels from "../../../../../Contracts/DataModels";
+import { SubscriptionType } from "../../../../../Contracts/SubscriptionType";
 import * as SharedConstants from "../../../../../Shared/Constants";
 import { Action, ActionModifiers } from "../../../../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../../../UserContext";
 import * as AutoPilotUtils from "../../../../../Utils/AutoPilotUtils";
 import { autoPilotThroughput1K } from "../../../../../Utils/AutoPilotUtils";
-import { calculateEstimateNumber } from "../../../../../Utils/PricingUtils";
+import { calculateEstimateNumber, usageInGB } from "../../../../../Utils/PricingUtils";
 import { Int32 } from "../../../../Panes/Tables/Validators/EntityPropertyValidationCommon";
 import {
  PriceBreakdown,
@@ -365,6 +366,29 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
    });
  };

+  private minRUperGBSurvey = (): JSX.Element => {
+    const href = `https://ncv.microsoft.com/vRBTO37jmO?ctx={"AzureSubscriptionId":"${userContext.subscriptionId}","CosmosDBAccountName":"${userContext.databaseAccount?.name}"}`;
+    const oneTBinKB = 1000000000;
+    const minRUperGB = 10;
+    const featureFlagEnabled = userContext.features.showMinRUSurvey;
+    const collectionIsEligible =
+      userContext.subscriptionType !== SubscriptionType.Internal &&
+      this.props.usageSizeInKB > oneTBinKB &&
+      this.props.minimum >= usageInGB(this.props.usageSizeInKB) * minRUperGB;
+    if (featureFlagEnabled || collectionIsEligible) {
+      return (
+        <Text>
+          Need to scale below {this.props.minimum} RU/s? Reach out by filling{" "}
+          <a target="_blank" rel="noreferrer" href={href}>
+            this questionnaire
+          </a>
+          .
+        </Text>
+      );
+    }
+    return undefined;
+  };
+
  private renderThroughputModeChoices = (): JSX.Element => {
    const labelId = "settingsV2RadioButtonLabelId";
    return (
@@ -637,6 +661,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
              </Link>
            </Text>
          )}
+          {this.minRUperGBSurvey()}
          {this.props.spendAckVisible && (
            <Checkbox
              id="spendAckCheckBox"
--- a/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
+++ b/src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx
@@ -1,5 +1,4 @@
 import { Checkbox, DirectionalHint, Link, Stack, Text, TextField, TooltipHost } from "@fluentui/react";
-import { getWorkloadType } from "Common/DatabaseAccountUtility";
 import { useDatabases } from "Explorer/useDatabases";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as Constants from "../../../Common/Constants";
@@ -35,15 +34,10 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
  setIsThroughputCapExceeded,
  onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
-  const defaultThroughput: number =
-    isFreeTier ||
-    isQuickstart ||
-    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(getWorkloadType())
-      ? AutoPilotUtils.autoPilotThroughput1K
-      : AutoPilotUtils.autoPilotThroughput4K;
-
  const [isAutoscaleSelected, setIsAutoScaleSelected] = useState<boolean>(true);
-  const [throughput, setThroughput] = useState<number>(defaultThroughput);
+  const [throughput, setThroughput] = useState<number>(
+    isFreeTier || isQuickstart ? AutoPilotUtils.autoPilotThroughput1K : AutoPilotUtils.autoPilotThroughput4K,
+  );
  const [isCostAcknowledged, setIsCostAcknowledged] = useState<boolean>(false);
  const [throughputError, setThroughputError] = useState<string>("");
  const [totalThroughputUsed, setTotalThroughputUsed] = useState<number>(0);
@@ -53,6 +47,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({

  const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
  const numberOfRegions = userContext.databaseAccount?.properties.locations?.length || 1;
+
  useEffect(() => {
    // throughput cap check for the initial state
    let totalThroughput = 0;
@@ -162,6 +157,9 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({

  const handleOnChangeMode = (event: React.ChangeEvent<HTMLInputElement>, mode: string): void => {
    if (mode === "Autoscale") {
+      const defaultThroughput = isFreeTier
+        ? AutoPilotUtils.autoPilotThroughput1K
+        : AutoPilotUtils.autoPilotThroughput4K;
      setThroughput(defaultThroughput);
      setIsAutoScaleSelected(true);
      setThroughputValue(defaultThroughput);
--- a/src/Explorer/Explorer.tsx
+++ b/src/Explorer/Explorer.tsx
@@ -35,7 +35,7 @@ import { PhoenixClient } from "../Phoenix/PhoenixClient";
 import * as ExplorerSettings from "../Shared/ExplorerSettings";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
-import { updateUserContext, userContext } from "../UserContext";
+import { isAccountNewerThanThresholdInMs, updateUserContext, userContext } from "../UserContext";
 import { getCollectionName, getUploadName } from "../Utils/APITypeUtils";
 import { stringToBlob } from "../Utils/BlobUtils";
 import { isCapabilityEnabled } from "../Utils/CapabilityUtils";
@@ -278,6 +278,37 @@ export default class Explorer {
    }
  }

+  public openNPSSurveyDialog(): void {
+    if (!Platform.Portal || !["Postgres", "SQL", "Mongo"].includes(userContext.apiType)) {
+      return;
+    }
+
+    const ONE_DAY_IN_MS = 86400000;
+    const SEVEN_DAYS_IN_MS = 604800000;
+
+    // Try Cosmos DB subscription - survey shown to 100% of users at day 1 in Data Explorer.
+    if (userContext.isTryCosmosDBSubscription) {
+      if (isAccountNewerThanThresholdInMs(userContext.databaseAccount?.systemData?.createdAt || "", ONE_DAY_IN_MS)) {
+        Logger.logInfo(
+          `Sending message to Portal to check if NPS Survey can be displayed in Try Cosmos DB ${userContext.apiType}`,
+          "Explorer/openNPSSurveyDialog",
+        );
+        sendMessage({ type: MessageTypes.DisplayNPSSurvey });
+      }
+    } else {
+      // Show survey when an existing account is older than 7 days
+      if (
+        !isAccountNewerThanThresholdInMs(userContext.databaseAccount?.systemData?.createdAt || "", SEVEN_DAYS_IN_MS)
+      ) {
+        Logger.logInfo(
+          `Sending message to Portal to check if NPS Survey can be displayed for existing ${userContext.apiType} account older than 7 days`,
+          "Explorer/openNPSSurveyDialog",
+        );
+        sendMessage({ type: MessageTypes.DisplayNPSSurvey });
+      }
+    }
+  }
+
  public async openCESCVAFeedbackBlade(): Promise<void> {
    sendMessage({ type: MessageTypes.OpenCESCVAFeedbackBlade });
    Logger.logInfo(
--- a/src/Explorer/Panes/AddCollectionPanel.tsx
+++ b/src/Explorer/Panes/AddCollectionPanel.tsx
@@ -865,7 +865,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                    <Link
                      href="https://aka.ms/cosmosdb-synapselink"
                      target="_blank"
-                      aria-label={Constants.ariaLabelForLearnMoreLink.AzureSynapseLink}
                      className="capacitycalculator-link"
                    >
                      Learn more
@@ -1223,11 +1222,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
      <Text variant="small">
        Enable analytical store capability to perform near real-time analytics on your operational data, without
        impacting the performance of transactional workloads.{" "}
-        <Link
-          aria-label={Constants.ariaLabelForLearnMoreLink.AnalyticalStore}
-          target="_blank"
-          href="https://aka.ms/analytical-store-overview"
-        >
+        <Link target="_blank" href="https://aka.ms/analytical-store-overview">
          Learn more
        </Link>
      </Text>
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -174,26 +174,15 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
  const styles = useStyles();

  const explorerVersion = configContext.gitSha;
-  const isEmulator = configContext.platform === Platform.Emulator;
  const shouldShowQueryPageOptions = userContext.apiType === "SQL";
-  const showRetrySettings =
-    (userContext.apiType === "SQL" || userContext.apiType === "Tables" || userContext.apiType === "Gremlin") &&
-    !isEmulator;
-  const shouldShowGraphAutoVizOption = userContext.apiType === "Gremlin" && !isEmulator;
-  const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin" && !isEmulator;
-  const shouldShowParallelismOption = userContext.apiType !== "Gremlin" && !isEmulator;
-  const showEnableEntraIdRbac =
-    userContext.apiType === "SQL" &&
-    userContext.authType === AuthType.AAD &&
-    configContext.platform !== Platform.Fabric &&
-    !isEmulator;
-  const shouldShowPriorityLevelOption = PriorityBasedExecutionUtils.isFeatureEnabled() && !isEmulator;
+  const shouldShowGraphAutoVizOption = userContext.apiType === "Gremlin";
+  const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin";
+  const shouldShowParallelismOption = userContext.apiType !== "Gremlin";
+  const shouldShowPriorityLevelOption = PriorityBasedExecutionUtils.isFeatureEnabled();
  const shouldShowCopilotSampleDBOption =
    userContext.apiType === "SQL" &&
    useQueryCopilot.getState().copilotEnabled &&
-    useDatabases.getState().sampleDataResourceTokenCollection &&
-    !isEmulator;
-
+    useDatabases.getState().sampleDataResourceTokenCollection;
  const handlerOnSubmit = async () => {
    setIsExecuting(true);

@@ -502,7 +491,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
  return (
    <RightPaneForm {...genericPaneProps}>
      <div className={`paneMainContent ${styles.container}`}>
-        <Accordion className={`customAccordion ${styles.firstItem}`}>
+        <Accordion className={styles.firstItem}>
          {shouldShowQueryPageOptions && (
            <AccordionItem value="1">
              <AccordionHeader>
@@ -552,37 +541,39 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
              </AccordionPanel>
            </AccordionItem>
          )}
-          {showEnableEntraIdRbac && (
-            <AccordionItem value="2">
-              <AccordionHeader>
-                <div className={styles.header}>Enable Entra ID RBAC</div>
-              </AccordionHeader>
-              <AccordionPanel>
-                <div className={styles.settingsSectionContainer}>
-                  <div className={styles.settingsSectionDescription}>
-                    Choose Automatic to enable Entra ID RBAC automatically. True/False to force enable/disable Entra ID
-                    RBAC.
-                    <a
-                      href="https://learn.microsoft.com/en-us/azure/cosmos-db/how-to-setup-rbac#use-data-explorer"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                    >
-                      {" "}
-                      Learn more{" "}
-                    </a>
+          {userContext.apiType === "SQL" &&
+            userContext.authType === AuthType.AAD &&
+            configContext.platform !== Platform.Fabric && (
+              <AccordionItem value="2">
+                <AccordionHeader>
+                  <div className={styles.header}>Enable Entra ID RBAC</div>
+                </AccordionHeader>
+                <AccordionPanel>
+                  <div className={styles.settingsSectionContainer}>
+                    <div className={styles.settingsSectionDescription}>
+                      Choose Automatic to enable Entra ID RBAC automatically. True/False to force enable/disable Entra
+                      ID RBAC.
+                      <a
+                        href="https://learn.microsoft.com/en-us/azure/cosmos-db/how-to-setup-rbac#use-data-explorer"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        {" "}
+                        Learn more{" "}
+                      </a>
+                    </div>
+                    <ChoiceGroup
+                      ariaLabelledBy="enableDataPlaneRBACOptions"
+                      options={dataPlaneRBACOptionsList}
+                      styles={choiceButtonStyles}
+                      selectedKey={enableDataPlaneRBACOption}
+                      onChange={handleOnDataPlaneRBACOptionChange}
+                    />
                  </div>
-                  <ChoiceGroup
-                    ariaLabelledBy="enableDataPlaneRBACOptions"
-                    options={dataPlaneRBACOptionsList}
-                    styles={choiceButtonStyles}
-                    selectedKey={enableDataPlaneRBACOption}
-                    onChange={handleOnDataPlaneRBACOptionChange}
-                  />
-                </div>
-              </AccordionPanel>
-            </AccordionItem>
-          )}
-          {userContext.apiType === "SQL" && !isEmulator && (
+                </AccordionPanel>
+              </AccordionItem>
+            )}
+          {userContext.apiType === "SQL" && (
            <>
              <AccordionItem value="3">
                <AccordionHeader>
@@ -680,7 +671,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
              </AccordionItem>
            </>
          )}
-          {showRetrySettings && (
+          {(userContext.apiType === "SQL" || userContext.apiType === "Tables" || userContext.apiType === "Gremlin") && (
            <AccordionItem value="6">
              <AccordionHeader>
                <div className={styles.header}>Retry Settings</div>
@@ -753,30 +744,29 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
              </AccordionPanel>
            </AccordionItem>
          )}
-          {!isEmulator && (
-            <AccordionItem value="7">
-              <AccordionHeader>
-                <div className={styles.header}>Enable container pagination</div>
-              </AccordionHeader>
-              <AccordionPanel>
-                <div className={styles.settingsSectionContainer}>
-                  <div className={styles.settingsSectionDescription}>
-                    Load 50 containers at a time. Currently, containers are not pulled in alphanumeric order.
-                  </div>
-                  <Checkbox
-                    styles={{
-                      label: { padding: 0 },
-                    }}
-                    className="padding"
-                    ariaLabel="Enable container pagination"
-                    checked={containerPaginationEnabled}
-                    onChange={() => setContainerPaginationEnabled(!containerPaginationEnabled)}
-                    label="Enable container pagination"
-                  />
+
+          <AccordionItem value="7">
+            <AccordionHeader>
+              <div className={styles.header}>Enable container pagination</div>
+            </AccordionHeader>
+            <AccordionPanel>
+              <div className={styles.settingsSectionContainer}>
+                <div className={styles.settingsSectionDescription}>
+                  Load 50 containers at a time. Currently, containers are not pulled in alphanumeric order.
                </div>
-              </AccordionPanel>
-            </AccordionItem>
-          )}
+                <Checkbox
+                  styles={{
+                    label: { padding: 0 },
+                  }}
+                  className="padding"
+                  ariaLabel="Enable container pagination"
+                  checked={containerPaginationEnabled}
+                  onChange={() => setContainerPaginationEnabled(!containerPaginationEnabled)}
+                  label="Enable container pagination"
+                />
+              </div>
+            </AccordionPanel>
+          </AccordionItem>
          {shouldShowCrossPartitionOption && (
            <AccordionItem value="8">
              <AccordionHeader>
--- a/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
+++ b/src/Explorer/Panes/SettingsPane/snapshots/SettingsPane.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`Settings Pane should render Default properly 1`] = `
    className="paneMainContent ___133e6fg_0000000 f22iagw f1vx9l62 f1l02sjl"
  >
    <Accordion
-      className="customAccordion ___1uf6361_0000000 fz7g6wx"
+      className="___1uf6361_0000000 fz7g6wx"
    >
      <AccordionItem
        value="1"
@@ -572,7 +572,7 @@ exports[`Settings Pane should render Gremlin properly 1`] = `
    className="paneMainContent ___133e6fg_0000000 f22iagw f1vx9l62 f1l02sjl"
  >
    <Accordion
-      className="customAccordion ___1uf6361_0000000 fz7g6wx"
+      className="___1uf6361_0000000 fz7g6wx"
    >
      <AccordionItem
        value="6"
--- a/src/Explorer/Panes/snapshots/AddCollectionPanel.test.tsx.snap
+++ b/src/Explorer/Panes/snapshots/AddCollectionPanel.test.tsx.snap
@@ -319,7 +319,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          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"
          >
@@ -384,7 +383,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
          . Enable Synapse Link for this Cosmos DB account.
           
          <StyledLinkBase
-            aria-label="Learn more about Azure Synapse Link."
            className="capacitycalculator-link"
            href="https://aka.ms/cosmosdb-synapselink"
            target="_blank"
--- a/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
+++ b/src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx
@@ -75,7 +75,6 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
  const inputEdited = useRef(false);
  const itemRefs = useRef([]);
  const searchInputRef = useRef(null);
-  const copyQueryRef = useRef(null);
  const {
    openFeedbackModal,
    hideFeedbackModalForLikedQueries,
@@ -133,7 +132,6 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
    document.body.removeChild(queryElement);

    setshowCopyPopup(true);
-    copyQueryRef.current.focus();
    setTimeout(() => {
      setshowCopyPopup(false);
    }, 6000);
@@ -307,7 +305,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
    if (isGeneratingQuery === null) {
      return " ";
    } else if (isGeneratingQuery) {
-      return "Thinking";
+      return "Content is loading";
    } else {
      return "Content is updated";
    }
@@ -402,7 +400,6 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
                  <IconButton
                    iconProps={{ iconName: "Send" }}
                    disabled={isGeneratingQuery || !userPrompt.trim()}
-                    allowDisabledFocus={true}
                    style={{ background: "none" }}
                    onClick={() => startGenerateQueryProcess()}
                    aria-label="Send"
@@ -679,7 +676,6 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
                  )}
                  <CommandBarButton
                    className="copyQuery"
-                    elementRef={copyQueryRef}
                    onClick={copyGeneratedCode}
                    iconProps={{ iconName: "Copy" }}
                    style={{ fontSize: 12, transition: "background-color 0.3s ease", height: "100%" }}
@@ -710,9 +706,6 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
              )}
            </Stack>
          )}
-          {(showFeedbackBar || isGeneratingQuery) && (
-            <span role="alert" className="screenReaderOnly" aria-label={getAriaLabel()} />
-          )}
          {isGeneratingQuery && (
            <ProgressIndicator
              label="Thinking..."
--- a/src/Explorer/Sidebar.tsx
+++ b/src/Explorer/Sidebar.tsx
@@ -26,7 +26,7 @@ import { getCollectionName, getDatabaseName } from "Utils/APITypeUtils";
 import { Allotment, AllotmentHandle } from "allotment";
 import { useSidePanel } from "hooks/useSidePanel";
 import { debounce } from "lodash";
-import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";

 const useSidebarStyles = makeStyles({
  sidebar: {
@@ -109,7 +109,6 @@ interface GlobalCommand {
  icon: JSX.Element;
  onClick: () => void;
  keyboardAction?: KeyboardAction;
-  ref?: React.RefObject<HTMLButtonElement>;
 }

 const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
@@ -119,7 +118,6 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
  // However, that messes with the Menu positioning, so we need to get a reference to the 'div' to pass to the Menu.
  // We can't use a ref though, because it would be set after the Menu is rendered, so we use a state value to force a re-render.
  const [globalCommandButton, setGlobalCommandButton] = useState<HTMLElement | null>(null);
-  const primaryFocusableRef = useRef<HTMLButtonElement>(null);

  const actions = useMemo<GlobalCommand[]>(() => {
    if (
@@ -179,16 +177,6 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
    );
  }, [actions, setKeyboardActions]);

-  useLayoutEffect(() => {
-    if (primaryFocusableRef.current) {
-      const timer = setTimeout(() => {
-        primaryFocusableRef.current.focus();
-      }, 0);
-      return () => clearTimeout(timer);
-    }
-    return undefined;
-  }, []);
-
  if (!primaryAction) {
    return null;
  }
@@ -196,7 +184,7 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
  return (
    <div className={styles.globalCommandsContainer} data-test="GlobalCommands">
      {actions.length === 1 ? (
-        <Button icon={primaryAction.icon} onClick={onPrimaryActionClick} ref={primaryFocusableRef}>
+        <Button icon={primaryAction.icon} onClick={onPrimaryActionClick}>
          {primaryAction.label}
        </Button>
      ) : (
@@ -206,7 +194,7 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
              <div ref={setGlobalCommandButton}>
                <SplitButton
                  menuButton={{ ...triggerProps, "aria-label": "More commands" }}
-                  primaryActionButton={{ onClick: onPrimaryActionClick, ref: primaryFocusableRef }}
+                  primaryActionButton={{ onClick: onPrimaryActionClick }}
                  className={styles.globalCommandsSplitButton}
                  icon={primaryAction.icon}
                >
--- a/src/Explorer/SplashScreen/SplashScreenButton.tsx
+++ b/src/Explorer/SplashScreen/SplashScreenButton.tsx
@@ -39,7 +39,7 @@ export const SplashScreenButton: React.FC<SplashScreenButtonProps> = ({
      role="button"
    >
      <div>
-        <img src={imgSrc} alt={title} aria-hidden="true" />
+        <img src={imgSrc} />
      </div>
      <Stack style={{ marginLeft: 16 }}>
        <Text style={{ fontSize: 18, fontWeight: 600 }}>{title}</Text>
--- a/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-console */
-import { FeedOptions, QueryOperationOptions } from "@azure/cosmos";
+import { FeedOptions } from "@azure/cosmos";
 import QueryError, { createMonacoErrorLocationResolver, createMonacoMarkersForQueryErrors } from "Common/QueryError";
 import { SplitterDirection } from "Common/Splitter";
 import { Platform, configContext } from "ConfigContext";
@@ -18,7 +18,7 @@ import { CosmosFluentProvider } from "Explorer/Theme/ThemeUtil";
 import { useSelectedNode } from "Explorer/useSelectedNode";
 import { KeyboardAction } from "KeyboardShortcuts";
 import { QueryConstants } from "Shared/Constants";
-import { LocalStorageUtility, StorageKey, getRUThreshold, ruThresholdEnabled } from "Shared/StorageUtility";
+import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { Allotment } from "allotment";
 import { QueryCopilotState, useQueryCopilot } from "hooks/useQueryCopilot";
@@ -368,19 +368,19 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
      isExecutionError: false,
    });

-    let queryOperationOptions: QueryOperationOptions;
-    if (userContext.apiType === "SQL" && ruThresholdEnabled()) {
-      const ruThreshold: number = getRUThreshold();
-      queryOperationOptions = {
-        ruCapPerOperation: ruThreshold,
-      } as QueryOperationOptions;
-    }
+    // let queryOperationOptions: QueryOperationOptions;
+    // if (userContext.apiType === "SQL" && ruThresholdEnabled()) {
+    //   const ruThreshold: number = getRUThreshold();
+    //   queryOperationOptions = {
+    //     ruCapPerOperation: ruThreshold,
+    //   } as QueryOperationOptions;
+    // }
    const queryDocuments = async (firstItemIndex: number) =>
      await queryDocumentsPage(
        this.props.collection && this.props.collection.id(),
        this._iterator,
        firstItemIndex,
-        queryOperationOptions,
+        // queryOperationOptions,
      );
    this.props.tabsBaseInstance.isExecuting(true);
    this.setState({
--- a/src/Explorer/Tabs/Tabs.tsx
+++ b/src/Explorer/Tabs/Tabs.tsx
@@ -203,7 +203,7 @@ const CloseButton = ({
    onKeyPress={({ nativeEvent: e }) => (tab ? tab.onKeyPressClose(undefined, e) : onKeyPressReactTabClose(e, tabKind))}
  >
    <span className="tabIcon close-Icon">
-      <img src={errorIcon} title="Close" alt="Close" aria-label="hidden" />
+      <img src={errorIcon} title="Close" alt="Close" role="none" />
    </span>
  </span>
 );
--- a/src/GalleryViewer/GalleryViewer.tsx
+++ b/src/GalleryViewer/GalleryViewer.tsx
@@ -1,4 +1,4 @@
-import { initializeIcons, Link, Text } from "@fluentui/react";
+import { Link, Text } from "@fluentui/react";
 import "bootstrap/dist/css/bootstrap.css";
 import * as React from "react";
 import * as ReactDOM from "react-dom";
@@ -20,7 +20,7 @@ const createAccountUrl = "https://aka.ms/cosmos-create-account-portal";
 const onInit = async () => {
  const dataExplorerUrl = new URL("./", window.location.href).href;

-  initializeIcons();
+  // initializeIcons();
  await initializeConfiguration();
  const galleryViewerProps = GalleryUtils.getGalleryViewerProps(window.location.search);

--- a/src/HostedExplorer.tsx
+++ b/src/HostedExplorer.tsx
@@ -1,4 +1,4 @@
-import { initializeIcons } from "@fluentui/react";
+// import { initializeIcons } from "@fluentui/react";
 import { useBoolean } from "@fluentui/react-hooks";
 import { AadAuthorizationFailure } from "Platform/Hosted/Components/AadAuthorizationFailure";
 import * as React from "react";
@@ -22,7 +22,7 @@ import { useAADAuth } from "./hooks/useAADAuth";
 import { useConfig } from "./hooks/useConfig";
 import { useTokenMetadata } from "./hooks/usePortalAccessToken";

-initializeIcons();
+// initializeIcons();

 const App: React.FunctionComponent = () => {
  // For handling encrypted portal tokens sent via query paramter
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -2,7 +2,7 @@
 import "./ReactDevTools";

 // CSS Dependencies
-import { initializeIcons, loadTheme } from "@fluentui/react";
+import { loadTheme } from "@fluentui/react";
 import { QuickstartCarousel } from "Explorer/Quickstart/QuickstartCarousel";
 import { MongoQuickstartTutorial } from "Explorer/Quickstart/Tutorials/MongoQuickstartTutorial";
 import { SQLQuickstartTutorial } from "Explorer/Quickstart/Tutorials/SQLQuickstartTutorial";
@@ -62,7 +62,7 @@ import "./Shared/appInsights";
 import { useConfig } from "./hooks/useConfig";
 import { useKnockoutExplorer } from "./hooks/useKnockoutExplorer";

-initializeIcons();
+// initializeIcons();

 const App: React.FunctionComponent = () => {
  const isCarouselOpen = useCarousel((state) => state.shouldOpen);
--- a/src/NotebookViewer/NotebookViewer.tsx
+++ b/src/NotebookViewer/NotebookViewer.tsx
@@ -1,4 +1,4 @@
-import { initializeIcons } from "@fluentui/react";
+// import { initializeIcons } from "@fluentui/react";
 import "bootstrap/dist/css/bootstrap.css";
 import React from "react";
 import * as ReactDOM from "react-dom";
@@ -14,7 +14,7 @@ import { IGalleryItem, JunoClient } from "../Juno/JunoClient";
 import * as GalleryUtils from "../Utils/GalleryUtils";

 const onInit = async () => {
-  initializeIcons();
+  // initializeIcons();
  await initializeConfiguration();
  const galleryViewerProps = GalleryUtils.getGalleryViewerProps(window.location.search);
  const notebookViewerProps = GalleryUtils.getNotebookViewerProps(window.location.search);
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -38,6 +38,7 @@ export type Features = {
  readonly copilotChatFixedMonacoEditorHeight: boolean;
  readonly enablePriorityBasedExecution: boolean;
  readonly disableConnectionStringLogin: boolean;
+  readonly restoreTabs: boolean;

  // can be set via both flight and feature flag
  autoscaleDefault: boolean;
@@ -108,6 +109,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
    enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
    disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
+    restoreTabs: "true" === get("restoretabs"),
  };
 }

--- a/src/SelfServe/SelfServe.tsx
+++ b/src/SelfServe/SelfServe.tsx
@@ -1,4 +1,4 @@
-import { initializeIcons, Spinner, SpinnerSize } from "@fluentui/react";
+import { Spinner, SpinnerSize } from "@fluentui/react";
 import * as React from "react";
 import ReactDOM from "react-dom";
 import { withTranslation } from "react-i18next";
@@ -13,7 +13,7 @@ import "./SelfServe.less";
 import { SelfServeComponent } from "./SelfServeComponent";
 import { SelfServeDescriptor } from "./SelfServeTypes";
 import { SelfServeType } from "./SelfServeUtils";
-initializeIcons();
+// initializeIcons();

 const loadTranslationFile = async (className: string): Promise<void> => {
  const language = i18n.languages[0];
--- a/src/Utils/EndpointUtils.ts
+++ b/src/Utils/EndpointUtils.ts
@@ -141,7 +141,9 @@ export const allowedArcadiaEndpoints: ReadonlyArray<string> = ["https://workspac

 export const allowedHostedExplorerEndpoints: ReadonlyArray<string> = ["https://cosmos.azure.com/"];

-export const allowedMsalRedirectEndpoints: ReadonlyArray<string> = ["https://dataexplorer-preview.azurewebsites.net/"];
+export const allowedMsalRedirectEndpoints: ReadonlyArray<string> = [
+  "https://cosmos-explorer-preview.azurewebsites.net/",
+];

 export const allowedJunoOrigins: ReadonlyArray<string> = [
  JunoEndpoints.Test,
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -85,7 +85,9 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
          await updateContextForSampleData(explorer);
        }

-        restoreOpenTabs();
+        if (userContext.features.restoreTabs) {
+          restoreOpenTabs();
+        }

        setExplorer(explorer);
      }
@@ -96,6 +98,7 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
  useEffect(() => {
    if (explorer) {
      applyExplorerBindings(explorer);
+      explorer.openNPSSurveyDialog();
    }
  }, [explorer]);

@@ -181,11 +184,6 @@ async function configureFabric(): Promise<Explorer> {
 }

 const openFirstContainer = async (explorer: Explorer, databaseName: string, collectionName?: string) => {
-  if (useTabs.getState().openedTabs.length > 0) {
-    // Don't open any tabs if there are already tabs open
-    return;
-  }
-
  // Expand database first
  databaseName = sessionStorage.getItem("openDatabaseName") ?? databaseName;
  const database = useDatabases.getState().databases.find((db) => db.id() === databaseName);
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -1,11 +1,11 @@
-import { initializeIcons } from "@fluentui/react";
+// import { initializeIcons } from "@fluentui/react";
 import { configure } from "enzyme";
 import Adapter from "enzyme-adapter-react-16";
 import "jest-canvas-mock";
 import enableHooks from "jest-react-hooks-shallow";
 import { TextDecoder, TextEncoder } from "util";
 configure({ adapter: new Adapter() });
-initializeIcons();
+// initializeIcons();

 if (typeof window.URL.createObjectURL === "undefined") {
  Object.defineProperty(window.URL, "createObjectURL", { value: () => {} });
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -1,4 +1,4 @@
-import { AzureCliCredential } from "@azure/identity";
+import { AzureCliCredentials } from "@azure/ms-rest-nodeauth";
 import { expect, Frame, Locator, Page } from "@playwright/test";
 import crypto from "crypto";

@@ -20,13 +20,13 @@ export function generateUniqueName(baseName, options?: TestNameOptions): string
  return `${prefix}${baseName}${crypto.randomBytes(length).toString("hex")}${suffix}`;
 }

-export function getAzureCLICredentials(): AzureCliCredential {
-  return new AzureCliCredential();
+export async function getAzureCLICredentials(): Promise<AzureCliCredentials> {
+  return await AzureCliCredentials.create();
 }

 export async function getAzureCLICredentialsToken(): Promise<string> {
-  const credentials = getAzureCLICredentials();
-  const token = (await credentials.getToken("https://management.core.windows.net//.default")).token;
+  const credentials = await getAzureCLICredentials();
+  const token = (await credentials.getToken()).accessToken;
  return token;
 }

--- a/test/sql/resourceToken.spec.ts
+++ b/test/sql/resourceToken.spec.ts
@@ -13,7 +13,7 @@ import {
 } from "../fx";

 test("SQL account using Resource token", async ({ page }) => {
-  const credentials = getAzureCLICredentials();
+  const credentials = await getAzureCLICredentials();
  const armClient = new CosmosDBManagementClient(credentials, subscriptionId);
  const accountName = getAccountName(TestAccount.SQL);
  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
--- a/test/testData.ts
+++ b/test/testData.ts
@@ -56,7 +56,7 @@ export class TestContainerContext {
 export async function createTestSQLContainer(includeTestData?: boolean) {
  const databaseId = generateUniqueName("db");
  const containerId = "testcontainer"; // A unique container name isn't needed because the database is unique
-  const credentials = getAzureCLICredentials();
+  const credentials = await getAzureCLICredentials();
  const armClient = new CosmosDBManagementClient(credentials, subscriptionId);
  const accountName = getAccountName(TestAccount.SQL);
  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
--- a/utils/cleanupDBs.js
+++ b/utils/cleanupDBs.js
@@ -1,4 +1,4 @@
-const { AzureCliCredential } = require("@azure/identity");
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
 const { CosmosDBManagementClient } = require("@azure/arm-cosmosdb");
 const ms = require("ms");

@@ -16,7 +16,7 @@ function friendlyTime(date) {
 }

 async function main() {
-  const credentials = new AzureCliCredential();
+  const credentials = await msRestNodeAuth.AzureCliCredentials.create();
  const client = new CosmosDBManagementClient(credentials, subscriptionId);
  const accounts = await client.databaseAccounts.list(resourceGroupName);
  for (const account of accounts) {
--- a/web.config
+++ b/web.config
@@ -30,7 +30,7 @@
        <clear />
        <add name="X-Xss-Protection" value="1; mode=block" />
        <add name="X-Content-Type-Options" value="nosniff" />
-        <add name="Content-Security-Policy" value="frame-ancestors 'self' portal.azure.com *.portal.azure.com portal.azure.us portal.azure.cn portal.microsoftazure.de df.onecloud.azure-test.net *.fabric.microsoft.com *.powerbi.com *.analysis-df.windows.net dataexplorer-preview.azurewebsites.net" />
+        <add name="Content-Security-Policy" value="frame-ancestors 'self' portal.azure.com *.portal.azure.com portal.azure.us portal.azure.cn portal.microsoftazure.de df.onecloud.azure-test.net *.fabric.microsoft.com *.powerbi.com *.analysis-df.windows.net cosmos-explorer-preview.azurewebsites.net" />
      </customHeaders>
      <redirectHeaders>
        <clear />
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,7 +20,9 @@ const isCI = require("is-ci");

 const gitSha = childProcess.execSync("git rev-parse HEAD").toString("utf8");

+const AZURE_CLIENT_ID = "fd8753b0-0707-4e32-84e9-2532af865fb4";
 const AZURE_TENANT_ID = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+const SUBSCRIPTION_ID = "69e02f2d-f059-4409-9eac-97e8a276ae2c";
 const RESOURCE_GROUP = "de-e2e-tests";
 const AZURE_CLIENT_SECRET = process.env.AZURE_CLIENT_SECRET || process.env.NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET; // TODO Remove. Exists for backwards compat with old .env files. Prefer AZURE_CLIENT_SECRET

@@ -94,7 +96,10 @@ module.exports = function (_env = {}, argv = {}) {

  if (mode === "development") {
    envVars.NODE_ENV = "development";
+    envVars.AZURE_CLIENT_ID = AZURE_CLIENT_ID;
+    envVars.AZURE_TENANT_ID = AZURE_TENANT_ID;
    envVars.AZURE_CLIENT_SECRET = AZURE_CLIENT_SECRET || null;
+    envVars.SUBSCRIPTION_ID = SUBSCRIPTION_ID;
    envVars.RESOURCE_GROUP = RESOURCE_GROUP;
    typescriptRule.use[0].options.compilerOptions = { target: "ES2018" };
  }
@@ -182,18 +187,18 @@ module.exports = function (_env = {}, argv = {}) {
    }),
    new MonacoWebpackPlugin(),
    new CopyWebpackPlugin({
-      patterns: [
-        { from: "DataExplorer.nuspec" },
-        { from: "DataExplorer.proj" },
-        { from: "web.config" },
-        { from: "quickstart/*.zip" },
-      ],
+      patterns: [{ from: "DataExplorer.nuspec" }, { from: "web.config" }, { from: "quickstart/*.zip" }],
    }),
    new EnvironmentPlugin(envVars),
  ];

  if (argv.analyze) {
-    plugins.push(new BundleAnalyzerPlugin());
+    plugins.push(
+      new BundleAnalyzerPlugin({
+        analyzerMode: "static",
+        reportFilename: "bundle-report.html",
+      }),
+    );
  }

  return {
@@ -256,6 +261,17 @@ module.exports = function (_env = {}, argv = {}) {
          },
        }),
      ],
+      splitChunks: {
+        chunks: "all",
+        cacheGroups: {
+          fluentIcons: {
+            test: /[\\/]node_modules[\\/]@fluentui[\\/](font-icons-mdl2|react-icons)/,
+            name: "fluent-icons",
+            chunks: "all",
+            enforce: true,
+          },
+        },
+      },
    },
    watch: false,
    // Hack since it is hard to disable watch entirely with webpack dev server https://github.com/webpack/webpack-dev-server/issues/1251#issuecomment-654240734
Author	SHA1	Message	Date
Sung-Hyun Kang	3ae92f2398	testing icons	2025-01-14 17:16:02 -06:00
Sung-Hyun Kang	a0853c9167	testing	2025-01-14 14:45:19 -06:00