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

fix ci
remove datatables.net patch
2026-02-05 01:53:32 +00:00 · 2026-01-27 12:20:15 -08:00 · 2026-01-27 12:16:57 -08:00 · 2026-01-27 11:45:01 -08:00 · 2026-01-27 11:34:13 -08:00 · 2026-01-27 11:07:40 -08:00
20 changed files with 4067 additions and 7590 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
@@ -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
@@ -1,7 +1,5 @@
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { SubscriptionType } from "../Contracts/SubscriptionType";
-import { isExpectedError } from "../Metrics/ErrorClassification";
-import { scenarioMonitor } from "../Metrics/ScenarioMonitor";
 import { userContext } from "../UserContext";
 import { ARMError } from "../Utils/arm/request";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
@@ -33,12 +31,6 @@ export const handleError = (

  // checks for errors caused by firewall and sends them to portal to handle
  sendNotificationForError(errorMessage, errorCode);
-
-  // Mark expected failures for health metrics (auth, firewall, permissions, etc.)
-  // This ensures timeouts with expected failures emit healthy instead of unhealthy
-  if (isExpectedError(error)) {
-    scenarioMonitor.markExpectedFailure();
-  }
 };

 export const getErrorMessage = (error: string | Error = ""): string => {
--- a/src/Main.tsx
+++ b/src/Main.tsx
@@ -119,9 +119,6 @@ const App = (): JSX.Element => {
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [explorer]);

-  // Track interactive phase for both ContainerCopyPanel and DivExplorer paths
-  useInteractive(MetricScenario.ApplicationLoad);
-
  if (!explorer) {
    return <LoadingExplorer />;
  }
@@ -148,6 +145,7 @@ const App = (): JSX.Element => {
 const DivExplorer: React.FC<{ explorer: Explorer }> = ({ explorer }) => {
  const isCarouselOpen = useCarousel((state) => state.shouldOpen);
  const isCopilotCarouselOpen = useCarousel((state) => state.showCopilotCarousel);
+  useInteractive(MetricScenario.ApplicationLoad);

  return (
    <div
--- a/src/Metrics/ErrorClassification.test.ts
+++ b/src/Metrics/ErrorClassification.test.ts
@@ -1,182 +0,0 @@
-import { ARMError } from "../Utils/arm/request";
-import { isExpectedError } from "./ErrorClassification";
-
-describe("ErrorClassification", () => {
-  describe("isExpectedError", () => {
-    describe("ARMError with expected codes", () => {
-      it("returns true for AuthorizationFailed code", () => {
-        const error = new ARMError("Authorization failed");
-        error.code = "AuthorizationFailed";
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for Forbidden code", () => {
-        const error = new ARMError("Forbidden");
-        error.code = "Forbidden";
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for Unauthorized code", () => {
-        const error = new ARMError("Unauthorized");
-        error.code = "Unauthorized";
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for InvalidAuthenticationToken code", () => {
-        const error = new ARMError("Invalid token");
-        error.code = "InvalidAuthenticationToken";
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for ExpiredAuthenticationToken code", () => {
-        const error = new ARMError("Token expired");
-        error.code = "ExpiredAuthenticationToken";
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for numeric 401 code", () => {
-        const error = new ARMError("Unauthorized");
-        error.code = 401;
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for numeric 403 code", () => {
-        const error = new ARMError("Forbidden");
-        error.code = 403;
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns false for unexpected ARM error code", () => {
-        const error = new ARMError("Internal error");
-        error.code = "InternalServerError";
-        expect(isExpectedError(error)).toBe(false);
-      });
-
-      it("returns false for numeric 500 code", () => {
-        const error = new ARMError("Server error");
-        error.code = 500;
-        expect(isExpectedError(error)).toBe(false);
-      });
-    });
-
-    describe("MSAL AuthError with expected errorCodes", () => {
-      it("returns true for popup_window_error", () => {
-        const error = { errorCode: "popup_window_error", message: "Popup blocked" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for interaction_required", () => {
-        const error = { errorCode: "interaction_required", message: "User interaction required" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for user_cancelled", () => {
-        const error = { errorCode: "user_cancelled", message: "User cancelled" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for consent_required", () => {
-        const error = { errorCode: "consent_required", message: "Consent required" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for login_required", () => {
-        const error = { errorCode: "login_required", message: "Login required" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for no_account_error", () => {
-        const error = { errorCode: "no_account_error", message: "No account" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns false for unexpected MSAL error code", () => {
-        const error = { errorCode: "unknown_error", message: "Unknown" };
-        expect(isExpectedError(error)).toBe(false);
-      });
-    });
-
-    describe("HTTP status codes", () => {
-      it("returns true for error with status 401", () => {
-        const error = { status: 401, message: "Unauthorized" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for error with status 403", () => {
-        const error = { status: 403, message: "Forbidden" };
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns false for error with status 500", () => {
-        const error = { status: 500, message: "Internal Server Error" };
-        expect(isExpectedError(error)).toBe(false);
-      });
-
-      it("returns false for error with status 404", () => {
-        const error = { status: 404, message: "Not Found" };
-        expect(isExpectedError(error)).toBe(false);
-      });
-    });
-
-    describe("Firewall error message pattern", () => {
-      it("returns true for firewall error in Error message", () => {
-        const error = new Error("Request blocked by firewall");
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for IP not allowed error", () => {
-        const error = new Error("Client IP address is not allowed");
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for ip not allowed (no 'address')", () => {
-        const error = new Error("Your ip not allowed to access this resource");
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns true for string error with firewall", () => {
-        expect(isExpectedError("firewall rules prevent access")).toBe(true);
-      });
-
-      it("returns true for case-insensitive firewall match", () => {
-        const error = new Error("FIREWALL blocked request");
-        expect(isExpectedError(error)).toBe(true);
-      });
-
-      it("returns false for unrelated error message", () => {
-        const error = new Error("Database connection failed");
-        expect(isExpectedError(error)).toBe(false);
-      });
-    });
-
-    describe("Edge cases", () => {
-      it("returns false for null", () => {
-        expect(isExpectedError(null)).toBe(false);
-      });
-
-      it("returns false for undefined", () => {
-        expect(isExpectedError(undefined)).toBe(false);
-      });
-
-      it("returns false for empty object", () => {
-        expect(isExpectedError({})).toBe(false);
-      });
-
-      it("returns false for plain Error without expected patterns", () => {
-        const error = new Error("Something went wrong");
-        expect(isExpectedError(error)).toBe(false);
-      });
-
-      it("returns false for string without firewall pattern", () => {
-        expect(isExpectedError("Generic error occurred")).toBe(false);
-      });
-
-      it("handles error with multiple matching criteria", () => {
-        // ARMError with both code and firewall message
-        const error = new ARMError("Request blocked by firewall");
-        error.code = "Forbidden";
-        expect(isExpectedError(error)).toBe(true);
-      });
-    });
-  });
-});
--- a/src/Metrics/ErrorClassification.ts
+++ b/src/Metrics/ErrorClassification.ts
@@ -1,109 +0,0 @@
-import { ARMError } from "../Utils/arm/request";
-
-/**
- * Expected error codes that should not mark scenarios as unhealthy.
- * These represent expected failures like auth issues, permission errors, and user actions.
- */
-
-// ARM error codes (string)
-const EXPECTED_ARM_ERROR_CODES: Set<string> = new Set([
-  "AuthorizationFailed",
-  "Forbidden",
-  "Unauthorized",
-  "AuthenticationFailed",
-  "InvalidAuthenticationToken",
-  "ExpiredAuthenticationToken",
-  "AuthorizationPermissionMismatch",
-]);
-
-// HTTP status codes that indicate expected failures
-const EXPECTED_HTTP_STATUS_CODES: Set<number> = new Set([
-  401, // Unauthorized
-  403, // Forbidden
-]);
-
-// MSAL error codes (string)
-const EXPECTED_MSAL_ERROR_CODES: Set<string> = new Set([
-  "popup_window_error",
-  "interaction_required",
-  "user_cancelled",
-  "consent_required",
-  "login_required",
-  "no_account_error",
-  "monitor_window_timeout",
-  "empty_window_error",
-]);
-
-// Firewall error message pattern (only case where we check message content)
-const FIREWALL_ERROR_PATTERN = /firewall|ip\s*(address)?\s*(is\s*)?not\s*allowed/i;
-
-/**
- * Interface for MSAL AuthError-like objects
- */
-interface MsalAuthError {
-  errorCode?: string;
-}
-
-/**
- * Interface for errors with HTTP status
- */
-interface HttpError {
-  status?: number;
-}
-
-/**
- * Determines if an error is an expected failure that should not mark the scenario as unhealthy.
- *
- * Expected failures include:
- * - Authentication/authorization errors (user not logged in, permissions)
- * - Firewall blocking errors
- * - User-cancelled operations
- *
- * @param error - The error to classify
- * @returns true if the error is expected and should not affect health metrics
- */
-export function isExpectedError(error: unknown): boolean {
-  if (!error) {
-    return false;
-  }
-
-  // Check ARMError code
-  if (error instanceof ARMError && error.code !== undefined) {
-    if (typeof error.code === "string" && EXPECTED_ARM_ERROR_CODES.has(error.code)) {
-      return true;
-    }
-    if (typeof error.code === "number" && EXPECTED_HTTP_STATUS_CODES.has(error.code)) {
-      return true;
-    }
-  }
-
-  // Check for MSAL AuthError (has errorCode property)
-  const msalError = error as MsalAuthError;
-  if (msalError.errorCode && typeof msalError.errorCode === "string") {
-    if (EXPECTED_MSAL_ERROR_CODES.has(msalError.errorCode)) {
-      return true;
-    }
-  }
-
-  // Check HTTP status on generic errors
-  const httpError = error as HttpError;
-  if (httpError.status && typeof httpError.status === "number") {
-    if (EXPECTED_HTTP_STATUS_CODES.has(httpError.status)) {
-      return true;
-    }
-  }
-
-  // Check for firewall error in message (the only message-based check)
-  if (error instanceof Error && error.message) {
-    if (FIREWALL_ERROR_PATTERN.test(error.message)) {
-      return true;
-    }
-  }
-
-  // Check for string errors with firewall pattern
-  if (typeof error === "string" && FIREWALL_ERROR_PATTERN.test(error)) {
-    return true;
-  }
-
-  return false;
-}
--- a/src/Metrics/MetricEvents.ts
+++ b/src/Metrics/MetricEvents.ts
@@ -15,11 +15,6 @@ export const reportUnhealthy = (scenario: MetricScenario, platform: Platform, ap
  send({ platform, api, scenario, healthy: false });

 const send = async (event: MetricEvent): Promise<Response> => {
-  // Skip metrics emission during local development
-  if (process.env.NODE_ENV === "development") {
-    return Promise.resolve(new Response(null, { status: 200 }));
-  }
-
  const url = createUri(configContext?.PORTAL_BACKEND_ENDPOINT, RELATIVE_PATH);
  const authHeader = getAuthorizationHeader();

--- a/src/Metrics/ScenarioMonitor.test.ts
+++ b/src/Metrics/ScenarioMonitor.test.ts
@@ -1,231 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import { configContext } from "../ConfigContext";
-import { updateUserContext } from "../UserContext";
-import MetricScenario, { reportHealthy, reportUnhealthy } from "./MetricEvents";
-import { ApplicationMetricPhase, CommonMetricPhase } from "./ScenarioConfig";
-import { scenarioMonitor } from "./ScenarioMonitor";
-
-// Mock the MetricEvents module
-jest.mock("./MetricEvents", () => ({
-  __esModule: true,
-  default: {
-    ApplicationLoad: "ApplicationLoad",
-    DatabaseLoad: "DatabaseLoad",
-  },
-  reportHealthy: jest.fn().mockResolvedValue({ ok: true }),
-  reportUnhealthy: jest.fn().mockResolvedValue({ ok: true }),
-}));
-
-// Mock configContext
-jest.mock("../ConfigContext", () => ({
-  configContext: {
-    platform: "Portal",
-    PORTAL_BACKEND_ENDPOINT: "https://test.portal.azure.com",
-  },
-  Platform: {
-    Portal: "Portal",
-    Hosted: "Hosted",
-    Emulator: "Emulator",
-    Fabric: "Fabric",
-  },
-}));
-
-describe("ScenarioMonitor", () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    // Use legacy fake timers to avoid conflicts with performance API
-    jest.useFakeTimers({ legacyFakeTimers: true });
-
-    // Ensure performance mock is available (setupTests.ts sets this but fake timers may override)
-    if (typeof performance.mark !== "function") {
-      Object.defineProperty(global, "performance", {
-        writable: true,
-        configurable: true,
-        value: {
-          mark: jest.fn(),
-          measure: jest.fn(),
-          clearMarks: jest.fn(),
-          clearMeasures: jest.fn(),
-          getEntriesByName: jest.fn().mockReturnValue([{ startTime: 0 }]),
-          getEntriesByType: jest.fn().mockReturnValue([]),
-          now: jest.fn(() => Date.now()),
-          timeOrigin: Date.now(),
-        },
-      });
-    }
-
-    // Reset userContext
-    updateUserContext({
-      apiType: "SQL",
-    });
-
-    // Reset the scenario monitor to clear any previous state
-    scenarioMonitor.reset();
-  });
-
-  afterEach(() => {
-    // Reset scenarios before switching to real timers
-    scenarioMonitor.reset();
-    jest.useRealTimers();
-  });
-
-  describe("markExpectedFailure", () => {
-    it("sets hasExpectedFailure flag on active scenarios", () => {
-      // Start a scenario
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Mark expected failure
-      scenarioMonitor.markExpectedFailure();
-
-      // Let timeout fire - should emit healthy because of expected failure
-      jest.advanceTimersByTime(10000);
-
-      expect(reportHealthy).toHaveBeenCalledWith(MetricScenario.ApplicationLoad, configContext.platform, "SQL");
-      expect(reportUnhealthy).not.toHaveBeenCalled();
-    });
-
-    it("sets flag on multiple active scenarios", () => {
-      // Start two scenarios
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-      scenarioMonitor.start(MetricScenario.DatabaseLoad);
-
-      // Mark expected failure - should affect both
-      scenarioMonitor.markExpectedFailure();
-
-      // Let timeouts fire
-      jest.advanceTimersByTime(10000);
-
-      expect(reportHealthy).toHaveBeenCalledTimes(2);
-      expect(reportUnhealthy).not.toHaveBeenCalled();
-    });
-
-    it("does not affect already emitted scenarios", () => {
-      // Start scenario
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Complete all phases to emit
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, CommonMetricPhase.Interactive);
-
-      // Now mark expected failure - should not change anything
-      scenarioMonitor.markExpectedFailure();
-
-      // Healthy was called when phases completed
-      expect(reportHealthy).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("timeout behavior", () => {
-    it("emits unhealthy on timeout without expected failure", () => {
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Let timeout fire without marking expected failure
-      jest.advanceTimersByTime(10000);
-
-      expect(reportUnhealthy).toHaveBeenCalledWith(MetricScenario.ApplicationLoad, configContext.platform, "SQL");
-      expect(reportHealthy).not.toHaveBeenCalled();
-    });
-
-    it("emits healthy on timeout with expected failure", () => {
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Mark expected failure
-      scenarioMonitor.markExpectedFailure();
-
-      // Let timeout fire
-      jest.advanceTimersByTime(10000);
-
-      expect(reportHealthy).toHaveBeenCalledWith(MetricScenario.ApplicationLoad, configContext.platform, "SQL");
-      expect(reportUnhealthy).not.toHaveBeenCalled();
-    });
-
-    it("emits healthy even with partial phase completion and expected failure", () => {
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Complete one phase
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
-
-      // Mark expected failure
-      scenarioMonitor.markExpectedFailure();
-
-      // Let timeout fire (Interactive phase not completed)
-      jest.advanceTimersByTime(10000);
-
-      expect(reportHealthy).toHaveBeenCalled();
-      expect(reportUnhealthy).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("failPhase behavior", () => {
-    it("emits unhealthy immediately on unexpected failure", () => {
-      scenarioMonitor.start(MetricScenario.DatabaseLoad);
-
-      // Fail a phase (simulating unexpected error)
-      scenarioMonitor.failPhase(MetricScenario.DatabaseLoad, ApplicationMetricPhase.DatabasesFetched);
-
-      // Should emit unhealthy immediately, not wait for timeout
-      expect(reportUnhealthy).toHaveBeenCalledWith(MetricScenario.DatabaseLoad, configContext.platform, "SQL");
-    });
-
-    it("does not emit twice after failPhase and timeout", () => {
-      scenarioMonitor.start(MetricScenario.DatabaseLoad);
-
-      // Fail a phase
-      scenarioMonitor.failPhase(MetricScenario.DatabaseLoad, ApplicationMetricPhase.DatabasesFetched);
-
-      // Let timeout fire
-      jest.advanceTimersByTime(10000);
-
-      // Should only have emitted once (from failPhase)
-      expect(reportUnhealthy).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("completePhase behavior", () => {
-    it("emits healthy when all phases complete", () => {
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Complete all required phases
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, CommonMetricPhase.Interactive);
-
-      expect(reportHealthy).toHaveBeenCalledWith(MetricScenario.ApplicationLoad, configContext.platform, "SQL");
-    });
-
-    it("does not emit until all phases complete", () => {
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-
-      // Complete only one phase
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
-
-      expect(reportHealthy).not.toHaveBeenCalled();
-      expect(reportUnhealthy).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("scenario isolation", () => {
-    it("expected failure on one scenario does not affect others after completion", () => {
-      // Start both scenarios
-      scenarioMonitor.start(MetricScenario.ApplicationLoad);
-      scenarioMonitor.start(MetricScenario.DatabaseLoad);
-
-      // Complete ApplicationLoad
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, ApplicationMetricPhase.ExplorerInitialized);
-      scenarioMonitor.completePhase(MetricScenario.ApplicationLoad, CommonMetricPhase.Interactive);
-
-      // Now mark expected failure - should only affect DatabaseLoad
-      scenarioMonitor.markExpectedFailure();
-
-      // Let DatabaseLoad timeout
-      jest.advanceTimersByTime(10000);
-
-      // ApplicationLoad emitted healthy on completion
-      // DatabaseLoad emits healthy on timeout (expected failure)
-      expect(reportHealthy).toHaveBeenCalledTimes(2);
-      expect(reportUnhealthy).not.toHaveBeenCalled();
-    });
-  });
-});
--- a/src/Metrics/ScenarioMonitor.ts
+++ b/src/Metrics/ScenarioMonitor.ts
@@ -21,7 +21,6 @@ interface InternalScenarioContext {
  phases: Map<MetricPhase, PhaseContext>; // Track start/end for each phase
  timeoutId?: number;
  emitted: boolean;
-  hasExpectedFailure: boolean; // Flag for expected failures (auth, firewall, etc.)
 }

 class ScenarioMonitor {
@@ -76,7 +75,6 @@ class ScenarioMonitor {
      failed: new Set<MetricPhase>(),
      phases: new Map<MetricPhase, PhaseContext>(),
      emitted: false,
-      hasExpectedFailure: false,
    };

    // Start all required phases at scenario start time
@@ -93,11 +91,7 @@ class ScenarioMonitor {
      timeoutMs: config.timeoutMs,
    });

-    ctx.timeoutId = window.setTimeout(() => {
-      // If an expected failure occurred (auth, firewall, etc.), emit healthy instead of unhealthy
-      const healthy = ctx.hasExpectedFailure;
-      this.emit(ctx, healthy, true);
-    }, config.timeoutMs);
+    ctx.timeoutId = window.setTimeout(() => this.emit(ctx, false, true), config.timeoutMs);
    this.contexts.set(scenario, ctx);
  }

@@ -181,24 +175,6 @@ class ScenarioMonitor {
    this.emit(ctx, false, false, failureSnapshot);
  }

-  /**
-   * Marks that an expected failure occurred (auth, firewall, permissions, etc.).
-   * When the scenario times out with this flag set, it will emit healthy instead of unhealthy.
-   * This is called automatically from handleError when an expected error is detected.
-   */
-  markExpectedFailure() {
-    // Set the flag on all active (non-emitted) scenarios
-    this.contexts.forEach((ctx) => {
-      if (!ctx.emitted) {
-        ctx.hasExpectedFailure = true;
-        traceMark(Action.MetricsScenario, {
-          event: "expected_failure_marked",
-          scenario: ctx.scenario,
-        });
-      }
-    });
-  }
-
  private tryEmitIfReady(ctx: InternalScenarioContext) {
    const allDone = ctx.config.requiredPhases.every((p) => ctx.completed.has(p));
    if (!allDone) {
@@ -271,8 +247,7 @@ class ScenarioMonitor {
    });

    // Call portal backend health metrics endpoint
-    // If healthy is true (either completed successfully or timeout with expected failure), report healthy
-    if (healthy) {
+    if (healthy && !timedOut) {
      reportHealthy(ctx.scenario, platform, api);
    } else {
      reportUnhealthy(ctx.scenario, platform, api);
@@ -327,19 +302,6 @@ class ScenarioMonitor {
      phaseTimings,
    };
  }
-
-  /**
-   * Reset all scenarios (for testing purposes only).
-   * Clears all active contexts and their timeouts.
-   */
-  reset() {
-    this.contexts.forEach((ctx) => {
-      if (ctx.timeoutId) {
-        clearTimeout(ctx.timeoutId);
-      }
-    });
-    this.contexts.clear();
-  }
 }

 export const scenarioMonitor = new ScenarioMonitor();
--- a/src/Utils/AuthorizationUtils.ts
+++ b/src/Utils/AuthorizationUtils.ts
@@ -8,8 +8,6 @@ import * as Logger from "../Common/Logger";
 import { configContext } from "../ConfigContext";
 import { DatabaseAccount } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
-import { isExpectedError } from "../Metrics/ErrorClassification";
-import { scenarioMonitor } from "../Metrics/ScenarioMonitor";
 import { trace, traceFailure } from "../Shared/Telemetry/TelemetryProcessor";
 import { UserContext, userContext } from "../UserContext";

@@ -129,10 +127,6 @@ export async function acquireMsalTokenForAccount(
        acquireTokenType: silent ? "silent" : "interactive",
        errorMessage: JSON.stringify(error),
      });
-      // Mark expected failure for health metrics so timeout emits healthy
-      if (isExpectedError(error)) {
-        scenarioMonitor.markExpectedFailure();
-      }
      throw error;
    }
  } else {
@@ -175,10 +169,7 @@ export async function acquireTokenWithMsal(
          acquireTokenType: "interactive",
          errorMessage: JSON.stringify(interactiveError),
        });
-        // Mark expected failure for health metrics so timeout emits healthy
-        if (isExpectedError(interactiveError)) {
-          scenarioMonitor.markExpectedFailure();
-        }
+
        throw interactiveError;
      }
    } else {
@@ -187,10 +178,7 @@ export async function acquireTokenWithMsal(
        acquireTokenType: "silent",
        errorMessage: JSON.stringify(silentError),
      });
-      // Mark expected failure for health metrics so timeout emits healthy
-      if (isExpectedError(silentError)) {
-        scenarioMonitor.markExpectedFailure();
-      }
+
      throw silentError;
    }
  }
--- 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/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,
@@ -104,8 +103,7 @@ async function createCosmosClientForSQLAccount(
  accountType: TestAccount.SQL | TestAccount.SQLContainerCopyOnly = TestAccount.SQL,
 ): Promise<{ armClient: CosmosDBManagementClient; client: CosmosClient }> {
  const credentials = getAzureCLICredentials();
-  const adaptedCredentials = new AzureIdentityCredentialAdapter(credentials);
-  const armClient = new CosmosDBManagementClient(adaptedCredentials, subscriptionId);
+  const armClient = new CosmosDBManagementClient(credentials, subscriptionId);
  const accountName = getAccountName(accountType);
  const account = await armClient.databaseAccounts.get(resourceGroupName, accountName);

@@ -232,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
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