Merge branch 'master' of https://github.com/Azure/cosmos-explorer into users/aisayas/dependabot-1.5

fix ci
Add sharedThroughput db tests (#2287 )
2026-01-27 21:54:15 +00:00 · 2026-01-27 12:20:15 -08:00 · 2026-01-27 12:16:57 -08:00 · 2026-01-27 12:00:56 -08:00 · 2026-01-27 11:45:01 -08:00 · 2026-01-27 11:34:13 -08:00
47 changed files with 5122 additions and 8119 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,10 +18,10 @@ jobs:
    if: github.ref == 'refs/heads/master'
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: node utils/codeMetrics.js
        env:
@@ -31,10 +31,10 @@ jobs:
    name: "Compile TypeScript"
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: npm run compile
      - run: npm run compile:strict
@@ -43,10 +43,10 @@ jobs:
    name: "Check Format"
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: npm run format:check
  lint:
@@ -54,10 +54,10 @@ jobs:
    name: "Lint"
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: npm run lint
  unittest:
@@ -65,10 +65,10 @@ jobs:
    name: "Unit Tests"
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: npm run test
  build:
@@ -76,10 +76,10 @@ jobs:
    name: "Build"
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: npm run build:contracts
      - name: Restore Build Cache
@@ -168,10 +168,10 @@ jobs:
        shardTotal: [20]
    steps:
      - uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 24.x
        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: npx playwright install --with-deps
      - name: "Az CLI login"
@@ -236,7 +236,7 @@ jobs:
      - uses: actions/checkout@v4
      - uses: actions/setup-node@v4
        with:
-          node-version: 18
+          node-version: 24.x
      - name: Install dependencies
        run: npm ci

--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -6,8 +6,8 @@ on:
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
  schedule:
-    # Once every two hours
-    - cron: "0 */2 * * *"
+    # Once every day at 7 AM PST
+    - cron: "0 13 * * *"

 permissions:
  id-token: write
@@ -31,9 +31,9 @@ jobs:
          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 24.x
+        uses: actions/setup-node@v4
        with:
-          node-version: 18.x
+          node-version: 24.x
      - run: npm ci
      - run: node utils/cleanupDBs.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "description": "Cosmos Explorer",
  "main": "index.js",
  "dependencies": {
-    "@azure/arm-cosmosdb": "9.1.0",
+    "@azure/arm-cosmosdb": "16.4.0",
    "@azure/cosmos": "4.7.0",
    "@azure/cosmos-language-service": "0.0.5",
    "@azure/identity": "4.5.0",
@@ -19,7 +19,7 @@
    "@nteract/commutable": "7.5.1",
    "@nteract/connected-components": "6.8.2",
    "@nteract/core": "15.1.9",
-    "@nteract/data-explorer": "8.0.3",
+    "@nteract/data-explorer": "8.2.12",
    "@nteract/directory-listing": "2.0.6",
    "@nteract/dropdown-menu": "1.0.1",
    "@nteract/editor": "10.1.12",
@@ -31,7 +31,7 @@
    "@nteract/monaco-editor": "3.2.2",
    "@nteract/octicons": "2.0.0",
    "@nteract/outputs": "3.0.9",
-    "@nteract/presentational-components": "3.0.7",
+    "@nteract/presentational-components": "3.4.12",
    "@nteract/stateful-components": "1.7.0",
    "@nteract/styles": "2.0.2",
    "@nteract/transform-geojson": "5.1.8",
@@ -44,14 +44,14 @@
    "@testing-library/jest-dom": "6.4.6",
    "@types/lodash": "4.14.171",
    "@types/mkdirp": "1.0.1",
-    "@types/node-fetch": "2.5.7",
+    "@types/node-fetch": "2.6.13",
    "@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",
-    "canvas": "2.11.2",
+    "canvas": "3.2.1",
    "clean-webpack-plugin": "4.0.0",
    "clipboard-copy": "4.0.1",
    "copy-webpack-plugin": "11.0.0",
@@ -70,7 +70,6 @@
    "html2canvas": "1.0.0-rc.5",
    "i18next": "23.11.5",
    "i18next-browser-languagedetector": "6.0.1",
-    "i18next-http-backend": "1.0.23",
    "iframe-resizer-react": "1.1.0",
    "immer": "9.0.6",
    "immutable": "4.0.0-rc.12",
@@ -79,7 +78,6 @@
    "jquery-typeahead": "2.11.1",
    "jquery-ui-dist": "1.13.2",
    "knockout": "3.5.1",
-    "loader-utils": "2.0.3",
    "mkdirp": "1.0.4",
    "monaco-editor": "0.44.0",
    "ms": "2.1.3",
@@ -111,8 +109,8 @@
    "tinykeys": "2.1.0",
    "underscore": "1.12.1",
    "utility-types": "3.10.0",
-    "web-vitals": "4.2.4",
    "uuid": "9.0.0",
+    "web-vitals": "4.2.4",
    "zustand": "3.5.0"
  },
  "devDependencies": {
@@ -120,7 +118,7 @@
    "@babel/preset-env": "7.24.7",
    "@babel/preset-react": "7.24.7",
    "@babel/preset-typescript": "7.24.7",
-    "@playwright/test": "1.49.1",
+    "@playwright/test": "1.58.0",
    "@testing-library/react": "11.2.3",
    "@types/applicationinsights-js": "1.0.7",
    "@types/codemirror": "0.0.56",
@@ -152,7 +150,7 @@
    "@typescript-eslint/parser": "6.7.4",
    "@webpack-cli/serve": "2.0.5",
    "babel-jest": "29.7.0",
-    "babel-loader": "8.1.0",
+    "babel-loader": "10.0.0",
    "buffer": "5.1.0",
    "case-sensitive-paths-webpack-plugin": "2.4.0",
    "create-file-webpack": "1.0.2",
@@ -173,11 +171,11 @@
    "jest": "29.7.0",
    "jest-canvas-mock": "2.5.2",
    "jest-circus": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
+    "jest-environment-jsdom": "30.2.0",
    "jest-html-loader": "1.0.0",
    "jest-react-hooks-shallow": "1.5.1",
    "jest-trx-results-processor": "3.0.2",
-    "less": "3.8.1",
+    "less": "4.5.1",
    "less-loader": "11.1.3",
    "less-vars-loader": "1.1.0",
    "mini-css-extract-plugin": "2.1.0",
@@ -190,16 +188,21 @@
    "react-dev-utils": "12.0.1",
    "rimraf": "3.0.0",
    "sinon": "3.2.1",
-    "style-loader": "0.23.0",
+    "style-loader": "4.0.0",
    "ts-loader": "9.2.4",
    "typedoc": "0.26.2",
    "typescript": "4.9.5",
    "url-loader": "4.1.1",
-    "wait-on": "4.0.2",
+    "wait-on": "9.0.3",
    "webpack": "5.88.2",
    "webpack-bundle-analyzer": "4.9.1",
    "webpack-cli": "5.1.4",
-    "webpack-dev-server": "4.15.2"
+    "webpack-dev-server": "5.2.3"
+  },
+  "overrides": {
+    "@nteract/markdown": {
+      "remark-parse": "11.0.0"
+    }
  },
  "scripts": {
    "postinstall": "patch-package",
--- a/patches/datatables.net-colreorder+1.7.0.patch
+++ b/patches/datatables.net-colreorder+1.7.0.patch
@@ -1,22 +1,22 @@
-diff --git a/node_modules/datatables.net-colreorder/types/types.d.ts b/node_modules/datatables.net-colreorder/types/types.d.ts
-index e5dc283..1930c2b 100644
--- a/node_modules/datatables.net-colreorder/types/types.d.ts
-+++ b/node_modules/datatables.net-colreorder/types/types.d.ts
-@@ -7,7 +7,7 @@
- 
- /// <reference types="jquery" />
- 
-import DataTables, {Api} from 'datatables.net';
-+import DataTables, { Api } from 'datatables.net';
- 
- export default DataTables;
- 
-@@ -40,6 +40,8 @@ declare module 'datatables.net' {
- 			/**
- 			 * Create a new ColReorder instance for the target DataTable
- 			 */
-+      // Ignore this error: error TS7013: Construct signature, which lacks return-type annotation, implicitly has an 'any' return type.
-+      // @ts-ignore
- 			new (dt: Api<any>, settings: boolean | ConfigColReorder);
- 
- 			/**
+diff --git a/node_modules/datatables.net-colreorder/types/types.d.ts b/node_modules/datatables.net-colreorder/types/types.d.ts
+index e5dc283..1930c2b 100644
+--- a/node_modules/datatables.net-colreorder/types/types.d.ts
+++ b/node_modules/datatables.net-colreorder/types/types.d.ts
+@@ -7,7 +7,7 @@
+ 
+ /// <reference types="jquery" />
+ 
+-import DataTables, {Api} from 'datatables.net';
+import DataTables, { Api } from 'datatables.net';
+ 
+ export default DataTables;
+ 
+@@ -40,6 +40,8 @@ declare module 'datatables.net' {
+ 			/**
+ 			 * Create a new ColReorder instance for the target DataTable
+ 			 */
+      // Ignore this error: error TS7013: Construct signature, which lacks return-type annotation, implicitly has an 'any' return type.
+      // @ts-ignore
+ 			new (dt: Api<any>, settings: boolean | ConfigColReorder);
+ 
+ 			/**
--- a/preview/package-lock.json
+++ b/preview/package-lock.json
@@ -8,8 +8,8 @@
      "name": "cosmos-explorer-preview",
      "version": "1.0.0",
      "dependencies": {
-        "body-parser": "^1.20.3",
-        "express": "^4.21.2",
+        "body-parser": "^1.20.4",
+        "express": "^4.22.1",
        "http-proxy-middleware": "^3.0.3",
        "node": "^20.19.5",
        "node-fetch": "^2.6.1",
@@ -18,8 +18,7 @@
    },
    "node_modules/@types/http-proxy": {
      "version": "1.17.16",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
-      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+      "license": "MIT",
      "dependencies": {
        "@types/node": "*"
      }
@@ -40,22 +39,21 @@
      }
    },
    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "version": "1.20.4",
+      "license": "MIT",
      "dependencies": {
-        "bytes": "3.1.2",
+        "bytes": "~3.1.2",
        "content-type": "~1.0.5",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.13.0",
-        "raw-body": "2.5.2",
+        "destroy": "~1.2.0",
+        "http-errors": "~2.0.1",
+        "iconv-lite": "~0.4.24",
+        "on-finished": "~2.4.1",
+        "qs": "~6.14.0",
+        "raw-body": "~2.5.3",
        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "unpipe": "~1.0.0"
      },
      "engines": {
        "node": ">= 0.8",
@@ -69,22 +67,45 @@
        "ms": "2.0.0"
      }
    },
+    "node_modules/body-parser/node_modules/http-errors": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~2.0.0",
+        "inherits": "~2.0.4",
+        "setprototypeof": "~1.2.0",
+        "statuses": "~2.0.2",
+        "toidentifier": "~1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
    "node_modules/body-parser/node_modules/ms": {
      "version": "2.0.0",
      "license": "MIT"
    },
+    "node_modules/body-parser/node_modules/statuses": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/bytes": {
      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
    },
    "node_modules/call-bind-apply-helpers": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
      "dependencies": {
        "es-errors": "^1.3.0",
        "function-bind": "^1.1.2"
@@ -95,8 +116,7 @@
    },
    "node_modules/call-bound": {
      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.2",
        "get-intrinsic": "^1.3.0"
@@ -127,8 +147,7 @@
    },
    "node_modules/cookie": {
      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
@@ -139,8 +158,7 @@
    },
    "node_modules/debug": {
      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.3"
      },
@@ -170,8 +188,7 @@
    },
    "node_modules/dunder-proto": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.1",
        "es-errors": "^1.3.0",
@@ -187,32 +204,28 @@
    },
    "node_modules/encodeurl": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
    },
    "node_modules/es-define-property": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      }
    },
    "node_modules/es-errors": {
      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      }
    },
    "node_modules/es-object-atoms": {
      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
      "dependencies": {
        "es-errors": "^1.3.0"
      },
@@ -222,13 +235,11 @@
    },
    "node_modules/escape-html": {
      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+      "license": "MIT"
    },
    "node_modules/etag": {
      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
@@ -238,38 +249,37 @@
      "license": "MIT"
    },
    "node_modules/express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "version": "4.22.1",
+      "license": "MIT",
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
-        "content-disposition": "0.5.4",
+        "body-parser": "~1.20.3",
+        "content-disposition": "~0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.7.1",
-        "cookie-signature": "1.0.6",
+        "cookie": "~0.7.1",
+        "cookie-signature": "~1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
+        "finalhandler": "~1.3.1",
+        "fresh": "~0.5.2",
+        "http-errors": "~2.0.0",
        "merge-descriptors": "1.0.3",
        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
+        "on-finished": "~2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
+        "path-to-regexp": "~0.1.12",
        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
+        "qs": "~6.14.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
+        "send": "~0.19.0",
+        "serve-static": "~1.16.2",
        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
+        "statuses": "~2.0.1",
        "type-is": "~1.6.18",
        "utils-merge": "1.0.1",
        "vary": "~1.1.2"
@@ -299,8 +309,7 @@
    },
    "node_modules/finalhandler": {
      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "license": "MIT",
      "dependencies": {
        "debug": "2.6.9",
        "encodeurl": "~2.0.0",
@@ -316,16 +325,14 @@
    },
    "node_modules/finalhandler/node_modules/debug": {
      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
      "dependencies": {
        "ms": "2.0.0"
      }
    },
    "node_modules/finalhandler/node_modules/ms": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "license": "MIT"
    },
    "node_modules/follow-redirects": {
      "version": "1.15.3",
@@ -354,24 +361,21 @@
    },
    "node_modules/fresh": {
      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/function-bind": {
      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
      }
    },
    "node_modules/get-intrinsic": {
      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
      "dependencies": {
        "call-bind-apply-helpers": "^1.0.2",
        "es-define-property": "^1.0.1",
@@ -393,8 +397,7 @@
    },
    "node_modules/get-proto": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
      "dependencies": {
        "dunder-proto": "^1.0.1",
        "es-object-atoms": "^1.0.0"
@@ -405,8 +408,7 @@
    },
    "node_modules/gopd": {
      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      },
@@ -416,8 +418,7 @@
    },
    "node_modules/has-symbols": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      },
@@ -427,8 +428,7 @@
    },
    "node_modules/hasown": {
      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
      "dependencies": {
        "function-bind": "^1.1.2"
      },
@@ -464,8 +464,7 @@
    },
    "node_modules/http-proxy-middleware": {
      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz",
-      "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==",
+      "license": "MIT",
      "dependencies": {
        "@types/http-proxy": "^1.17.15",
        "debug": "^4.3.6",
@@ -480,8 +479,7 @@
    },
    "node_modules/http-proxy-middleware/node_modules/braces": {
      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
      "dependencies": {
        "fill-range": "^7.1.1"
      },
@@ -491,8 +489,7 @@
    },
    "node_modules/http-proxy-middleware/node_modules/fill-range": {
      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -502,16 +499,14 @@
    },
    "node_modules/http-proxy-middleware/node_modules/is-number": {
      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
      "engines": {
        "node": ">=0.12.0"
      }
    },
    "node_modules/http-proxy-middleware/node_modules/micromatch": {
      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
      "dependencies": {
        "braces": "^3.0.3",
        "picomatch": "^2.3.1"
@@ -522,8 +517,7 @@
    },
    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
      "dependencies": {
        "is-number": "^7.0.0"
      },
@@ -533,8 +527,7 @@
    },
    "node_modules/iconv-lite": {
      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
      "dependencies": {
        "safer-buffer": ">= 2.1.2 < 3"
      },
@@ -572,8 +565,7 @@
    },
    "node_modules/math-intrinsics": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      }
@@ -587,8 +579,7 @@
    },
    "node_modules/merge-descriptors": {
      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "license": "MIT",
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
      }
@@ -602,8 +593,7 @@
    },
    "node_modules/mime": {
      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "license": "MIT",
      "bin": {
        "mime": "cli.js"
      },
@@ -641,24 +631,18 @@
    },
    "node_modules/node": {
      "version": "20.19.5",
-      "resolved": "https://registry.npmjs.org/node/-/node-20.19.5.tgz",
-      "integrity": "sha512-9fJOHEP8AVrwpbhlUxnbudW8IbkseQVxl4yNQyI/rDfP+gNwKEmfPtBc/Luyf677i5Y0HKIBHiApiB9S9vvxKw==",
      "hasInstallScript": true,
+      "license": "ISC",
      "dependencies": {
        "node-bin-setup": "^1.0.0"
      },
      "bin": {
-        "node": "bin/node"
+        "node": "bin/node.exe"
      },
      "engines": {
        "npm": ">=5.0.0"
      }
    },
-    "node_modules/node-bin-setup": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/node-bin-setup/-/node-bin-setup-1.1.4.tgz",
-      "integrity": "sha512-vWNHOne0ZUavArqPP5LJta50+S8R261Fr5SvGul37HbEDcowvLjwdvd0ZeSr0r2lTSrPxl6okq9QUw8BFGiAxA=="
-    },
    "node_modules/node-fetch": {
      "version": "2.6.7",
      "license": "MIT",
@@ -677,10 +661,13 @@
        }
      }
    },
+    "node_modules/node/node_modules/node-bin-setup": {
+      "version": "1.1.4",
+      "license": "ISC"
+    },
    "node_modules/object-inspect": {
      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.4"
      },
@@ -700,16 +687,14 @@
    },
    "node_modules/parseurl": {
      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
    },
    "node_modules/path-to-regexp": {
      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
+      "license": "MIT"
    },
    "node_modules/picomatch": {
      "version": "2.3.1",
@@ -740,11 +725,10 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.14.1",
+      "license": "BSD-3-Clause",
      "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
      },
      "engines": {
        "node": ">=0.6"
@@ -755,26 +739,49 @@
    },
    "node_modules/range-parser": {
      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "version": "2.5.3",
+      "license": "MIT",
      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
+        "bytes": "~3.1.2",
+        "http-errors": "~2.0.1",
+        "iconv-lite": "~0.4.24",
+        "unpipe": "~1.0.0"
      },
      "engines": {
        "node": ">= 0.8"
      }
    },
+    "node_modules/raw-body/node_modules/http-errors": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "depd": "~2.0.0",
+        "inherits": "~2.0.4",
+        "setprototypeof": "~1.2.0",
+        "statuses": "~2.0.2",
+        "toidentifier": "~1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/raw-body/node_modules/statuses": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/requires-port": {
      "version": "1.0.0",
      "license": "MIT"
@@ -799,13 +806,11 @@
    },
    "node_modules/safer-buffer": {
      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "license": "MIT"
    },
    "node_modules/send": {
      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "license": "MIT",
      "dependencies": {
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -827,29 +832,25 @@
    },
    "node_modules/send/node_modules/debug": {
      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
      "dependencies": {
        "ms": "2.0.0"
      }
    },
    "node_modules/send/node_modules/debug/node_modules/ms": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "license": "MIT"
    },
    "node_modules/send/node_modules/encodeurl": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "license": "MIT",
      "engines": {
        "node": ">= 0.8"
      }
    },
    "node_modules/serve-static": {
      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "license": "MIT",
      "dependencies": {
        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
@@ -866,8 +867,7 @@
    },
    "node_modules/side-channel": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
      "dependencies": {
        "es-errors": "^1.3.0",
        "object-inspect": "^1.13.3",
@@ -884,8 +884,7 @@
    },
    "node_modules/side-channel-list": {
      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
      "dependencies": {
        "es-errors": "^1.3.0",
        "object-inspect": "^1.13.3"
@@ -899,8 +898,7 @@
    },
    "node_modules/side-channel-map": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
-      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
      "dependencies": {
        "call-bound": "^1.0.2",
        "es-errors": "^1.3.0",
@@ -916,8 +914,7 @@
    },
    "node_modules/side-channel-weakmap": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
-      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
      "dependencies": {
        "call-bound": "^1.0.2",
        "es-errors": "^1.3.0",
--- a/preview/package.json
+++ b/preview/package.json
@@ -11,8 +11,8 @@
  "keywords": [],
  "author": "Microsoft Corporation",
  "dependencies": {
-    "body-parser": "^1.20.3",
-    "express": "^4.21.2",
+    "body-parser": "^1.20.4",
+    "express": "^4.22.1",
    "http-proxy-middleware": "^3.0.3",
    "node": "^20.19.5",
    "node-fetch": "^2.6.1",
--- a/src/Common/ErrorHandlingUtils.ts
+++ b/src/Common/ErrorHandlingUtils.ts
@@ -7,16 +7,27 @@ import { HttpStatusCodes } from "./Constants";
 import { logError } from "./Logger";
 import { sendMessage } from "./MessageHandler";

-export const handleError = (error: string | ARMError | Error, area: string, consoleErrorPrefix?: string): void => {
+export interface HandleErrorOptions {
+  /** Optional redacted error to use for telemetry logging instead of the original error */
+  redactedError?: string | ARMError | Error;
+}
+
+export const handleError = (
+  error: string | ARMError | Error,
+  area: string,
+  consoleErrorPrefix?: string,
+  options?: HandleErrorOptions,
+): void => {
  const errorMessage = getErrorMessage(error);
  const errorCode = error instanceof ARMError ? error.code : undefined;

-  // logs error to data explorer console
+  // logs error to data explorer console (always shows original, non-redacted message)
  const consoleErrorMessage = consoleErrorPrefix ? `${consoleErrorPrefix}:\n ${errorMessage}` : errorMessage;
  logConsoleError(consoleErrorMessage);

-  // logs error to both app insight and kusto
-  logError(errorMessage, area, errorCode);
+  // logs error to both app insight and kusto (use redacted message if provided)
+  const telemetryErrorMessage = options?.redactedError ? getErrorMessage(options.redactedError) : errorMessage;
+  logError(telemetryErrorMessage, area, errorCode);

  // checks for errors caused by firewall and sends them to portal to handle
  sendNotificationForError(errorMessage, errorCode);
--- a/src/Common/dataAccess/deleteDocument.ts
+++ b/src/Common/dataAccess/deleteDocument.ts
@@ -44,7 +44,8 @@ export const deleteDocuments = async (
  documentIds: DocumentId[],
  abortSignal: AbortSignal,
 ): Promise<IBulkDeleteResult[]> => {
-  const clearMessage = logConsoleProgress(`Deleting ${documentIds.length} ${getEntityName(true)}`);
+  const totalCount = documentIds.length;
+  const clearMessage = logConsoleProgress(`Deleting ${totalCount} ${getEntityName(true)}`);
  try {
    const v2Container = await client().database(collection.databaseId).container(collection.id());

@@ -83,11 +84,7 @@ export const deleteDocuments = async (
    const flatAllResult = Array.prototype.concat.apply([], allResult);
    return flatAllResult;
  } catch (error) {
-    handleError(
-      error,
-      "DeleteDocuments",
-      `Error while deleting ${documentIds.length} ${getEntityName(documentIds.length > 1)}`,
-    );
+    handleError(error, "DeleteDocuments", `Error while deleting ${totalCount} ${getEntityName(totalCount > 1)}`);
    throw error;
  } finally {
    clearMessage();
--- a/src/Common/dataAccess/queryDocumentsPage.test.ts
+++ b/src/Common/dataAccess/queryDocumentsPage.test.ts
@@ -0,0 +1,171 @@
+import { redactSyntaxErrorMessage } from "./queryDocumentsPage";
+
+/* Typical error to redact looks like this (the message property contains a JSON string with nested structure):
+{
+  "message": "{\"code\":\"BadRequest\",\"message\":\"{\\\"errors\\\":[{\\\"severity\\\":\\\"Error\\\",\\\"location\\\":{\\\"start\\\":0,\\\"end\\\":5},\\\"code\\\":\\\"SC1001\\\",\\\"message\\\":\\\"Syntax error, incorrect syntax near 'Crazy'.\\\"}]}\\r\\nActivityId: d5424e10-51bd-46f7-9aec-7b40bed36f17, Windows/10.0.20348 cosmos-netstandard-sdk/3.18.0\"}"
+}
+*/
+
+// Helper to create the nested error structure that matches what the SDK returns
+const createNestedError = (
+  errors: Array<{ severity?: string; location?: { start: number; end: number }; code: string; message: string }>,
+  activityId: string = "test-activity-id",
+): { message: string } => {
+  const innerErrorsJson = JSON.stringify({ errors });
+  const innerMessage = `${innerErrorsJson}\r\n${activityId}`;
+  const outerJson = JSON.stringify({ code: "BadRequest", message: innerMessage });
+  return { message: outerJson };
+};
+
+// Helper to parse the redacted result
+const parseRedactedResult = (result: { message: string }) => {
+  const outerParsed = JSON.parse(result.message);
+  const [innerErrorsJson, activityIdPart] = outerParsed.message.split("\r\n");
+  const innerErrors = JSON.parse(innerErrorsJson);
+  return { outerParsed, innerErrors, activityIdPart };
+};
+
+describe("redactSyntaxErrorMessage", () => {
+  it("should redact SC1001 error message", () => {
+    const error = createNestedError(
+      [
+        {
+          severity: "Error",
+          location: { start: 0, end: 5 },
+          code: "SC1001",
+          message: "Syntax error, incorrect syntax near 'Crazy'.",
+        },
+      ],
+      "ActivityId: d5424e10-51bd-46f7-9aec-7b40bed36f17",
+    );
+
+    const result = redactSyntaxErrorMessage(error) as { message: string };
+    const { outerParsed, innerErrors, activityIdPart } = parseRedactedResult(result);
+
+    expect(outerParsed.code).toBe("BadRequest");
+    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
+    expect(activityIdPart).toContain("ActivityId: d5424e10-51bd-46f7-9aec-7b40bed36f17");
+  });
+
+  it("should redact SC2001 error message", () => {
+    const error = createNestedError(
+      [
+        {
+          severity: "Error",
+          location: { start: 0, end: 10 },
+          code: "SC2001",
+          message: "Some sensitive syntax error message.",
+        },
+      ],
+      "ActivityId: abc123",
+    );
+
+    const result = redactSyntaxErrorMessage(error) as { message: string };
+    const { outerParsed, innerErrors, activityIdPart } = parseRedactedResult(result);
+
+    expect(outerParsed.code).toBe("BadRequest");
+    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
+    expect(activityIdPart).toContain("ActivityId: abc123");
+  });
+
+  it("should redact multiple errors with SC1001 and SC2001 codes", () => {
+    const error = createNestedError(
+      [
+        { severity: "Error", code: "SC1001", message: "First error" },
+        { severity: "Error", code: "SC2001", message: "Second error" },
+      ],
+      "ActivityId: xyz",
+    );
+
+    const result = redactSyntaxErrorMessage(error) as { message: string };
+    const { innerErrors } = parseRedactedResult(result);
+
+    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
+    expect(innerErrors.errors[1].message).toBe("__REDACTED__");
+  });
+
+  it("should not redact errors with other codes", () => {
+    const error = createNestedError(
+      [{ severity: "Error", code: "SC9999", message: "This should not be redacted." }],
+      "ActivityId: test123",
+    );
+
+    const result = redactSyntaxErrorMessage(error);
+
+    expect(result).toBe(error); // Should return original error unchanged
+  });
+
+  it("should not modify non-BadRequest errors", () => {
+    const innerMessage = JSON.stringify({ errors: [{ code: "SC1001", message: "Should not be redacted" }] });
+    const error = {
+      message: JSON.stringify({ code: "NotFound", message: innerMessage }),
+    };
+
+    const result = redactSyntaxErrorMessage(error);
+
+    expect(result).toBe(error);
+  });
+
+  it("should handle errors without message property", () => {
+    const error = { code: "BadRequest" };
+
+    const result = redactSyntaxErrorMessage(error);
+
+    expect(result).toBe(error);
+  });
+
+  it("should handle non-object errors", () => {
+    const stringError = "Simple string error";
+    const nullError: null = null;
+    const undefinedError: undefined = undefined;
+
+    expect(redactSyntaxErrorMessage(stringError)).toBe(stringError);
+    expect(redactSyntaxErrorMessage(nullError)).toBe(nullError);
+    expect(redactSyntaxErrorMessage(undefinedError)).toBe(undefinedError);
+  });
+
+  it("should handle malformed JSON in message", () => {
+    const error = {
+      message: "not valid json",
+    };
+
+    const result = redactSyntaxErrorMessage(error);
+
+    expect(result).toBe(error);
+  });
+
+  it("should handle message without ActivityId suffix", () => {
+    const innerErrorsJson = JSON.stringify({
+      errors: [{ severity: "Error", code: "SC1001", message: "Syntax error near something." }],
+    });
+    const error = {
+      message: JSON.stringify({ code: "BadRequest", message: innerErrorsJson + "\r\n" }),
+    };
+
+    const result = redactSyntaxErrorMessage(error) as { message: string };
+    const { innerErrors } = parseRedactedResult(result);
+
+    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
+  });
+
+  it("should preserve other error properties", () => {
+    const baseError = createNestedError([{ code: "SC1001", message: "Error" }], "ActivityId: test");
+    const error = {
+      ...baseError,
+      statusCode: 400,
+      additionalInfo: "extra data",
+    };
+
+    const result = redactSyntaxErrorMessage(error) as {
+      message: string;
+      statusCode: number;
+      additionalInfo: string;
+    };
+
+    expect(result.statusCode).toBe(400);
+    expect(result.additionalInfo).toBe("extra data");
+
+    const { innerErrors } = parseRedactedResult(result);
+    expect(innerErrors.errors[0].message).toBe("__REDACTED__");
+  });
+});
--- a/src/Common/dataAccess/queryDocumentsPage.ts
+++ b/src/Common/dataAccess/queryDocumentsPage.ts
@@ -4,6 +4,51 @@ import { getEntityName } from "../DocumentUtility";
 import { handleError } from "../ErrorHandlingUtils";
 import { MinimalQueryIterator, nextPage } from "../IteratorUtilities";

+// Redact sensitive information from BadRequest errors with specific codes
+export const redactSyntaxErrorMessage = (error: unknown): unknown => {
+  const codesToRedact = ["SC1001", "SC2001"];
+
+  try {
+    // Handle error objects with a message property
+    if (error && typeof error === "object" && "message" in error) {
+      const errorObj = error as { code?: string; message?: string };
+      if (typeof errorObj.message === "string") {
+        // Parse the inner JSON from the message
+        const innerJson = JSON.parse(errorObj.message);
+        if (innerJson.code === "BadRequest" && typeof innerJson.message === "string") {
+          const [innerErrorsJson, activityIdPart] = innerJson.message.split("\r\n");
+          const innerErrorsObj = JSON.parse(innerErrorsJson);
+          if (Array.isArray(innerErrorsObj.errors)) {
+            let modified = false;
+            innerErrorsObj.errors = innerErrorsObj.errors.map((err: { code?: string; message?: string }) => {
+              if (err.code && codesToRedact.includes(err.code)) {
+                modified = true;
+                return { ...err, message: "__REDACTED__" };
+              }
+              return err;
+            });
+
+            if (modified) {
+              // Reconstruct the message with the redacted content
+              const redactedMessage = JSON.stringify(innerErrorsObj) + `\r\n${activityIdPart}`;
+              const redactedError = {
+                ...error,
+                message: JSON.stringify({ ...innerJson, message: redactedMessage }),
+                body: undefined as unknown, // Clear body to avoid sensitive data
+              };
+              return redactedError;
+            }
+          }
+        }
+      }
+    }
+  } catch {
+    // If parsing fails, return the original error
+  }
+
+  return error;
+};
+
 export const queryDocumentsPage = async (
  resourceName: string,
  documentsIterator: MinimalQueryIterator,
@@ -18,7 +63,12 @@ export const queryDocumentsPage = async (
    logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
    return result;
  } catch (error) {
-    handleError(error, "QueryDocumentsPage", `Failed to query ${entityName} for container ${resourceName}`);
+    // Redact sensitive information for telemetry while showing original in console
+    const redactedError = redactSyntaxErrorMessage(error);
+
+    handleError(error, "QueryDocumentsPage", `Failed to query ${entityName} for container ${resourceName}`, {
+      redactedError: redactedError as Error,
+    });
    throw error;
  } finally {
    clearMessage();
--- a/src/Explorer/ContainerCopy/ContainerCopyPanel.tsx
+++ b/src/Explorer/ContainerCopy/ContainerCopyPanel.tsx
@@ -1,6 +1,4 @@
 import React, { useEffect } from "react";
-import { Dialog } from "../Controls/Dialog";
-import { SidePanel } from "../Panes/PanelContainerComponent";
 import CopyJobCommandBar from "./CommandBar/CopyJobCommandBar";
 import "./containerCopyStyles.less";
 import { MonitorCopyJobsRefState } from "./MonitorCopyJobs/MonitorCopyJobRefState";
@@ -18,8 +16,6 @@ const ContainerCopyPanel: React.FC<ContainerCopyProps> = ({ explorer }) => {
    <div id="containerCopyWrapper" className="flexContainer hideOverflows">
      <CopyJobCommandBar explorer={explorer} />
      <MonitorCopyJobs ref={monitorCopyJobsRef} explorer={explorer} />
-      <SidePanel />
-      <Dialog />
    </div>
  );
 };
--- a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.test.tsx
+++ b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.test.tsx
@@ -11,9 +11,17 @@ jest.mock("../../Actions/CopyJobActions", () => ({

 jest.mock("./CopyJobColumns", () => ({
  getColumns: jest.fn(() => [
+    {
+      key: "LastUpdatedTime",
+      name: "Date & time",
+      fieldName: "LastUpdatedTime",
+      minWidth: 140,
+      maxWidth: 300,
+      isResizable: true,
+    },
    {
      key: "Name",
-      name: "Name",
+      name: "Job name",
      fieldName: "Name",
      minWidth: 140,
      maxWidth: 300,
@@ -165,6 +173,165 @@ describe("CopyJobsList", () => {
      expect(screen.getByTestId("action-menu-job-2")).toBeInTheDocument();
      expect(screen.getByTestId("action-menu-job-3")).toBeInTheDocument();
    });
+
+    it("renders filter TextField with data-test attribute", () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterTextField = document.querySelector('[data-test="CopyJobsList/FilterTextField"]');
+      expect(filterTextField).toBeInTheDocument();
+    });
+
+    it("renders search TextField with correct placeholder", () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const searchInput = screen.getByPlaceholderText("Search jobs...");
+      expect(searchInput).toBeInTheDocument();
+    });
+  });
+
+  describe("Filtering", () => {
+    it("filters jobs by Name when text is entered", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Job 1" } });
+
+      await waitFor(() => {
+        expect(screen.getByText("Test Job 1")).toBeInTheDocument();
+        expect(screen.queryByText("Test Job 2")).not.toBeInTheDocument();
+        expect(screen.queryByText("Test Job 3")).not.toBeInTheDocument();
+      });
+    });
+
+    it("filters jobs case-insensitively", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "test job 1" } });
+
+      await waitFor(() => {
+        expect(screen.getByText("Test Job 1")).toBeInTheDocument();
+        expect(screen.queryByText("Test Job 2")).not.toBeInTheDocument();
+      });
+    });
+
+    it("shows all jobs when filter text is empty", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Job 1" } });
+
+      await waitFor(() => {
+        expect(screen.queryByText("Test Job 2")).not.toBeInTheDocument();
+      });
+
+      fireEvent.change(filterInput, { target: { value: "" } });
+
+      await waitFor(() => {
+        expect(screen.getByText("Test Job 1")).toBeInTheDocument();
+        expect(screen.getByText("Test Job 2")).toBeInTheDocument();
+        expect(screen.getByText("Test Job 3")).toBeInTheDocument();
+      });
+    });
+
+    it("filters jobs by Status across all columns", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: CopyJobStatusType.Running } });
+
+      await waitFor(() => {
+        expect(screen.getByText("Test Job 1")).toBeInTheDocument();
+        expect(screen.queryByText("Test Job 2")).not.toBeInTheDocument();
+        expect(screen.queryByText("Test Job 3")).not.toBeInTheDocument();
+      });
+    });
+
+    it("filters jobs by Mode across all columns", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Offline" } });
+
+      await waitFor(() => {
+        expect(screen.queryByText("Test Job 1")).not.toBeInTheDocument();
+        expect(screen.getByText("Test Job 2")).toBeInTheDocument();
+        expect(screen.queryByText("Test Job 3")).not.toBeInTheDocument();
+      });
+    });
+
+    it("shows no results when filter matches no jobs", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "NonExistentJob" } });
+
+      await waitFor(() => {
+        expect(screen.queryByText("Test Job 1")).not.toBeInTheDocument();
+        expect(screen.queryByText("Test Job 2")).not.toBeInTheDocument();
+        expect(screen.queryByText("Test Job 3")).not.toBeInTheDocument();
+      });
+    });
+
+    it("filters by partial text match", async () => {
+      render(<CopyJobsList jobs={mockJobs} handleActionClick={mockHandleActionClick} />);
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Test" } });
+
+      await waitFor(() => {
+        expect(screen.getByText("Test Job 1")).toBeInTheDocument();
+        expect(screen.getByText("Test Job 2")).toBeInTheDocument();
+        expect(screen.getByText("Test Job 3")).toBeInTheDocument();
+      });
+    });
+
+    it("resets pagination when filter changes", async () => {
+      const manyJobs: CopyJobType[] = Array.from({ length: 25 }, (_, i) => ({
+        ...mockJobs[0],
+        ID: `job-${i + 1}`,
+        Name: `Test Job ${i + 1}`,
+      }));
+
+      render(<CopyJobsList jobs={manyJobs} handleActionClick={mockHandleActionClick} pageSize={10} />);
+
+      // Navigate to page 2
+      fireEvent.click(screen.getByLabelText("Go to next page"));
+
+      await waitFor(() => {
+        expect(screen.getByText("Showing 11 - 20 of 25 items")).toBeInTheDocument();
+      });
+
+      // Apply filter - should reset to page 1
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Job 1" } });
+
+      await waitFor(() => {
+        // Filtered results show from the beginning
+        expect(screen.getByText("Test Job 1")).toBeInTheDocument();
+      });
+    });
+
+    it("updates filtered count in pager", async () => {
+      const manyJobs: CopyJobType[] = Array.from({ length: 25 }, (_, i) => ({
+        ...mockJobs[0],
+        ID: `job-${i + 1}`,
+        Name: i < 5 ? `Alpha Job ${i + 1}` : `Beta Job ${i + 1}`,
+      }));
+
+      render(<CopyJobsList jobs={manyJobs} handleActionClick={mockHandleActionClick} pageSize={10} />);
+
+      expect(screen.getByText("Showing 1 - 10 of 25 items")).toBeInTheDocument();
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Alpha" } });
+
+      await waitFor(() => {
+        expect(screen.queryByText("Showing 1 - 10 of 25 items")).not.toBeInTheDocument();
+        // Pager should not be visible since filtered results (5) are less than page size (10)
+        expect(screen.queryByLabelText("Go to next page")).not.toBeInTheDocument();
+      });
+    });
  });

  describe("Pagination", () => {
@@ -342,7 +509,7 @@ describe("CopyJobsList", () => {

  describe("Component Props", () => {
    it("uses default page size when not provided", () => {
-      const manyJobs: CopyJobType[] = Array.from({ length: 12 }, (_, i) => ({
+      const manyJobs: CopyJobType[] = Array.from({ length: 20 }, (_, i) => ({
        ...mockJobs[0],
        ID: `job-${i + 1}`,
        Name: `Test Job ${i + 1}`,
@@ -351,7 +518,7 @@ describe("CopyJobsList", () => {
      render(<CopyJobsList jobs={manyJobs} handleActionClick={mockHandleActionClick} />);

      expect(screen.getByLabelText("Go to next page")).toBeInTheDocument();
-      expect(screen.getByText("Showing 1 - 10 of 12 items")).toBeInTheDocument();
+      expect(screen.getByText("Showing 1 - 15 of 20 items")).toBeInTheDocument();
    });

    it("passes correct props to getColumns function", async () => {
@@ -440,7 +607,33 @@ describe("CopyJobsList", () => {
        render(<CopyJobsList jobs={largeJobsList} handleActionClick={mockHandleActionClick} />);
      }).not.toThrow();

-      expect(screen.getByText("Showing 1 - 10 of 1000 items")).toBeInTheDocument();
+      expect(screen.getByText("Showing 1 - 15 of 1000 items")).toBeInTheDocument();
+    });
+
+    it("handles filtering with null or undefined values gracefully", async () => {
+      const jobsWithNullValues: CopyJobType[] = [
+        {
+          ...mockJobs[0],
+          ID: "job-with-values",
+          Name: "Valid Job",
+        },
+        {
+          ...mockJobs[1],
+          ID: "job-null-name",
+          Name: undefined as unknown as string,
+        },
+      ];
+
+      expect(() => {
+        render(<CopyJobsList jobs={jobsWithNullValues} handleActionClick={mockHandleActionClick} />);
+      }).not.toThrow();
+
+      const filterInput = screen.getByPlaceholderText("Search jobs...");
+      fireEvent.change(filterInput, { target: { value: "Valid" } });
+
+      await waitFor(() => {
+        expect(screen.getByText("Valid Job")).toBeInTheDocument();
+      });
    });
  });
 });
--- a/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx
+++ b/src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx
@@ -12,8 +12,9 @@ import {
  Stack,
  Sticky,
  StickyPositionType,
+  TextField,
 } from "@fluentui/react";
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo } from "react";
 import Pager from "../../../../Common/Pager";
 import { useThemeStore } from "../../../../hooks/useTheme";
 import { getThemeTokens } from "../../../Theme/ThemeUtil";
@@ -30,9 +31,15 @@ interface CopyJobsListProps {
 const styles = {
  container: { height: "100%" } as React.CSSProperties,
  stackItem: { position: "relative", marginBottom: "20px" } as React.CSSProperties,
+  filterContainer: {
+    margin: "15px 5px",
+  },
 };

-const PAGE_SIZE = 10;
+const PAGE_SIZE = 15;
+
+// Columns to search across
+const searchableFields = ["Name", "Status", "LastUpdatedTime", "Mode"];

 const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pageSize = PAGE_SIZE }) => {
  const isDarkMode = useThemeStore((state) => state.isDarkMode);
@@ -41,6 +48,23 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
  const [sortedJobs, setSortedJobs] = React.useState<CopyJobType[]>(jobs);
  const [sortedColumnKey, setSortedColumnKey] = React.useState<string | undefined>(undefined);
  const [isSortedDescending, setIsSortedDescending] = React.useState<boolean>(false);
+  const [filterText, setFilterText] = React.useState<string>("");
+
+  const filteredJobs = useMemo(() => {
+    if (!filterText) {
+      return sortedJobs;
+    }
+    const lowerFilterText = filterText.toLowerCase();
+    return sortedJobs.filter((job: any) => {
+      return searchableFields.some((field) => {
+        const value = job[field];
+        if (value === undefined || value === null) {
+          return false;
+        }
+        return String(value).toLowerCase().includes(lowerFilterText);
+      });
+    });
+  }, [sortedJobs, filterText]);

  useEffect(() => {
    setSortedJobs(jobs);
@@ -64,7 +88,15 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
    setStartIndex(0);
  };

-  const columns: IColumn[] = getColumns(handleSort, handleActionClick, sortedColumnKey, isSortedDescending);
+  const sortableColumns: IColumn[] = getColumns(handleSort, handleActionClick, sortedColumnKey, isSortedDescending);
+
+  const handleFilterTextChange = (
+    _event: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>,
+    newValue?: string,
+  ) => {
+    setFilterText(newValue || "");
+    setStartIndex(0);
+  };

  const _handleRowClick = (job: CopyJobType) => {
    openCopyJobDetailsPanel(job);
@@ -81,14 +113,25 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
  return (
    <div style={styles.container}>
      <Stack verticalFill={true}>
+        <Stack.Item>
+          <div style={styles.filterContainer}>
+            <TextField
+              data-test="CopyJobsList/FilterTextField"
+              placeholder="Search jobs..."
+              ariaLabel="Search jobs"
+              value={filterText}
+              onChange={handleFilterTextChange}
+            />
+          </div>
+        </Stack.Item>
        <Stack.Item verticalFill={true} grow={1} shrink={1} style={styles.stackItem}>
          <ScrollablePane scrollbarVisibility={ScrollbarVisibility.auto}>
            <ShimmeredDetailsList
              className="CopyJobListContainer"
              onRenderRow={_onRenderRow}
              checkboxVisibility={2}
-              columns={columns}
-              items={sortedJobs.slice(startIndex, startIndex + pageSize)}
+              columns={sortableColumns}
+              items={filteredJobs.slice(startIndex, startIndex + pageSize)}
              enableShimmer={false}
              constrainMode={ConstrainMode.unconstrained}
              layoutMode={DetailsListLayoutMode.justified}
@@ -117,12 +160,12 @@ const CopyJobsList: React.FC<CopyJobsListProps> = ({ jobs, handleActionClick, pa
            />
          </ScrollablePane>
        </Stack.Item>
-        {sortedJobs.length > pageSize && (
+        {filteredJobs.length > pageSize && (
          <Stack.Item>
            <Pager
              disabled={false}
              startIndex={startIndex}
-              totalCount={sortedJobs.length}
+              totalCount={filteredJobs.length}
              pageSize={pageSize}
              onLoadPage={(startIdx /* pageSize */) => {
                setStartIndex(startIdx);
--- a/src/Explorer/ContainerCopy/containerCopyStyles.less
+++ b/src/Explorer/ContainerCopy/containerCopyStyles.less
@@ -1,5 +1,27 @@
@import "../../../less/Common/Constants.less";

+.themedTextFieldStyles() {
+  .ms-TextField {
+    .ms-TextField-fieldGroup {
+      background-color: var(--colorNeutralBackground1);
+      border-color: var(--colorNeutralStroke1);
+    }
+
+    .ms-TextField-field {
+      color: var(--colorNeutralForeground1);
+      background-color: var(--colorNeutralBackground1);
+
+      &::placeholder {
+        color: var(--colorNeutralForeground4);
+      }
+    }
+
+    .ms-Label {
+      color: var(--colorNeutralForeground1);
+    }
+  }
+}
+
 // Common theme-aware classes
 .themeText {
  color: var(--colorNeutralForeground1);
@@ -119,25 +141,8 @@
      filter: invert(1);
    }

-    .ms-TextField {
-      .ms-TextField-fieldGroup {
-        background-color: var(--colorNeutralBackground1);
-        border-color: var(--colorNeutralStroke1);
-      }
+    .themedTextFieldStyles();

-      .ms-TextField-field {
-        color: var(--colorNeutralForeground1);
-        background-color: var(--colorNeutralBackground1);
-
-        &::placeholder {
-          color: var(--colorNeutralForeground4);
-        }
-      }
-
-      .ms-Label {
-        color: var(--colorNeutralForeground1);
-      }
-    }
    .migrationTypeDescription {
      p {
        color: var(--colorNeutralForeground1);
@@ -173,6 +178,11 @@
  width: 100%;
  max-width: 100%;
  margin: 0 auto;
+
+  body.isDarkMode & {
+    .themedTextFieldStyles();
+  }
+
  .ms-DetailsList {
    width: 100%;

--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -2,9 +2,18 @@
 import "./ReactDevTools";

 // CSS Dependencies
-import { initializeIcons } from "@fluentui/react";
+import { initializeIcons, loadTheme, useTheme } from "@fluentui/react";
+import { FluentProvider, makeStyles, webDarkTheme, webLightTheme } from "@fluentui/react-components";
+import { Platform } from "ConfigContext";
+import ContainerCopyPanel from "Explorer/ContainerCopy/ContainerCopyPanel";
+import Explorer from "Explorer/Explorer";
+import { QuickstartCarousel } from "Explorer/Quickstart/QuickstartCarousel";
+import { MongoQuickstartTutorial } from "Explorer/Quickstart/Tutorials/MongoQuickstartTutorial";
+import { SQLQuickstartTutorial } from "Explorer/Quickstart/Tutorials/SQLQuickstartTutorial";
+import { userContext } from "UserContext";
 import "allotment/dist/style.css";
 import "bootstrap/dist/css/bootstrap.css";
+import { useCarousel } from "hooks/useCarousel";
 import React from "react";
 import ReactDOM from "react-dom";
 import "../externals/jquery-ui.min.css";
@@ -15,8 +24,13 @@ import "../externals/jquery.dataTables.min.css";
 import "../externals/jquery.typeahead.min.css";
 import "../externals/jquery.typeahead.min.js";
 // Image Dependencies
+import { SidePanel } from "Explorer/Panes/PanelContainerComponent";
+import { QueryCopilotCarousel } from "Explorer/QueryCopilot/CopilotCarousel";
+import { SidebarContainer } from "Explorer/Sidebar";
+import { KeyboardShortcutRoot } from "KeyboardShortcuts";
 import "allotment/dist/style.css";
 import "../images/CosmosDB_rgb_ui_lighttheme.ico";
+import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";
 import "../images/favicon.ico";
 import "../less/TableStyles/CustomizeColumns.less";
 import "../less/TableStyles/EntityEditor.less";
@@ -28,29 +42,182 @@ import "../less/infobox.less";
 import "../less/menus.less";
 import "../less/messagebox.less";
 import "../less/resourceTree.less";
+import * as StyleConstants from "./Common/StyleConstants";
 import "./Explorer/Controls/Accordion/AccordionComponent.less";
 import "./Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.less";
+import { Dialog } from "./Explorer/Controls/Dialog";
 import "./Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.less";
 import "./Explorer/Controls/JsonEditor/JsonEditorComponent.less";
 import "./Explorer/Controls/Notebook/NotebookTerminalComponent.less";
 import "./Explorer/Controls/TreeComponent/treeComponent.less";
+import { ErrorBoundary } from "./Explorer/ErrorBoundary";
 import "./Explorer/Graph/GraphExplorerComponent/graphExplorer.less";
 import "./Explorer/Menus/CommandBar/CommandBarComponent.less";
+import { CommandBar } from "./Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import "./Explorer/Menus/CommandBar/ConnectionStatusComponent.less";
 import "./Explorer/Menus/CommandBar/MemoryTrackerComponent.less";
 import "./Explorer/Menus/NotificationConsole/NotificationConsole.less";
+import { NotificationConsole } from "./Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import "./Explorer/Panes/PanelComponent.less";
 import "./Explorer/SplashScreen/SplashScreen.less";
 import "./Libs/jquery";
-import { MetricScenarioProvider } from "./Metrics/MetricScenarioProvider";
-import Root from "./RootComponents/Root";
+import MetricScenario from "./Metrics/MetricEvents";
+import { MetricScenarioProvider, useMetricScenario } from "./Metrics/MetricScenarioProvider";
+import { ApplicationMetricPhase } from "./Metrics/ScenarioConfig";
+import { useInteractive } from "./Metrics/useMetricPhases";
+import { appThemeFabric } from "./Platform/Fabric/FabricTheme";
 import "./Shared/appInsights";
+import { useConfig } from "./hooks/useConfig";
+import { useKnockoutExplorer } from "./hooks/useKnockoutExplorer";
+import { useThemeStore } from "./hooks/useTheme";
 import "./less/DarkModeMenus.less";
 import "./less/ThemeSystem.less";
-
 // Initialize icons before React is loaded
 initializeIcons(undefined, { disableWarnings: true });

+const useStyles = makeStyles({
+  root: {
+    height: "100vh",
+    width: "100vw",
+    backgroundColor: "var(--colorNeutralBackground1)",
+    color: "var(--colorNeutralForeground1)",
+  },
+});
+
+const App = (): JSX.Element => {
+  const config = useConfig();
+  const styles = useStyles();
+  // theme is used for application-wide styling
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const theme = useTheme();
+
+  // Load Fabric theme and styles only once when platform is Fabric
+  React.useEffect(() => {
+    if (config?.platform === Platform.Fabric) {
+      loadTheme(appThemeFabric);
+      import("../less/documentDBFabric.less");
+    }
+    StyleConstants.updateStyles();
+  }, [config?.platform]);
+
+  const explorer = useKnockoutExplorer(config?.platform);
+
+  // Scenario-based health tracking: start ApplicationLoad and complete phases.
+  const { startScenario, completePhase } = useMetricScenario();
+  React.useEffect(() => {
+    // Only start scenario after config is initialized to avoid race conditions
+    // with message handlers that depend on configContext.platform
+    if (config) {
+      startScenario(MetricScenario.ApplicationLoad);
+    }
+  }, [config, startScenario]);
+
+  React.useEffect(() => {
+    if (explorer) {
+      completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [explorer]);
+
+  if (!explorer) {
+    return <LoadingExplorer />;
+  }
+
+  return (
+    <div id="Main" className={styles.root}>
+      <KeyboardShortcutRoot>
+        <div className="flexContainer" aria-hidden="false">
+          {userContext.features.enableContainerCopy && userContext.apiType === "SQL" ? (
+            <>
+              <ContainerCopyPanel explorer={explorer} />
+              <SidePanel />
+              <Dialog />
+            </>
+          ) : (
+            <DivExplorer explorer={explorer} />
+          )}
+        </div>
+      </KeyboardShortcutRoot>
+    </div>
+  );
+};
+
+const DivExplorer: React.FC<{ explorer: Explorer }> = ({ explorer }) => {
+  const isCarouselOpen = useCarousel((state) => state.shouldOpen);
+  const isCopilotCarouselOpen = useCarousel((state) => state.showCopilotCarousel);
+  useInteractive(MetricScenario.ApplicationLoad);
+
+  return (
+    <div
+      className="flexContainer"
+      style={{
+        flex: 1,
+        display: "flex",
+        flexDirection: "column",
+        backgroundColor: "var(--colorNeutralBackground1)",
+        color: "var(--colorNeutralForeground1)",
+      }}
+      aria-hidden="false"
+      data-test="DataExplorerRoot"
+    >
+      <div
+        id="divExplorer"
+        className="flexContainer hideOverflows"
+        style={{
+          flex: 1,
+          display: "flex",
+          flexDirection: "column",
+          backgroundColor: "var(--colorNeutralBackground1)",
+          color: "var(--colorNeutralForeground1)",
+        }}
+      >
+        <div id="freeTierTeachingBubble"> </div>
+        <CommandBar container={explorer} />
+        <SidebarContainer explorer={explorer} />
+        <div
+          className="dataExplorerErrorConsoleContainer"
+          role="contentinfo"
+          aria-label="Notification console"
+          id="explorerNotificationConsole"
+          style={{
+            backgroundColor: "var(--colorNeutralBackground1)",
+            color: "var(--colorNeutralForeground1)",
+          }}
+        >
+          <NotificationConsole />
+        </div>
+      </div>
+      <SidePanel />
+      <Dialog />
+      {<QuickstartCarousel isOpen={isCarouselOpen} />}
+      {<SQLQuickstartTutorial />}
+      {<MongoQuickstartTutorial />}
+      {<QueryCopilotCarousel isOpen={isCopilotCarouselOpen} explorer={explorer} />}
+    </div>
+  );
+};
+
+const Root: React.FC = () => {
+  // Use React state to track isDarkMode and subscribe to changes
+  const [isDarkMode, setIsDarkMode] = React.useState(useThemeStore.getState().isDarkMode);
+  const currentTheme = isDarkMode ? webDarkTheme : webLightTheme;
+
+  // Subscribe to theme changes
+  React.useEffect(() => {
+    return useThemeStore.subscribe((state) => {
+      setIsDarkMode(state.isDarkMode);
+    });
+  }, []);
+
+  return (
+    <ErrorBoundary>
+      <FluentProvider theme={currentTheme}>
+        <App />
+      </FluentProvider>
+    </ErrorBoundary>
+  );
+};
+
 const mainElement = document.getElementById("Main");
 if (mainElement) {
  ReactDOM.render(
@@ -60,3 +227,24 @@ if (mainElement) {
    mainElement,
  );
 }
+
+function LoadingExplorer(): JSX.Element {
+  const styles = useStyles();
+  return (
+    <div className={styles.root}>
+      <div className="splashLoaderContainer">
+        <div className="splashLoaderContentContainer">
+          <p className="connectExplorerContent">
+            <img src={hdeConnectImage} alt="Azure Cosmos DB" />
+          </p>
+          <p className="splashLoaderTitle" id="explorerLoadingStatusTitle">
+            Welcome to Azure Cosmos DB
+          </p>
+          <p className="splashLoaderText" id="explorerLoadingStatusText" role="alert">
+            Connecting...
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+}
--- a/src/Metrics/MetricScenarioProvider.tsx
+++ b/src/Metrics/MetricScenarioProvider.tsx
@@ -3,7 +3,7 @@ import MetricScenario from "./MetricEvents";
 import { MetricPhase } from "./ScenarioConfig";
 import { scenarioMonitor } from "./ScenarioMonitor";

-export interface MetricScenarioContextValue {
+interface MetricScenarioContextValue {
  startScenario: (scenario: MetricScenario) => void;
  startPhase: (scenario: MetricScenario, phase: MetricPhase) => void;
  completePhase: (scenario: MetricScenario, phase: MetricPhase) => void;
--- a/src/NotebookViewer/NotebookViewer.tsx
+++ b/src/NotebookViewer/NotebookViewer.tsx
@@ -1,88 +0,0 @@
-import { initializeIcons } from "@fluentui/react";
-import "bootstrap/dist/css/bootstrap.css";
-import React from "react";
-import * as ReactDOM from "react-dom";
-import { configContext, initializeConfiguration } from "../ConfigContext";
-import { GalleryHeaderComponent } from "../Explorer/Controls/Header/GalleryHeaderComponent";
-import { GalleryTab } from "../Explorer/Controls/NotebookGallery/GalleryViewerComponent";
-import {
-  NotebookViewerComponent,
-  NotebookViewerComponentProps,
-} from "../Explorer/Controls/NotebookViewer/NotebookViewerComponent";
-import * as FileSystemUtil from "../Explorer/Notebook/FileSystemUtil";
-import { IGalleryItem, JunoClient } from "../Juno/JunoClient";
-import * as GalleryUtils from "../Utils/GalleryUtils";
-
-const onInit = async () => {
-  initializeIcons();
-  await initializeConfiguration();
-  const galleryViewerProps = GalleryUtils.getGalleryViewerProps(window.location.search);
-  const notebookViewerProps = GalleryUtils.getNotebookViewerProps(window.location.search);
-  let backNavigationText: string;
-  let onBackClick: () => void;
-  if (galleryViewerProps.selectedTab !== undefined) {
-    backNavigationText = GalleryUtils.getTabTitle(galleryViewerProps.selectedTab);
-    onBackClick = () =>
-      (window.location.href = `${configContext.hostedExplorerURL}gallery.html?tab=${
-        GalleryTab[galleryViewerProps.selectedTab]
-      }`);
-  }
-  const hideInputs = notebookViewerProps.hideInputs;
-
-  const notebookUrl = decodeURIComponent(notebookViewerProps.notebookUrl);
-
-  const galleryItemId = notebookViewerProps.galleryItemId;
-  let galleryItem: IGalleryItem;
-
-  if (galleryItemId) {
-    const junoClient = new JunoClient();
-    const galleryItemJunoResponse = await junoClient.getNotebookInfo(galleryItemId);
-    galleryItem = galleryItemJunoResponse.data;
-  }
-
-  // The main purpose of hiding the prompt is to hide everything when hiding inputs.
-  // It is generally not very useful to just hide the prompt.
-  const hidePrompts = hideInputs;
-
-  render(notebookUrl, backNavigationText, hideInputs, hidePrompts, galleryItem, onBackClick);
-};
-
-const render = (
-  notebookUrl: string,
-  backNavigationText: string,
-  hideInputs?: boolean,
-  hidePrompts?: boolean,
-  galleryItem?: IGalleryItem,
-  onBackClick?: () => void,
-) => {
-  const props: NotebookViewerComponentProps = {
-    junoClient: galleryItem ? new JunoClient() : undefined,
-    notebookUrl,
-    galleryItem,
-    backNavigationText,
-    hideInputs,
-    hidePrompts,
-    onBackClick: onBackClick,
-    onTagClick: undefined,
-  };
-
-  if (galleryItem) {
-    document.title = FileSystemUtil.stripExtension(galleryItem.name, "ipynb");
-  }
-
-  const element = (
-    <>
-      <header>
-        <GalleryHeaderComponent />
-      </header>
-      <div style={{ marginLeft: 120, marginRight: 120 }}>
-        <NotebookViewerComponent {...props} />
-      </div>
-    </>
-  );
-
-  ReactDOM.render(element, document.getElementById("notebookContent"));
-};
-
-// Entry point
-window.addEventListener("load", onInit);
--- a/src/Platform/Hosted/extractFeatures.ts
+++ b/src/Platform/Hosted/extractFeatures.ts
@@ -94,7 +94,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
    notebookBasePath: get("notebookbasepath"),
    notebookServerToken: get("notebookservertoken"),
    notebookServerUrl: get("notebookserverurl"),
-    sandboxNotebookOutputs: "true" === get("sandboxnotebookoutputs", "true"),
+    sandboxNotebookOutputs: true,
    selfServeType: get("selfservetype"),
    showMinRUSurvey: "true" === get("showminrusurvey"),
    ttl90Days: "true" === get("ttl90days"),
--- a/src/RootComponents/App.test.tsx
+++ b/src/RootComponents/App.test.tsx
@@ -1,314 +0,0 @@
-import { loadTheme } from "@fluentui/react";
-import "@testing-library/jest-dom";
-import { render, screen, waitFor } from "@testing-library/react";
-import React from "react";
-import * as StyleConstants from "../Common/StyleConstants";
-import { Platform } from "../ConfigContext";
-import { useConfig } from "../hooks/useConfig";
-import { useKnockoutExplorer } from "../hooks/useKnockoutExplorer";
-import { MetricScenarioContextValue, useMetricScenario } from "../Metrics/MetricScenarioProvider";
-import App from "./App";
-
-const mockUserContext = {
-  features: { enableContainerCopy: false },
-  apiType: "SQL",
-};
-
-jest.mock("@fluentui/react", () => ({
-  loadTheme: jest.fn(),
-  makeStyles: jest.fn(() => () => ({
-    root: "mock-app-root-class",
-  })),
-  MessageBarType: {
-    error: "error",
-    warning: "warning",
-    info: "info",
-    success: "success",
-  },
-  SpinnerSize: {
-    xSmall: "xSmall",
-    small: "small",
-    medium: "medium",
-    large: "large",
-  },
-}));
-
-jest.mock("../Common/StyleConstants", () => ({
-  StyleConstants: {
-    BaseMedium: "#000000",
-    AccentMediumHigh: "#0078d4",
-    AccentMedium: "#106ebe",
-    AccentLight: "#deecf9",
-    AccentAccentExtra: "#0078d4",
-    FabricAccentMediumHigh: "#0078d4",
-    FabricAccentMedium: "#106ebe",
-    FabricAccentLight: "#deecf9",
-    PortalAccentMediumHigh: "#0078d4",
-    PortalAccentMedium: "#106ebe",
-    PortalAccentLight: "#deecf9",
-  },
-  updateStyles: jest.fn(),
-}));
-
-jest.mock("./LoadingExplorer", () => {
-  const MockLoadingExplorer = () => {
-    return <div data-testid="mock-loading-explorer">Loading Explorer</div>;
-  };
-  MockLoadingExplorer.displayName = "MockLoadingExplorer";
-  return MockLoadingExplorer;
-});
-
-jest.mock("./ExplorerContainer", () => {
-  const MockExplorerContainer = ({ explorer }: { explorer: unknown }) => {
-    return (
-      <div data-testid="mock-explorer-container">Explorer Container - {explorer ? "with explorer" : "no explorer"}</div>
-    );
-  };
-  MockExplorerContainer.displayName = "MockExplorerContainer";
-  return MockExplorerContainer;
-});
-
-jest.mock("../Explorer/ContainerCopy/ContainerCopyPanel", () => {
-  const MockContainerCopyPanel = ({ explorer }: { explorer: unknown }) => {
-    return (
-      <div data-testid="mock-container-copy-panel">
-        Container Copy Panel - {explorer ? "with explorer" : "no explorer"}
-      </div>
-    );
-  };
-  MockContainerCopyPanel.displayName = "MockContainerCopyPanel";
-  return MockContainerCopyPanel;
-});
-
-jest.mock("../KeyboardShortcuts", () => ({
-  KeyboardShortcutRoot: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="mock-keyboard-shortcut-root">{children}</div>
-  ),
-}));
-
-jest.mock("../UserContext", () => ({
-  get userContext() {
-    return mockUserContext;
-  },
-}));
-
-const mockConfig = {
-  platform: Platform.Portal,
-};
-
-const mockExplorer = {
-  id: "test-explorer",
-  name: "Test Explorer",
-};
-
-jest.mock("../hooks/useConfig", () => ({
-  useConfig: jest.fn(() => mockConfig),
-}));
-
-jest.mock("../hooks/useKnockoutExplorer", () => ({
-  useKnockoutExplorer: jest.fn(),
-}));
-
-jest.mock("../Metrics/MetricScenarioProvider", () => ({
-  useMetricScenario: jest.fn(() => ({
-    startScenario: jest.fn(),
-    completePhase: jest.fn(),
-  })),
-}));
-
-jest.mock("../Metrics/MetricEvents", () => ({
-  __esModule: true,
-  default: {
-    ApplicationLoad: "ApplicationLoad",
-  },
-}));
-
-jest.mock("../Metrics/ScenarioConfig", () => ({
-  ApplicationMetricPhase: {
-    ExplorerInitialized: "ExplorerInitialized",
-  },
-  CommonMetricPhase: {
-    Interactive: "Interactive",
-  },
-}));
-
-jest.mock("../Platform/Fabric/FabricTheme", () => ({
-  appThemeFabric: { name: "fabric-theme" },
-}));
-
-describe("App", () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-    mockUserContext.features = { enableContainerCopy: false };
-    mockUserContext.apiType = "SQL";
-  });
-  let mockStartScenario: jest.Mock;
-  let mockCompletePhase: jest.Mock;
-  let mockUseKnockoutExplorer: jest.Mock;
-  let mockUseConfig: jest.Mock;
-  let mockLoadTheme: jest.Mock;
-  let mockUpdateStyles: jest.Mock;
-
-  beforeEach(() => {
-    mockStartScenario = jest.fn();
-    mockCompletePhase = jest.fn();
-
-    mockUseKnockoutExplorer = jest.mocked(useKnockoutExplorer);
-    mockUseConfig = jest.mocked(useConfig);
-    mockLoadTheme = jest.mocked(loadTheme);
-    mockUpdateStyles = jest.mocked(StyleConstants.updateStyles);
-
-    const mockUseMetricScenario = jest.mocked(useMetricScenario);
-    mockUseMetricScenario.mockReturnValue({
-      startScenario: mockStartScenario,
-      completePhase: mockCompletePhase,
-    } as unknown as MetricScenarioContextValue);
-
-    mockUseConfig.mockReturnValue(mockConfig);
-    mockUseKnockoutExplorer.mockReturnValue(null);
-  });
-
-  test("should render loading explorer when explorer is not ready", () => {
-    mockUseKnockoutExplorer.mockReturnValue(null);
-
-    render(<App />);
-
-    expect(screen.getByTestId("mock-loading-explorer")).toBeInTheDocument();
-    expect(screen.queryByTestId("mock-explorer-container")).not.toBeInTheDocument();
-  });
-
-  test("should render explorer container when explorer is ready", () => {
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    render(<App />);
-
-    expect(screen.getByTestId("mock-explorer-container")).toBeInTheDocument();
-    expect(screen.queryByTestId("mock-loading-explorer")).not.toBeInTheDocument();
-  });
-
-  test("should start metric scenario on mount", () => {
-    render(<App />);
-
-    expect(mockStartScenario).toHaveBeenCalledWith("ApplicationLoad");
-    expect(mockStartScenario).toHaveBeenCalledTimes(1);
-  });
-
-  test("should complete metric phase when explorer is initialized", async () => {
-    const { rerender } = render(<App />);
-
-    expect(mockCompletePhase).not.toHaveBeenCalled();
-
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-    rerender(<App />);
-
-    await waitFor(() => {
-      expect(mockCompletePhase).toHaveBeenCalledWith("ApplicationLoad", "ExplorerInitialized");
-    });
-  });
-
-  test("should load fabric theme when platform is Fabric", () => {
-    const fabricConfig = { platform: Platform.Fabric };
-    mockUseConfig.mockReturnValue(fabricConfig);
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    render(<App />);
-
-    expect(mockLoadTheme).toHaveBeenCalledWith({ name: "fabric-theme" });
-  });
-
-  test("should not load fabric theme when platform is not Fabric", () => {
-    const portalConfig = { platform: Platform.Portal };
-    mockUseConfig.mockReturnValue(portalConfig);
-
-    render(<App />);
-
-    expect(mockLoadTheme).not.toHaveBeenCalled();
-  });
-
-  test("should always call updateStyles", () => {
-    render(<App />);
-
-    expect(mockUpdateStyles).toHaveBeenCalled();
-  });
-
-  test("should render container copy panel when container copy is enabled and API is SQL", () => {
-    mockUserContext.features = { enableContainerCopy: true };
-    mockUserContext.apiType = "SQL";
-
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    render(<App />);
-
-    expect(screen.getByTestId("mock-container-copy-panel")).toBeInTheDocument();
-    expect(screen.queryByTestId("mock-explorer-container")).not.toBeInTheDocument();
-  });
-
-  test("should render explorer container when container copy is disabled", () => {
-    mockUserContext.features = { enableContainerCopy: false };
-    mockUserContext.apiType = "SQL";
-
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    render(<App />);
-
-    expect(screen.getByTestId("mock-explorer-container")).toBeInTheDocument();
-    expect(screen.queryByTestId("mock-container-copy-panel")).not.toBeInTheDocument();
-  });
-
-  test("should render explorer container when API is not SQL", () => {
-    mockUserContext.features = { enableContainerCopy: true };
-    mockUserContext.apiType = "MongoDB";
-
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    render(<App />);
-
-    expect(screen.getByTestId("mock-explorer-container")).toBeInTheDocument();
-    expect(screen.queryByTestId("mock-container-copy-panel")).not.toBeInTheDocument();
-  });
-
-  test("should have correct DOM structure", () => {
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    const { container } = render(<App />);
-
-    const mainDiv = container.querySelector("#Main");
-    expect(mainDiv).toBeInTheDocument();
-    expect(mainDiv).toHaveClass("mock-app-root-class");
-
-    expect(screen.getByTestId("mock-keyboard-shortcut-root")).toBeInTheDocument();
-
-    const flexContainer = container.querySelector(".flexContainer");
-    expect(flexContainer).toBeInTheDocument();
-    expect(flexContainer).toHaveAttribute("aria-hidden", "false");
-  });
-
-  test("should handle config changes for Fabric platform", () => {
-    const { rerender } = render(<App />);
-
-    const fabricConfig = { platform: Platform.Fabric };
-    mockUseConfig.mockReturnValue(fabricConfig);
-
-    rerender(<App />);
-
-    expect(mockLoadTheme).toHaveBeenCalledWith({ name: "fabric-theme" });
-  });
-
-  test("should pass explorer to child components", () => {
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    render(<App />);
-
-    expect(screen.getByText("Explorer Container - with explorer")).toBeInTheDocument();
-  });
-
-  test("should handle null config gracefully", () => {
-    mockUseConfig.mockReturnValue(null);
-    mockUseKnockoutExplorer.mockReturnValue(mockExplorer);
-
-    expect(() => render(<App />)).not.toThrow();
-
-    expect(mockLoadTheme).not.toHaveBeenCalled();
-    expect(mockUpdateStyles).toHaveBeenCalled();
-  });
-});
--- a/src/RootComponents/App.tsx
+++ b/src/RootComponents/App.tsx
@@ -1,73 +0,0 @@
-import { loadTheme, makeStyles } from "@fluentui/react";
-import React from "react";
-import * as StyleConstants from "../Common/StyleConstants";
-import { Platform } from "../ConfigContext";
-import ContainerCopyPanel from "../Explorer/ContainerCopy/ContainerCopyPanel";
-import { useConfig } from "../hooks/useConfig";
-import { useKnockoutExplorer } from "../hooks/useKnockoutExplorer";
-import { KeyboardShortcutRoot } from "../KeyboardShortcuts";
-import MetricScenario from "../Metrics/MetricEvents";
-import { useMetricScenario } from "../Metrics/MetricScenarioProvider";
-import { ApplicationMetricPhase } from "../Metrics/ScenarioConfig";
-import { appThemeFabric } from "../Platform/Fabric/FabricTheme";
-import { userContext } from "../UserContext";
-import ExplorerContainer from "./ExplorerContainer";
-import LoadingExplorer from "./LoadingExplorer";
-
-const useStyles = makeStyles({
-  root: {
-    height: "100vh",
-    width: "100vw",
-    backgroundColor: "var(--colorNeutralBackground1)",
-    color: "var(--colorNeutralForeground1)",
-  },
-});
-
-const App = (): JSX.Element => {
-  const config = useConfig();
-  const styles = useStyles();
-  // Load Fabric theme and styles only once when platform is Fabric
-  React.useEffect(() => {
-    if (config?.platform === Platform.Fabric) {
-      loadTheme(appThemeFabric);
-      import("../../less/documentDBFabric.less");
-    }
-    StyleConstants.updateStyles();
-  }, [config?.platform]);
-
-  const explorer = useKnockoutExplorer(config?.platform);
-
-  // Scenario-based health tracking: start ApplicationLoad and complete phases.
-  const { startScenario, completePhase } = useMetricScenario();
-  React.useEffect(() => {
-    startScenario(MetricScenario.ApplicationLoad);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  React.useEffect(() => {
-    if (explorer) {
-      completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [explorer]);
-
-  if (!explorer) {
-    return <LoadingExplorer />;
-  }
-
-  return (
-    <div id="Main" className={styles.root}>
-      <KeyboardShortcutRoot>
-        <div className="flexContainer" aria-hidden="false">
-          {userContext.features.enableContainerCopy && userContext.apiType === "SQL" ? (
-            <ContainerCopyPanel explorer={explorer} />
-          ) : (
-            <ExplorerContainer explorer={explorer} />
-          )}
-        </div>
-      </KeyboardShortcutRoot>
-    </div>
-  );
-};
-
-export default App;
--- a/src/RootComponents/ExplorerContainer.test.tsx
+++ b/src/RootComponents/ExplorerContainer.test.tsx
@@ -1,183 +0,0 @@
-import "@testing-library/jest-dom";
-import { render, screen } from "@testing-library/react";
-import React from "react";
-import Explorer from "../Explorer/Explorer";
-import { useCarousel } from "../hooks/useCarousel";
-import { useInteractive } from "../Metrics/useMetricPhases";
-import ExplorerContainer from "./ExplorerContainer";
-
-jest.mock("../Explorer/Controls/Dialog", () => ({
-  Dialog: () => <div data-testid="mock-dialog">Dialog</div>,
-}));
-
-jest.mock("../Explorer/Menus/CommandBar/CommandBarComponentAdapter", () => ({
-  CommandBar: ({ container }: { container: Explorer }) => (
-    <div data-testid="mock-command-bar">CommandBar - {container ? "with explorer" : "no explorer"}</div>
-  ),
-}));
-
-jest.mock("../Explorer/Menus/NotificationConsole/NotificationConsoleComponent", () => ({
-  NotificationConsole: () => <div data-testid="mock-notification-console">NotificationConsole</div>,
-}));
-
-jest.mock("../Explorer/Panes/PanelContainerComponent", () => ({
-  SidePanel: () => <div data-testid="mock-side-panel">SidePanel</div>,
-}));
-
-jest.mock("../Explorer/QueryCopilot/CopilotCarousel", () => ({
-  QueryCopilotCarousel: ({ isOpen, explorer }: { isOpen: boolean; explorer: Explorer }) => (
-    <div data-testid="mock-copilot-carousel">
-      CopilotCarousel - {isOpen ? "open" : "closed"} - {explorer ? "with explorer" : "no explorer"}
-    </div>
-  ),
-}));
-
-jest.mock("../Explorer/Quickstart/QuickstartCarousel", () => ({
-  QuickstartCarousel: ({ isOpen }: { isOpen: boolean }) => (
-    <div data-testid="mock-quickstart-carousel">QuickstartCarousel - {isOpen ? "open" : "closed"}</div>
-  ),
-}));
-
-jest.mock("../Explorer/Quickstart/Tutorials/MongoQuickstartTutorial", () => ({
-  MongoQuickstartTutorial: () => <div data-testid="mock-mongo-tutorial">MongoQuickstartTutorial</div>,
-}));
-
-jest.mock("../Explorer/Quickstart/Tutorials/SQLQuickstartTutorial", () => ({
-  SQLQuickstartTutorial: () => <div data-testid="mock-sql-tutorial">SQLQuickstartTutorial</div>,
-}));
-
-jest.mock("../Explorer/Sidebar", () => ({
-  SidebarContainer: ({ explorer }: { explorer: Explorer }) => (
-    <div data-testid="mock-sidebar-container">SidebarContainer - {explorer ? "with explorer" : "no explorer"}</div>
-  ),
-}));
-
-jest.mock("../hooks/useCarousel", () => ({
-  useCarousel: jest.fn((selector) => {
-    if (selector.toString().includes("shouldOpen")) {
-      return true;
-    }
-    if (selector.toString().includes("showCopilotCarousel")) {
-      return false;
-    }
-    return false;
-  }),
-}));
-
-jest.mock("../Metrics/useMetricPhases", () => ({
-  useInteractive: jest.fn(),
-}));
-
-jest.mock("../Metrics/MetricEvents", () => ({
-  __esModule: true,
-  default: {
-    ApplicationLoad: "ApplicationLoad",
-  },
-}));
-
-describe("ExplorerContainer", () => {
-  let mockExplorer: Explorer;
-
-  beforeEach(() => {
-    mockExplorer = {
-      id: "test-explorer",
-      name: "Test Explorer",
-    } as unknown as Explorer;
-
-    jest.clearAllMocks();
-  });
-
-  test("should render explorer container with all components", () => {
-    const { container } = render(<ExplorerContainer explorer={mockExplorer} />);
-
-    const mainContainer = container.querySelector('[data-test="DataExplorerRoot"]');
-    expect(mainContainer).toBeInTheDocument();
-    expect(mainContainer).toHaveClass("flexContainer");
-
-    expect(screen.getByTestId("mock-command-bar")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-sidebar-container")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-notification-console")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-side-panel")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-quickstart-carousel")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-sql-tutorial")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-mongo-tutorial")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-copilot-carousel")).toBeInTheDocument();
-  });
-
-  test("should pass explorer to components that need it", () => {
-    render(<ExplorerContainer explorer={mockExplorer} />);
-
-    expect(screen.getByText("CommandBar - with explorer")).toBeInTheDocument();
-    expect(screen.getByText("SidebarContainer - with explorer")).toBeInTheDocument();
-    expect(screen.getByText("CopilotCarousel - closed - with explorer")).toBeInTheDocument();
-  });
-
-  test("should have correct DOM structure", () => {
-    const { container } = render(<ExplorerContainer explorer={mockExplorer} />);
-
-    const mainContainer = container.querySelector('[data-test="DataExplorerRoot"]');
-    expect(mainContainer).toBeInTheDocument();
-    expect(mainContainer).toHaveAttribute("aria-hidden", "false");
-
-    const divExplorer = container.querySelector("#divExplorer");
-    expect(divExplorer).toBeInTheDocument();
-    expect(divExplorer).toHaveClass("flexContainer", "hideOverflows");
-
-    const freeTierBubble = container.querySelector("#freeTierTeachingBubble");
-    expect(freeTierBubble).toBeInTheDocument();
-
-    const notificationContainer = container.querySelector("#explorerNotificationConsole");
-    expect(notificationContainer).toBeInTheDocument();
-    expect(notificationContainer).toHaveClass("dataExplorerErrorConsoleContainer");
-    expect(notificationContainer).toHaveAttribute("role", "contentinfo");
-    expect(notificationContainer).toHaveAttribute("aria-label", "Notification console");
-  });
-
-  test("should apply correct inline styles", () => {
-    const { container } = render(<ExplorerContainer explorer={mockExplorer} />);
-
-    const mainContainer = container.querySelector('[data-test="DataExplorerRoot"]');
-    expect(mainContainer).toHaveStyle({
-      flex: "1",
-      display: "flex",
-      flexDirection: "column",
-      backgroundColor: "var(--colorNeutralBackground1)",
-      color: "var(--colorNeutralForeground1)",
-    });
-
-    const divExplorer = container.querySelector("#divExplorer");
-    expect(divExplorer).toHaveStyle({
-      flex: "1",
-      display: "flex",
-      flexDirection: "column",
-    });
-  });
-
-  test("should handle carousel states correctly", () => {
-    const mockUseCarousel = jest.mocked(useCarousel);
-
-    mockUseCarousel.mockImplementation((selector: { toString: () => string | string[] }) => {
-      if (selector.toString().includes("shouldOpen")) {
-        return false;
-      }
-      if (selector.toString().includes("showCopilotCarousel")) {
-        return true;
-      }
-      return false;
-    });
-
-    render(<ExplorerContainer explorer={mockExplorer} />);
-
-    expect(screen.getByText("QuickstartCarousel - closed")).toBeInTheDocument();
-    expect(screen.getByText("CopilotCarousel - open - with explorer")).toBeInTheDocument();
-  });
-
-  test("should call useInteractive hook with correct metric", () => {
-    const mockUseInteractive = jest.mocked(useInteractive);
-
-    render(<ExplorerContainer explorer={mockExplorer} />);
-
-    expect(mockUseInteractive).toHaveBeenCalledWith("ApplicationLoad");
-  });
-});
--- a/src/RootComponents/ExplorerContainer.tsx
+++ b/src/RootComponents/ExplorerContainer.tsx
@@ -1,71 +0,0 @@
-import React from "react";
-import { Dialog } from "../Explorer/Controls/Dialog";
-import Explorer from "../Explorer/Explorer";
-import { CommandBar } from "../Explorer/Menus/CommandBar/CommandBarComponentAdapter";
-import { NotificationConsole } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
-import { SidePanel } from "../Explorer/Panes/PanelContainerComponent";
-import { QueryCopilotCarousel } from "../Explorer/QueryCopilot/CopilotCarousel";
-import { QuickstartCarousel } from "../Explorer/Quickstart/QuickstartCarousel";
-import { MongoQuickstartTutorial } from "../Explorer/Quickstart/Tutorials/MongoQuickstartTutorial";
-import { SQLQuickstartTutorial } from "../Explorer/Quickstart/Tutorials/SQLQuickstartTutorial";
-import { SidebarContainer } from "../Explorer/Sidebar";
-import { useCarousel } from "../hooks/useCarousel";
-import MetricScenario from "../Metrics/MetricEvents";
-import { useInteractive } from "../Metrics/useMetricPhases";
-
-const ExplorerContainer: React.FC<{ explorer: Explorer }> = ({ explorer }) => {
-  const isCarouselOpen = useCarousel((state) => state.shouldOpen);
-  const isCopilotCarouselOpen = useCarousel((state) => state.showCopilotCarousel);
-  useInteractive(MetricScenario.ApplicationLoad);
-
-  return (
-    <div
-      className="flexContainer"
-      style={{
-        flex: 1,
-        display: "flex",
-        flexDirection: "column",
-        backgroundColor: "var(--colorNeutralBackground1)",
-        color: "var(--colorNeutralForeground1)",
-      }}
-      aria-hidden="false"
-      data-test="DataExplorerRoot"
-    >
-      <div
-        id="divExplorer"
-        className="flexContainer hideOverflows"
-        style={{
-          flex: 1,
-          display: "flex",
-          flexDirection: "column",
-          backgroundColor: "var(--colorNeutralBackground1)",
-          color: "var(--colorNeutralForeground1)",
-        }}
-      >
-        <div id="freeTierTeachingBubble"> </div>
-        <CommandBar container={explorer} />
-        <SidebarContainer explorer={explorer} />
-        <div
-          className="dataExplorerErrorConsoleContainer"
-          role="contentinfo"
-          aria-label="Notification console"
-          id="explorerNotificationConsole"
-          style={{
-            backgroundColor: "var(--colorNeutralBackground1)",
-            color: "var(--colorNeutralForeground1)",
-          }}
-        >
-          <NotificationConsole />
-        </div>
-      </div>
-      <SidePanel />
-      <Dialog />
-      {<QuickstartCarousel isOpen={isCarouselOpen} />}
-      {<SQLQuickstartTutorial />}
-      {<MongoQuickstartTutorial />}
-      {<QueryCopilotCarousel isOpen={isCopilotCarouselOpen} explorer={explorer} />}
-    </div>
-  );
-};
-
-export default ExplorerContainer;
--- a/src/RootComponents/LoadingExplorer.test.tsx
+++ b/src/RootComponents/LoadingExplorer.test.tsx
@@ -1,71 +0,0 @@
-import "@testing-library/jest-dom";
-import { render, screen } from "@testing-library/react";
-import React from "react";
-import LoadingExplorer from "./LoadingExplorer";
-
-jest.mock("../../images/HdeConnectCosmosDB.svg", () => "test-hde-connect-image.svg");
-
-jest.mock("@fluentui/react-components", () => ({
-  makeStyles: jest.fn(() => () => ({
-    root: "mock-root-class",
-  })),
-}));
-
-describe("LoadingExplorer", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test("should render loading explorer component", () => {
-    render(<LoadingExplorer />);
-
-    const container = screen.getByRole("alert");
-    expect(container).toBeInTheDocument();
-    expect(container).toHaveTextContent("Connecting...");
-  });
-
-  test("should display welcome title", () => {
-    render(<LoadingExplorer />);
-
-    const title = screen.getByText("Welcome to Azure Cosmos DB");
-    expect(title).toBeInTheDocument();
-    expect(title).toHaveAttribute("id", "explorerLoadingStatusTitle");
-  });
-
-  test("should display connecting status text", () => {
-    render(<LoadingExplorer />);
-
-    const statusText = screen.getByText("Connecting...");
-    expect(statusText).toBeInTheDocument();
-    expect(statusText).toHaveAttribute("id", "explorerLoadingStatusText");
-    expect(statusText).toHaveAttribute("role", "alert");
-  });
-
-  test("should render Azure Cosmos DB image", () => {
-    render(<LoadingExplorer />);
-
-    const image = screen.getByAltText("Azure Cosmos DB");
-    expect(image).toBeInTheDocument();
-    expect(image).toHaveAttribute("src", "test-hde-connect-image.svg");
-  });
-
-  test("should have correct class structure", () => {
-    render(<LoadingExplorer />);
-
-    const splashContainer = document.querySelector(".splashLoaderContainer");
-    expect(splashContainer).toBeInTheDocument();
-
-    const contentContainer = document.querySelector(".splashLoaderContentContainer");
-    expect(contentContainer).toBeInTheDocument();
-
-    const connectContent = document.querySelector(".connectExplorerContent");
-    expect(connectContent).toBeInTheDocument();
-  });
-
-  test("should apply CSS classes correctly", () => {
-    const { container } = render(<LoadingExplorer />);
-
-    const rootDiv = container.firstChild as HTMLElement;
-    expect(rootDiv).toHaveClass("mock-root-class");
-  });
-});
--- a/src/RootComponents/LoadingExplorer.tsx
+++ b/src/RootComponents/LoadingExplorer.tsx
@@ -1,36 +0,0 @@
-import { makeStyles } from "@fluentui/react-components";
-import React from "react";
-import hdeConnectImage from "../../images/HdeConnectCosmosDB.svg";
-
-const useStyles = makeStyles({
-  root: {
-    height: "100vh",
-    width: "100vw",
-    backgroundColor: "var(--colorNeutralBackground1)",
-    color: "var(--colorNeutralForeground1)",
-  },
-});
-
-function LoadingExplorer(): JSX.Element {
-  const styles = useStyles();
-
-  return (
-    <div className={styles.root}>
-      <div className="splashLoaderContainer">
-        <div className="splashLoaderContentContainer">
-          <p className="connectExplorerContent">
-            <img src={hdeConnectImage} alt="Azure Cosmos DB" />
-          </p>
-          <p className="splashLoaderTitle" id="explorerLoadingStatusTitle">
-            Welcome to Azure Cosmos DB
-          </p>
-          <p className="splashLoaderText" id="explorerLoadingStatusText" role="alert">
-            Connecting...
-          </p>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default LoadingExplorer;
--- a/src/RootComponents/Root.test.tsx
+++ b/src/RootComponents/Root.test.tsx
@@ -1,94 +0,0 @@
-import "@testing-library/jest-dom";
-import { render, screen } from "@testing-library/react";
-import React from "react";
-import Root from "./Root";
-
-jest.mock("../Explorer/ErrorBoundary", () => ({
-  ErrorBoundary: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="mock-error-boundary">{children}</div>
-  ),
-}));
-
-jest.mock("@fluentui/react-components", () => ({
-  FluentProvider: ({ children, theme }: { children: React.ReactNode; theme: { colorNeutralBackground1: string } }) => (
-    <div
-      data-testid="mock-fluent-provider"
-      data-theme={theme.colorNeutralBackground1 === "dark" ? "webDarkTheme" : "webLightTheme"}
-    >
-      {children}
-    </div>
-  ),
-  webLightTheme: { colorNeutralBackground1: "light" },
-  webDarkTheme: { colorNeutralBackground1: "dark" },
-}));
-
-jest.mock("./App", () => ({
-  __esModule: true,
-  default: () => <div data-testid="mock-app">App</div>,
-}));
-
-const createMockStore = (isDarkMode: boolean = false) => ({
-  getState: jest.fn(() => ({ isDarkMode })),
-  subscribe: jest.fn(() => jest.fn()),
-});
-
-const mockThemeStore = createMockStore(false);
-
-jest.mock("../hooks/useTheme", () => ({
-  get useThemeStore() {
-    return mockThemeStore;
-  },
-}));
-
-describe("Root", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test("should render Root component with all child components", () => {
-    render(<Root />);
-
-    expect(screen.getByTestId("mock-error-boundary")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-fluent-provider")).toBeInTheDocument();
-    expect(screen.getByTestId("mock-app")).toBeInTheDocument();
-  });
-
-  test("should have correct component hierarchy", () => {
-    render(<Root />);
-
-    const errorBoundary = screen.getByTestId("mock-error-boundary");
-    const fluentProvider = screen.getByTestId("mock-fluent-provider");
-    const app = screen.getByTestId("mock-app");
-
-    expect(errorBoundary).toContainElement(fluentProvider);
-    expect(fluentProvider).toContainElement(app);
-  });
-
-  test("should subscribe to theme changes on mount", () => {
-    render(<Root />);
-
-    expect(mockThemeStore.subscribe).toHaveBeenCalled();
-    expect(mockThemeStore.subscribe).toHaveBeenCalledWith(expect.any(Function));
-  });
-
-  test("should get initial theme state", () => {
-    render(<Root />);
-
-    expect(mockThemeStore.getState).toHaveBeenCalled();
-  });
-
-  test("should handle component unmounting", () => {
-    const mockUnsubscribe = jest.fn();
-    mockThemeStore.subscribe.mockReturnValue(mockUnsubscribe);
-
-    const { unmount } = render(<Root />);
-
-    unmount();
-
-    expect(mockUnsubscribe).toHaveBeenCalled();
-  });
-
-  test("should render without errors", () => {
-    expect(() => render(<Root />)).not.toThrow();
-  });
-});
--- a/src/RootComponents/Root.tsx
+++ b/src/RootComponents/Root.tsx
@@ -1,28 +0,0 @@
-import { FluentProvider, webDarkTheme, webLightTheme } from "@fluentui/react-components";
-import React from "react";
-import { ErrorBoundary } from "../Explorer/ErrorBoundary";
-import { useThemeStore } from "../hooks/useTheme";
-import App from "./App";
-
-const Root: React.FC = () => {
-  // Use React state to track isDarkMode and subscribe to changes
-  const [isDarkMode, setIsDarkMode] = React.useState(useThemeStore.getState().isDarkMode);
-  const currentTheme = isDarkMode ? webDarkTheme : webLightTheme;
-
-  // Subscribe to theme changes
-  React.useEffect(() => {
-    return useThemeStore.subscribe((state) => {
-      setIsDarkMode(state.isDarkMode);
-    });
-  }, []);
-
-  return (
-    <ErrorBoundary>
-      <FluentProvider theme={currentTheme}>
-        <App />
-      </FluentProvider>
-    </ErrorBoundary>
-  );
-};
-
-export default Root;
--- a/src/Utils/AuthorizationUtils.test.ts
+++ b/src/Utils/AuthorizationUtils.test.ts
@@ -27,7 +27,7 @@ describe("AuthorizationUtils", () => {
        enableKoResourceTree: false,
        enableThroughputBuckets: false,
        hostedDataExplorer: false,
-        sandboxNotebookOutputs: false,
+        sandboxNotebookOutputs: true,
        showMinRUSurvey: false,
        ttl90Days: false,
        enableThroughputCap: false,
--- a/test/fx.ts
+++ b/test/fx.ts
@@ -58,7 +58,9 @@ export const defaultAccounts: Record<TestAccount, string> = {
 export const resourceGroupName = process.env.DE_TEST_RESOURCE_GROUP ?? "de-e2e-tests";
 export const subscriptionId = process.env.DE_TEST_SUBSCRIPTION_ID ?? "69e02f2d-f059-4409-9eac-97e8a276ae2c";
 export const TEST_AUTOSCALE_THROUGHPUT_RU = 1000;
+export const TEST_MANUAL_THROUGHPUT_RU = 800;
 export const TEST_AUTOSCALE_MAX_THROUGHPUT_RU_2K = 2000;
+export const TEST_AUTOSCALE_MAX_THROUGHPUT_RU_4K = 4000;
 export const TEST_MANUAL_THROUGHPUT_RU_2K = 2000;
 export const ONE_MINUTE_MS: number = 60 * 1000;

@@ -378,9 +380,11 @@ type PanelOpenOptions = {

 export enum CommandBarButton {
  Save = "Save",
+  Delete = "Delete",
  Execute = "Execute",
  ExecuteQuery = "Execute Query",
  UploadItem = "Upload Item",
+  NewDocument = "New Document",
 }

 /** Helper class that provides locator methods for DataExplorer components, on top of a Frame */
@@ -478,7 +482,7 @@ export class DataExplorer {
    return await this.waitForNode(`${databaseId}/${containerId}/Documents`);
  }

-  async waitForCommandBarButton(label: string, timeout?: number): Promise<Locator> {
+  async waitForCommandBarButton(label: CommandBarButton, timeout?: number): Promise<Locator> {
    const commandBar = this.commandBarButton(label);
    await commandBar.waitFor({ state: "visible", timeout });
    return commandBar;
@@ -515,15 +519,6 @@ export class DataExplorer {
    const containerNode = await this.waitForContainerNode(context.database.id, context.container.id);
    await containerNode.expand();

-    // refresh tree to remove deleted database
-    const consoleMessages = await this.getNotificationConsoleMessages();
-    const refreshButton = this.frame.getByTestId("Sidebar/RefreshButton");
-    await refreshButton.click();
-    await expect(consoleMessages).toContainText("Successfully refreshed databases", {
-      timeout: ONE_MINUTE_MS,
-    });
-    await this.collapseNotificationConsole();
-
    const scaleAndSettingsButton = this.frame.getByTestId(
      `TreeNode:${context.database.id}/${context.container.id}/Scale & Settings`,
    );
--- a/test/mongo/document.spec.ts
+++ b/test/mongo/document.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from "@playwright/test";

 import { setupCORSBypass } from "../CORSBypass";
-import { DataExplorer, DocumentsTab, TestAccount } from "../fx";
+import { CommandBarButton, DataExplorer, DocumentsTab, TestAccount } from "../fx";
 import { retry, serializeMongoToJson, setPartitionKeys } from "../testData";
 import { documentTestCases } from "./testCases";

@@ -48,19 +48,20 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
          expect(resultData?._id).not.toBeNull();
          expect(resultData?._id).toEqual(docId);
        });
-        test(`should be able to create and delete new document from ${docId}`, async () => {
+        test(`should be able to create and delete new document from ${docId}`, async ({ page }) => {
          const span = documentsTab.documentsListPane.getByText(docId, { exact: true }).nth(0);
          await span.waitFor();
          await expect(span).toBeVisible();

          await span.click();
+          await page.waitForTimeout(5000); // wait for 5 seconds to ensure document is fully loaded. waitforTimeout is not recommended generally but here we are working around flakiness in the test env
+
          let newDocumentId;
          await retry(async () => {
-            const newDocumentButton = await explorer.waitForCommandBarButton("New Document", 5000);
+            const newDocumentButton = await explorer.waitForCommandBarButton(CommandBarButton.NewDocument, 5000);
            await expect(newDocumentButton).toBeVisible();
            await expect(newDocumentButton).toBeEnabled();
            await newDocumentButton.click();
-
            await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });

            newDocumentId = `${Date.now().toString()}-delete`;
@@ -71,8 +72,9 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
            };

            await documentsTab.resultsEditor.setText(JSON.stringify(newDocument));
-            const saveButton = await explorer.waitForCommandBarButton("Save", 5000);
+            const saveButton = await explorer.waitForCommandBarButton(CommandBarButton.Save, 5000);
            await saveButton.click({ timeout: 5000 });
+
            await expect(saveButton).toBeHidden({ timeout: 5000 });
          }, 3);

@@ -84,7 +86,7 @@ for (const { name, databaseId, containerId, documents } of documentTestCases) {
          await newSpan.click();
          await expect(documentsTab.resultsEditor.locator).toBeAttached({ timeout: 60 * 1000 });

-          const deleteButton = await explorer.waitForCommandBarButton("Delete", 5000);
+          const deleteButton = await explorer.waitForCommandBarButton(CommandBarButton.Delete, 5000);
          await deleteButton.click();

          const deleteDialogButton = await explorer.waitForDialogButton("Delete", 5000);
--- a/test/sql/containercopy/offlineMigration.spec.ts
+++ b/test/sql/containercopy/offlineMigration.spec.ts
@@ -246,13 +246,17 @@ test.describe("Container Copy - Offline Migration", () => {
    expect(response.ok()).toBe(true);

    // Verify panel closes and job appears in the list
-    await expect(panel).not.toBeVisible({ timeout: 5000 });
+    await expect(panel).not.toBeVisible();
+
+    const filterTextField = wrapper.getByTestId("CopyJobsList/FilterTextField");
+    await filterTextField.waitFor({ state: "visible" });
+    await filterTextField.fill(validJobName);

    const jobsListContainer = wrapper.locator(".CopyJobListContainer .ms-DetailsList-contentWrapper .ms-List-page");
-    await jobsListContainer.waitFor({ state: "visible", timeout: 5000 });
+    await jobsListContainer.waitFor({ state: "visible" });

    const jobItem = jobsListContainer.getByText(validJobName);
-    await jobItem.waitFor({ state: "visible", timeout: 5000 });
+    await jobItem.waitFor({ state: "visible" });
    await expect(jobItem).toBeVisible();
  });
 });
--- a/test/sql/containercopy/onlineMigration.spec.ts
+++ b/test/sql/containercopy/onlineMigration.spec.ts
@@ -120,18 +120,22 @@ test.describe("Container Copy - Online Migration", () => {
    expect(response.ok()).toBe(true);

    // Verify panel closes and job appears in the list
-    await expect(panel).not.toBeVisible({ timeout: 5000 });
+    await expect(panel).not.toBeVisible();
+
+    const filterTextField = wrapper.getByTestId("CopyJobsList/FilterTextField");
+    await filterTextField.waitFor({ state: "visible" });
+    await filterTextField.fill(onlineMigrationJobName);

    const jobsListContainer = wrapper.locator(".CopyJobListContainer .ms-DetailsList-contentWrapper .ms-List-page");
-    await jobsListContainer.waitFor({ state: "visible", timeout: 5000 });
+    await jobsListContainer.waitFor({ state: "visible" });

    let jobRow, statusCell, actionMenuButton;
    jobRow = jobsListContainer.locator(".ms-DetailsRow", { hasText: onlineMigrationJobName });
    statusCell = jobRow.locator("[data-automationid='DetailsRowCell'][data-automation-key='CopyJobStatus']");
-    await jobRow.waitFor({ state: "visible", timeout: 5000 });
+    await jobRow.waitFor({ state: "visible" });

    // Verify job status changes to queued state
-    await expect(statusCell).toContainText(/running|queued|pending/i, { timeout: 5000 });
+    await expect(statusCell).toContainText(/running|queued|pending/i);

    // Test job lifecycle management through action menu
    actionMenuButton = wrapper.getByTestId(`CopyJobActionMenu/Button:${onlineMigrationJobName}`);
--- a/test/sql/containercopy/permissionsScreen.spec.ts
+++ b/test/sql/containercopy/permissionsScreen.spec.ts
@@ -134,7 +134,7 @@ test.describe("Container Copy - Permission Screen Verification", () => {

    const pitrBtn = accordionPanel.getByTestId("pointInTimeRestore:PrimaryBtn");
    await expect(pitrBtn).toBeVisible();
-    await pitrBtn.click();
+    await pitrBtn.click({ force: true });

    // Verify new page opens with correct URL pattern
    page.context().on("page", async (newPage) => {
@@ -246,7 +246,7 @@ test.describe("Container Copy - Permission Screen Verification", () => {

    const toggleButton = crossAccordionPanel.getByTestId("btn-toggle");
    await expect(toggleButton).toBeVisible();
-    await toggleButton.click();
+    await toggleButton.click({ force: true });

    // Verify popover functionality
    const popover = frame.locator("[data-test='popover-container']");
@@ -257,7 +257,7 @@ test.describe("Container Copy - Permission Screen Verification", () => {
    await expect(yesButton).toBeVisible();
    await expect(noButton).toBeVisible();

-    await yesButton.click();
+    await yesButton.click({ force: true });

    // Verify loading states
    await expect(loadingOverlay).toBeVisible();
@@ -265,6 +265,6 @@ test.describe("Container Copy - Permission Screen Verification", () => {
    await expect(popover).toBeHidden({ timeout: 10 * 1000 });

    // Cancel the panel to clean up
-    await panel.getByRole("button", { name: "Cancel" }).click();
+    await panel.getByRole("button", { name: "Cancel" }).click({ force: true });
  });
 });
--- a/test/sql/document.spec.ts
+++ b/test/sql/document.spec.ts
@@ -136,9 +136,7 @@ test.describe.serial("Upload Item", () => {
    if (existsSync(uploadDocumentDirPath)) {
      rmdirSync(uploadDocumentDirPath);
    }
-    if (!process.env.CI) {
-      await context?.dispose();
-    }
+    await context?.dispose();
  });

  test.afterEach("Close Upload Items panel if still open", async () => {
--- a/test/sql/query.spec.ts
+++ b/test/sql/query.spec.ts
@@ -30,12 +30,9 @@ test.beforeEach("Open new query tab", async ({ page }) => {
  await explorer.frame.getByTestId("NotificationConsole/Contents").waitFor();
 });

-// Delete database only if not running in CI
-if (!process.env.CI) {
-  test.afterAll("Delete Test Database", async () => {
-    await context?.dispose();
-  });
-}
+test.afterAll("Delete Test Database", async () => {
+  await context?.dispose();
+});

 test("Query results", async () => {
  // Run the query and verify the results
--- a/test/sql/resourceToken.spec.ts
+++ b/test/sql/resourceToken.spec.ts
@@ -2,7 +2,6 @@ import { expect, test } from "@playwright/test";

 import { CosmosDBManagementClient } from "@azure/arm-cosmosdb";
 import { CosmosClient, PermissionMode } from "@azure/cosmos";
-import { AzureIdentityCredentialAdapter } from "@azure/ms-rest-js";
 import {
  DataExplorer,
  TestAccount,
@@ -18,8 +17,7 @@ test("SQL account using Resource token", async ({ page }) => {
  test.skip(nosqlAccountRbacToken.length > 0, "Resource tokens not supported when using data plane RBAC.");

  const credentials = getAzureCLICredentials();
-  const adaptedCredentials = new AzureIdentityCredentialAdapter(credentials);
-  const armClient = new CosmosDBManagementClient(adaptedCredentials, subscriptionId);
+  const armClient = new CosmosDBManagementClient(credentials, subscriptionId);
  const accountName = getAccountName(TestAccount.SQL);
  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
  const keys = await armClient.databaseAccounts.listKeys(resourceGroupName, accountName);
--- a/test/sql/scaleAndSettings/changePartitionKey.spec.ts
+++ b/test/sql/scaleAndSettings/changePartitionKey.spec.ts
@@ -23,12 +23,9 @@ test.describe("Change Partition Key", () => {
    await PartitionKeyTab.click();
  });

-  // Delete database only if not running in CI
-  if (!process.env.CI) {
-    test.afterEach("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterEach("Delete Test Database", async () => {
+    await context?.dispose();
+  });

  test("Change partition key path", async ({ page }) => {
    await expect(explorer.frame.getByText("/partitionKey")).toBeVisible();
--- a/test/sql/scaleAndSettings/scale.spec.ts
+++ b/test/sql/scaleAndSettings/scale.spec.ts
@@ -118,7 +118,5 @@ async function openScaleTab(browser: Browser): Promise<SetupResult> {
 }

 async function cleanup({ context }: Partial<SetupResult>) {
-  if (!process.env.CI) {
-    await context?.dispose();
-  }
+  await context?.dispose();
 }
--- a/test/sql/scaleAndSettings/settings.spec.ts
+++ b/test/sql/scaleAndSettings/settings.spec.ts
@@ -17,12 +17,9 @@ test.describe("Settings under Scale & Settings", () => {
    await settingsTab.click();
  });

-  // Delete database only if not running in CI
-  if (!process.env.CI) {
-    test.afterAll("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });

  test("Update TTL to On (no default)", async () => {
    const ttlOnNoDefaultRadioButton = explorer.frame.getByRole("radio", { name: "ttl-on-no-default-option" });
--- a/test/sql/scaleAndSettings/sharedThroughput.spec.ts
+++ b/test/sql/scaleAndSettings/sharedThroughput.spec.ts
@@ -0,0 +1,229 @@
+import { Locator, expect, test } from "@playwright/test";
+import {
+  CommandBarButton,
+  DataExplorer,
+  ONE_MINUTE_MS,
+  TEST_AUTOSCALE_MAX_THROUGHPUT_RU_4K,
+  TEST_MANUAL_THROUGHPUT_RU,
+  TestAccount,
+} from "../../fx";
+import { TestDatabaseContext, createTestDB } from "../../testData";
+
+test.describe("Database with Shared Throughput", () => {
+  let dbContext: TestDatabaseContext = null!;
+  let explorer: DataExplorer = null!;
+  const containerId = "sharedcontainer";
+
+  // Helper methods
+  const getThroughputInput = (type: "manual" | "autopilot"): Locator => {
+    return explorer.frame.getByTestId(`${type}-throughput-input`);
+  };
+
+  test.afterEach("Delete Test Database", async () => {
+    await dbContext?.dispose();
+  });
+
+  test.describe("Manual Throughput Tests", () => {
+    test.beforeEach(async ({ page }) => {
+      explorer = await DataExplorer.open(page, TestAccount.SQL);
+    });
+
+    test("Create database with shared manual throughput and verify Scale node in UI", async () => {
+      test.setTimeout(120000); // 2 minutes timeout
+      // Create database with shared manual throughput (400 RU/s)
+      dbContext = await createTestDB({ throughput: 400 });
+
+      // Verify database node appears in the tree
+      const databaseNode = await explorer.waitForNode(dbContext.database.id);
+      expect(databaseNode).toBeDefined();
+
+      // Expand the database node to see child nodes
+      await databaseNode.expand();
+
+      // Verify that "Scale" node appears under the database
+      const scaleNode = await explorer.waitForNode(`${dbContext.database.id}/Scale`);
+      expect(scaleNode).toBeDefined();
+      await expect(scaleNode.element).toBeVisible();
+    });
+
+    test("Add container to shared database without dedicated throughput", async () => {
+      // Create database with shared manual throughput
+      dbContext = await createTestDB({ throughput: 400 });
+
+      // Wait for the database to appear in the tree
+      await explorer.waitForNode(dbContext.database.id);
+
+      // Add a container to the shared database via UI
+      const newContainerButton = await explorer.globalCommandButton("New Container");
+      await newContainerButton.click();
+
+      await explorer.whilePanelOpen(
+        "New Container",
+        async (panel, okButton) => {
+          // Select "Use existing" database
+          const useExistingRadio = panel.getByRole("radio", { name: /Use existing/i });
+          await useExistingRadio.click();
+
+          // Select the database from dropdown using the new data-testid
+          const databaseDropdown = panel.getByRole("combobox", { name: "Choose an existing database" });
+          await databaseDropdown.click();
+
+          await explorer.frame.getByRole("option", { name: dbContext.database.id }).click();
+          // Now you can target the specific database option by its data-testid
+          //await panel.getByTestId(`database-option-${dbContext.database.id}`).click();
+          // Fill container id
+          await panel.getByRole("textbox", { name: "Container id, Example Container1" }).fill(containerId);
+
+          // Fill partition key
+          await panel.getByRole("textbox", { name: "Partition key" }).fill("/pk");
+
+          // Ensure "Provision dedicated throughput" is NOT checked
+          const dedicatedThroughputCheckbox = panel.getByRole("checkbox", {
+            name: /Provision dedicated throughput for this container/i,
+          });
+
+          if (await dedicatedThroughputCheckbox.isVisible()) {
+            const isChecked = await dedicatedThroughputCheckbox.isChecked();
+            if (isChecked) {
+              await dedicatedThroughputCheckbox.uncheck();
+            }
+          }
+
+          await okButton.click();
+        },
+        { closeTimeout: 5 * ONE_MINUTE_MS },
+      );
+
+      // Verify container was created under the database
+      const containerNode = await explorer.waitForContainerNode(dbContext.database.id, containerId);
+      expect(containerNode).toBeDefined();
+    });
+
+    test("Scale shared database manual throughput", async () => {
+      // Create database with shared manual throughput (400 RU/s)
+      dbContext = await createTestDB({ throughput: 400 });
+
+      // Navigate to the scale settings by clicking the "Scale" node in the tree
+      const databaseNode = await explorer.waitForNode(dbContext.database.id);
+      await databaseNode.expand();
+      const scaleNode = await explorer.waitForNode(`${dbContext.database.id}/Scale`);
+      await scaleNode.element.click();
+
+      // Update manual throughput from 400 to 800
+      await getThroughputInput("manual").fill(TEST_MANUAL_THROUGHPUT_RU.toString());
+
+      // Save changes
+      await explorer.commandBarButton(CommandBarButton.Save).click();
+
+      // Verify success message
+      await expect(explorer.getConsoleHeaderStatus()).toContainText(
+        `Successfully updated offer for database ${dbContext.database.id}`,
+        {
+          timeout: 2 * ONE_MINUTE_MS,
+        },
+      );
+    });
+
+    test("Scale shared database from manual to autoscale", async () => {
+      // Create database with shared manual throughput (400 RU/s)
+      dbContext = await createTestDB({ throughput: 400 });
+
+      // Open database settings by clicking the "Scale" node
+      const databaseNode = await explorer.waitForNode(dbContext.database.id);
+      await databaseNode.expand();
+      const scaleNode = await explorer.waitForNode(`${dbContext.database.id}/Scale`);
+      await scaleNode.element.click();
+
+      // Switch to Autoscale
+      const autoscaleRadio = explorer.frame.getByText("Autoscale", { exact: true });
+      await autoscaleRadio.click();
+
+      // Set autoscale max throughput to 1000
+      //await getThroughputInput("autopilot").fill(TEST_AUTOSCALE_THROUGHPUT_RU.toString());
+
+      // Save changes
+      await explorer.commandBarButton(CommandBarButton.Save).click();
+
+      await expect(explorer.getConsoleHeaderStatus()).toContainText(
+        `Successfully updated offer for database ${dbContext.database.id}`,
+        {
+          timeout: 2 * ONE_MINUTE_MS,
+        },
+      );
+    });
+  });
+
+  test.describe("Autoscale Throughput Tests", () => {
+    test.beforeEach(async ({ page }) => {
+      explorer = await DataExplorer.open(page, TestAccount.SQL);
+    });
+
+    test("Create database with shared autoscale throughput and verify Scale node in UI", async () => {
+      test.setTimeout(120000); // 2 minutes timeout
+
+      // Create database with shared autoscale throughput (max 1000 RU/s)
+      dbContext = await createTestDB({ maxThroughput: 1000 });
+
+      // Verify database node appears
+      const databaseNode = await explorer.waitForNode(dbContext.database.id);
+      expect(databaseNode).toBeDefined();
+
+      // Expand the database node to see child nodes
+      await databaseNode.expand();
+
+      // Verify that "Scale" node appears under the database
+      const scaleNode = await explorer.waitForNode(`${dbContext.database.id}/Scale`);
+      expect(scaleNode).toBeDefined();
+      await expect(scaleNode.element).toBeVisible();
+    });
+
+    test("Scale shared database autoscale throughput", async () => {
+      // Create database with shared autoscale throughput (max 1000 RU/s)
+      dbContext = await createTestDB({ maxThroughput: 1000 });
+
+      // Open database settings
+      const databaseNode = await explorer.waitForNode(dbContext.database.id);
+      await databaseNode.expand();
+      const scaleNode = await explorer.waitForNode(`${dbContext.database.id}/Scale`);
+      await scaleNode.element.click();
+
+      // Update autoscale max throughput from 1000 to 4000
+      await getThroughputInput("autopilot").fill(TEST_AUTOSCALE_MAX_THROUGHPUT_RU_4K.toString());
+
+      // Save changes
+      await explorer.commandBarButton(CommandBarButton.Save).click();
+
+      // Verify success message
+      await expect(explorer.getConsoleHeaderStatus()).toContainText(
+        `Successfully updated offer for database ${dbContext.database.id}`,
+        {
+          timeout: 2 * ONE_MINUTE_MS,
+        },
+      );
+    });
+
+    test("Scale shared database from autoscale to manual", async () => {
+      // Create database with shared autoscale throughput (max 1000 RU/s)
+      dbContext = await createTestDB({ maxThroughput: 1000 });
+
+      // Open database settings
+      const databaseNode = await explorer.waitForNode(dbContext.database.id);
+      await databaseNode.expand();
+      const scaleNode = await explorer.waitForNode(`${dbContext.database.id}/Scale`);
+      await scaleNode.element.click();
+
+      // Switch to Manual
+      const manualRadio = explorer.frame.getByText("Manual", { exact: true });
+      await manualRadio.click();
+
+      // Save changes
+      await explorer.commandBarButton(CommandBarButton.Save).click();
+
+      // Verify success message
+      await expect(explorer.getConsoleHeaderStatus()).toContainText(
+        `Successfully updated offer for database ${dbContext.database.id}`,
+        { timeout: 2 * ONE_MINUTE_MS },
+      );
+    });
+  });
+});
--- a/test/sql/scripts/storedProcedure.spec.ts
+++ b/test/sql/scripts/storedProcedure.spec.ts
@@ -43,7 +43,7 @@ test.describe("Stored Procedures", () => {
    );

    // Execute stored procedure
-    const executeButton = explorer.commandBarButton(CommandBarButton.Execute);
+    const executeButton = explorer.commandBarButton(CommandBarButton.Execute).first();
    await executeButton.click();
    const executeSidePanelButton = explorer.frame.getByTestId("Panel/OkButton");
    await executeSidePanelButton.click();
--- a/test/sql/scripts/trigger.spec.ts
+++ b/test/sql/scripts/trigger.spec.ts
@@ -26,11 +26,9 @@ test.describe("Triggers", () => {
    explorer = await DataExplorer.open(page, TestAccount.SQL);
  });

-  if (!process.env.CI) {
-    test.afterAll("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });

  test("Add and delete trigger", async ({ page }, testInfo) => {
    // Open container context menu and click New Trigger
--- a/test/sql/scripts/userDefinedFunction.spec.ts
+++ b/test/sql/scripts/userDefinedFunction.spec.ts
@@ -19,11 +19,9 @@ test.describe("User Defined Functions", () => {
    explorer = await DataExplorer.open(page, TestAccount.SQL);
  });

-  if (!process.env.CI) {
-    test.afterAll("Delete Test Database", async () => {
-      await context?.dispose();
-    });
-  }
+  test.afterAll("Delete Test Database", async () => {
+    await context?.dispose();
+  });

  test("Add, execute, and delete user defined function", async ({ page }, testInfo) => {
    // Open container context menu and click New UDF
--- a/test/testData.ts
+++ b/test/testData.ts
@@ -2,7 +2,6 @@ import crypto from "crypto";

 import { CosmosDBManagementClient } from "@azure/arm-cosmosdb";
 import { BulkOperationType, Container, CosmosClient, CosmosClientOptions, Database, JSONObject } from "@azure/cosmos";
-import { AzureIdentityCredentialAdapter } from "@azure/ms-rest-js";

 import {
  generateUniqueName,
@@ -82,6 +81,74 @@ export class TestContainerContext {
  }
 }

+export class TestDatabaseContext {
+  constructor(
+    public armClient: CosmosDBManagementClient,
+    public client: CosmosClient,
+    public database: Database,
+  ) {}
+
+  async dispose() {
+    await this.database.delete();
+  }
+}
+
+export interface CreateTestDBOptions {
+  throughput?: number;
+  maxThroughput?: number; // For autoscale
+}
+
+// Helper function to create ARM client and Cosmos client for SQL account
+async function createCosmosClientForSQLAccount(
+  accountType: TestAccount.SQL | TestAccount.SQLContainerCopyOnly = TestAccount.SQL,
+): Promise<{ armClient: CosmosDBManagementClient; client: CosmosClient }> {
+  const credentials = getAzureCLICredentials();
+  const armClient = new CosmosDBManagementClient(credentials, subscriptionId);
+  const accountName = getAccountName(accountType);
+  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
+
+  const clientOptions: CosmosClientOptions = {
+    endpoint: account.documentEndpoint!,
+  };
+
+  const rbacToken =
+    accountType === TestAccount.SQL
+      ? process.env.NOSQL_TESTACCOUNT_TOKEN
+      : accountType === TestAccount.SQLContainerCopyOnly
+      ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN
+      : "";
+
+  if (rbacToken) {
+    clientOptions.tokenProvider = async (): Promise<string> => {
+      const AUTH_PREFIX = `type=aad&ver=1.0&sig=`;
+      const authorizationToken = `${AUTH_PREFIX}${rbacToken}`;
+      return authorizationToken;
+    };
+  } else {
+    const keys = await armClient.databaseAccounts.listKeys(resourceGroupName, accountName);
+    clientOptions.key = keys.primaryMasterKey;
+  }
+
+  const client = new CosmosClient(clientOptions);
+
+  return { armClient, client };
+}
+
+export async function createTestDB(options?: CreateTestDBOptions): Promise<TestDatabaseContext> {
+  const databaseId = generateUniqueName("db");
+  const { armClient, client } = await createCosmosClientForSQLAccount();
+
+  // Create database with provisioned throughput (shared throughput)
+  // This checks the "Provision database throughput" option
+  const { database } = await client.databases.create({
+    id: databaseId,
+    throughput: options?.throughput, // Manual throughput (e.g., 400)
+    maxThroughput: options?.maxThroughput, // Autoscale max throughput (e.g., 1000)
+  });
+
+  return new TestDatabaseContext(armClient, client, database);
+}
+
 type createTestSqlContainerConfig = {
  includeTestData?: boolean;
  partitionKey?: string;
@@ -104,34 +171,7 @@ export async function createMultipleTestContainers({
  const creationPromises: Promise<TestContainerContext>[] = [];

  const databaseId = databaseName ? databaseName : generateUniqueName("db");
-  const credentials = getAzureCLICredentials();
-  const adaptedCredentials = new AzureIdentityCredentialAdapter(credentials);
-  const armClient = new CosmosDBManagementClient(adaptedCredentials, subscriptionId);
-  const accountName = getAccountName(accountType);
-  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
-
-  const clientOptions: CosmosClientOptions = {
-    endpoint: account.documentEndpoint!,
-  };
-
-  const rbacToken =
-    accountType === TestAccount.SQL
-      ? process.env.NOSQL_TESTACCOUNT_TOKEN
-      : accountType === TestAccount.SQLContainerCopyOnly
-      ? process.env.NOSQL_CONTAINERCOPY_TESTACCOUNT_TOKEN
-      : "";
-  if (rbacToken) {
-    clientOptions.tokenProvider = async (): Promise<string> => {
-      const AUTH_PREFIX = `type=aad&ver=1.0&sig=`;
-      const authorizationToken = `${AUTH_PREFIX}${rbacToken}`;
-      return authorizationToken;
-    };
-  } else {
-    const keys = await armClient.databaseAccounts.listKeys(resourceGroupName, accountName);
-    clientOptions.key = keys.primaryMasterKey;
-  }
-
-  const client = new CosmosClient(clientOptions);
+  const { armClient, client } = await createCosmosClientForSQLAccount(accountType);
  const { database } = await client.databases.createIfNotExists({ id: databaseId });

  try {
@@ -158,29 +198,8 @@ export async function createTestSQLContainer({
 }: createTestSqlContainerConfig = {}) {
  const databaseId = databaseName ? databaseName : generateUniqueName("db");
  const containerId = "testcontainer"; // A unique container name isn't needed because the database is unique
-  const credentials = getAzureCLICredentials();
-  const adaptedCredentials = new AzureIdentityCredentialAdapter(credentials);
-  const armClient = new CosmosDBManagementClient(adaptedCredentials, subscriptionId);
-  const accountName = getAccountName(TestAccount.SQL);
-  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);
+  const { armClient, client } = await createCosmosClientForSQLAccount();

-  const clientOptions: CosmosClientOptions = {
-    endpoint: account.documentEndpoint!,
-  };
-
-  const nosqlAccountRbacToken = process.env.NOSQL_TESTACCOUNT_TOKEN;
-  if (nosqlAccountRbacToken) {
-    clientOptions.tokenProvider = async (): Promise<string> => {
-      const AUTH_PREFIX = `type=aad&ver=1.0&sig=`;
-      const authorizationToken = `${AUTH_PREFIX}${nosqlAccountRbacToken}`;
-      return authorizationToken;
-    };
-  } else {
-    const keys = await armClient.databaseAccounts.listKeys(resourceGroupName, accountName);
-    clientOptions.key = keys.primaryMasterKey;
-  }
-
-  const client = new CosmosClient(clientOptions);
  const { database } = await client.databases.createIfNotExists({ id: databaseId });
  try {
    const { container } = await database.containers.createIfNotExists({
@@ -211,20 +230,20 @@ export async function createTestSQLContainer({
 }

 export const setPartitionKeys = (partitionKeys: PartitionKey[]) => {
-  const result = {};
+  const result: Record<string, unknown> = {};

  partitionKeys.forEach((partitionKey) => {
    const { key: keyPath, value: keyValue } = partitionKey;
    const cleanPath = keyPath.startsWith("/") ? keyPath.slice(1) : keyPath;
    const keys = cleanPath.split("/");
-    let current = result;
+    let current: Record<string, unknown> = result;

    keys.forEach((key, index) => {
      if (index === keys.length - 1) {
        current[key] = keyValue;
      } else {
        current[key] = current[key] || {};
-        current = current[key];
+        current = current[key] as Record<string, unknown>;
      }
    });
  });
--- a/utils/deployment-status/package-lock.json
+++ b/utils/deployment-status/package-lock.json
@@ -1,66 +1,180 @@
 {
  "name": "deployment-status",
  "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 3,
  "requires": true,
-  "dependencies": {
-    "@types/color-name": {
+  "packages": {
+    "": {
+      "name": "deployment-status",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "moment": "^2.30.1",
+        "node-fetch": "^3.3.2"
+      }
+    },
+    "node_modules/@types/color-name": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
    },
-    "ansi-styles": {
+    "node_modules/ansi-styles": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-      "requires": {
+      "dependencies": {
        "@types/color-name": "^1.1.1",
        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
      }
    },
-    "chalk": {
+    "node_modules/chalk": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "requires": {
+      "dependencies": {
        "ansi-styles": "^4.1.0",
        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
-    "color-convert": {
+    "node_modules/color-convert": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
+      "dependencies": {
        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
      }
    },
-    "color-name": {
+    "node_modules/color-name": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
    },
-    "has-flag": {
+    "node_modules/data-uri-to-buffer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+      "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/fetch-blob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+      "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "dependencies": {
+        "node-domexception": "^1.0.0",
+        "web-streams-polyfill": "^3.0.3"
+      },
+      "engines": {
+        "node": "^12.20 || >= 14.13"
+      }
+    },
+    "node_modules/formdata-polyfill": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+      "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+      "dependencies": {
+        "fetch-blob": "^3.1.2"
+      },
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+    "node_modules/has-flag": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
    },
-    "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
    },
-    "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "engines": {
+        "node": ">=10.5.0"
+      }
    },
-    "supports-color": {
+    "node_modules/node-fetch": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+      "dependencies": {
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
+      }
+    },
+    "node_modules/supports-color": {
      "version": "7.1.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "requires": {
+      "dependencies": {
        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+      "engines": {
+        "node": ">= 8"
      }
    }
  }
--- a/utils/deployment-status/package.json
+++ b/utils/deployment-status/package.json
@@ -11,7 +11,7 @@
  "license": "ISC",
  "dependencies": {
    "chalk": "^4.1.0",
-    "moment": "^2.27.0",
-    "node-fetch": "^2.6.1"
+    "moment": "^2.30.1",
+    "node-fetch": "^3.3.2"
  }
 }
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -303,10 +303,17 @@ module.exports = function (_env = {}, argv = {}) {
          }
        });

+        // Only handle OPTIONS for /api (preflight)
+        if (server?.app) {
+          server.app.options("/api", (_req, res) => res.sendStatus(200));
+          server.app.options("/api/*", (_req, res) => res.sendStatus(200));
+        }
+
        return middlewares;
      },
-      proxy: {
-        "/api": {
+      proxy: [
+        {
+          context: ["/api"],
          target: "https://cdb-ms-mpac-pbe.cosmos.azure.com",
          changeOrigin: true,
          logLevel: "debug",
@@ -317,37 +324,38 @@ module.exports = function (_env = {}, argv = {}) {
            }
          },
        },
-        "/proxy": {
+        {
+          context: ["/proxy"],
          target: "https://cdb-ms-mpac-pbe.cosmos.azure.com",
          changeOrigin: true,
          secure: false,
          logLevel: "debug",
          pathRewrite: { "^/proxy": "" },
-          router: (req) => {
-            let newTarget = req.headers["x-ms-proxy-target"];
-            return newTarget;
-          },
+          router: (req) => req.headers["x-ms-proxy-target"],
        },
-        "/_explorer": {
+        {
+          context: ["/_explorer"],
          target: process.env.EMULATOR_ENDPOINT || "https://localhost:8081/",
          changeOrigin: true,
          secure: false,
          logLevel: "debug",
        },
-        "/explorerProxy": {
+        {
+          context: ["/explorerProxy"],
          target: process.env.EMULATOR_ENDPOINT || "https://localhost:8081/",
          pathRewrite: { "^/explorerProxy": "" },
          changeOrigin: true,
          secure: false,
          logLevel: "debug",
        },
-        [`/${AZURE_TENANT_ID}`]: {
+        {
+          context: [`/${AZURE_TENANT_ID}`],
          target: "https://login.microsoftonline.com/",
          changeOrigin: true,
          secure: false,
          logLevel: "debug",
        },
-      },
+      ],
    },
    stats: "minimal",
  };
Author	SHA1	Message	Date
Asier Isayas	e137563581	Merge branch 'master' of https://github.com/Azure/cosmos-explorer into users/aisayas/dependabot-1.5	2026-01-27 12:20:15 -08:00
Asier Isayas	8a52b88e57	fix ci	2026-01-27 12:16:57 -08:00
sindhuba	a255dd502b	Add sharedThroughput db tests (#2287 ) * Add sharedThroughput db tests * Run npm commands * Run npm format * Fix error with adding container to shared db test * Add changes for Load more option to work * Remove localhost * Add Mongo Pagination tests * Run npm format * Revert "Add Mongo Pagination tests" This reverts commit `50a244e6f9`. * Minor fixes * Fix errors * Minor fix * Fix tests * Address comments * Address comments	2026-01-27 12:00:56 -08:00
Asier Isayas	ad091f10c0	remove datatables.net patch	2026-01-27 11:45:01 -08:00
Asier Isayas	1e12123828	fix package lock	2026-01-27 11:34:13 -08:00
Asier Isayas	b47be5cb43	fixed dependabot security alerts part 1	2026-01-27 11:07:40 -08:00
asier-isayas	2998f14d52	Fix playwright tests (#2342 ) * dont refresh tree when opening scale & settings * disable offline/online migration tests * delete db after each test * DEBUG: expand console for mongo testing * find first execute button for stored procedure * DEBUG: wait for editor to process changes * increase wait time to 5s * verify document text was set * keep document spec as original * debug new document and save document count * when loading a document, wait for document text to appear then click new document * wait for document to be loaded * remove debug statement * wait for results to attach * do forced wait instead * cleanup tests * uncomment container copy tests * run test account cleanup every 12 hours * change cleanup frequency to once a day --------- Co-authored-by: Asier Isayas <aisayas@microsoft.com>	2026-01-26 12:37:07 -08:00
BChoudhury-ms	05407b3e0f	Add search/filter support to Copy Jobs list with pagination updates (#2343 ) * search the copy job * remove timeout * Update src/Explorer/ContainerCopy/MonitorCopyJobs/Components/CopyJobsList.tsx Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix pagination race condition when filtering copy jobs (#2351) * Initial plan * Fix pagination race condition by resetting startIndex synchronously Co-authored-by: BChoudhury-ms <201893606+BChoudhury-ms@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: BChoudhury-ms <201893606+BChoudhury-ms@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: BChoudhury-ms <201893606+BChoudhury-ms@users.noreply.github.com>	2026-01-23 20:58:46 +05:30
Laurent Nguyen	703218debf	Fix error message in bulk delete to reflect total document count (#2331 ) * Fix error message in bulk delete to reflect total document count * Fix format	2026-01-23 07:38:04 +01:00
Laurent Nguyen	f83a2c4442	feat: redact sensitive information from BadRequest errors in telemetry logging (#2321 ) Co-authored-by: Laurent Nguyen <languye@microsoft.com>	2026-01-23 07:37:45 +01:00
sakshigupta12feb	2ff01c6379	updated the feature value to hardcode true (#2346 ) Co-authored-by: Sakshi Gupta <sakshig@microsoft.com>	2026-01-22 20:02:29 +05:30
sakshigupta12feb	31385950dd	removed NotebookViewer file (#2281 ) Co-authored-by: Sakshi Gupta <sakshig@microsoft.com>	2026-01-22 00:07:06 +05:30
Laurent Nguyen	6dce2632c8	fix: prevent race condition by initializing scenario tracking after config is set (#2339 ) Co-authored-by: Laurent Nguyen <languye@microsoft.com>	2026-01-21 17:28:08 +01:00