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

.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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - 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.13.0
       - name: Install dependencies
         run: npm ci
 

.github/workflows/cleanup.yml

@@ -22,7 +22,7 @@ jobs:
     env:
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Az CLI login"
         uses: azure/login@v1
@@ -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.13.0
+        uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.13.0
       - run: npm ci
       - run: node utils/cleanupDBs.js

package.json

@@ -14,7 +14,7 @@
     "@fluentui/react": "8.119.0",
     "@fluentui/react-components": "9.54.2",
     "@jupyterlab/services": "6.0.2",
-    "@jupyterlab/terminal": "3.6.1",
+    "@jupyterlab/terminal": "3.0.3",
     "@microsoft/applicationinsights-web": "2.6.1",
     "@nteract/commutable": "7.5.1",
     "@nteract/connected-components": "6.8.2",
@@ -44,7 +44,7 @@
     "@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",
@@ -57,7 +57,7 @@
     "copy-webpack-plugin": "11.0.0",
     "crossroads": "0.12.2",
     "css-element-queries": "1.1.1",
-    "d3": "7.9.0",
+    "d3": "7.8.5",
     "datatables.net-colreorder-dt": "1.7.0",
     "datatables.net-dt": "1.13.8",
     "date-fns": "1.29.0",
@@ -79,8 +79,6 @@
     "jquery-typeahead": "2.11.1",
     "jquery-ui-dist": "1.13.2",
     "knockout": "3.5.1",
-    "lodash": "4.17.23",
-    "lodash-es": "4.17.23",
     "mkdirp": "1.0.4",
     "monaco-editor": "0.44.0",
     "ms": "2.1.3",
@@ -104,7 +102,7 @@
     "react-youtube": "9.0.1",
     "reflect-metadata": "0.1.13",
     "rx-jupyter": "5.5.12",
-    "sanitize-html": "2.17.0",
+    "sanitize-html": "2.3.3",
     "shell-quote": "1.7.3",
     "styled-components": "5.0.1",
     "swr": "0.4.0",
@@ -117,12 +115,8 @@
     "ws": "8.17.1",
     "zustand": "3.5.0"
   },
-  "overrides": {
-    "d3-color": "3.1.0",
-    "cross-spawn": "7.0.6"
-  },
   "devDependencies": {
-    "@babel/core": "7.29.0",
+    "@babel/core": "7.24.7",
     "@babel/preset-env": "7.24.7",
     "@babel/preset-react": "7.24.7",
     "@babel/preset-typescript": "7.24.7",
@@ -186,9 +180,10 @@
     "less": "4.5.1",
     "less-loader": "11.1.3",
     "less-vars-loader": "1.1.0",
+    "loader-utils": "2.0.4",
     "mini-css-extract-plugin": "2.1.0",
     "monaco-editor-webpack-plugin": "7.1.0",
-    "node-fetch": "2.6.7",
+    "node-fetch": "3.3.2",
     "prettier": "3.0.3",
     "process": "0.11.10",
     "querystring-es3": "0.2.1",
@@ -202,7 +197,7 @@
     "typescript": "4.9.5",
     "url-loader": "4.1.1",
     "wait-on": "9.0.3",
-    "webpack": "5.104.1",
+    "webpack": "5.88.2",
     "webpack-bundle-analyzer": "5.2.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.2.3",

preview/package-lock.json

@@ -10,8 +10,7 @@
       "dependencies": {
         "body-parser": "^2.2.2",
         "express": "^5.2.1",
-        "follow-redirects": "^1.15.6",
-        "http-proxy-middleware": "^3.0.5",
+        "http-proxy-middleware": "^3.0.3",
         "node": "^20.19.5",
         "node-fetch": "^2.6.1",
         "path-to-regexp": "^0.1.12"

preview/package.json

@@ -13,8 +13,7 @@
   "dependencies": {
     "body-parser": "^2.2.2",
     "express": "^5.2.1",
-    "follow-redirects": "^1.15.6",
-    "http-proxy-middleware": "^3.0.5",
+    "http-proxy-middleware": "^3.0.3",
     "node": "^20.19.5",
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^0.1.12"

src/Utils/arm/request.test.ts

@@ -1,7 +1,7 @@
-import { armRequest } from "./request";
-import fetch from "node-fetch";
-import { updateUserContext } from "../../UserContext";
+import fetch, { Headers } from "node-fetch";
 import { AuthType } from "../../AuthType";
+import { updateUserContext } from "../../UserContext";
+import { armRequest } from "./request";
 
 interface Global {
   Headers: unknown;

test/fx.ts

@@ -250,7 +250,7 @@ class TreeNode {
       // Try three times to wait for the node to expand.
       for (let i = 0; i < RETRY_COUNT; i++) {
         try {
-          await tree.waitFor({ state: "visible", timeout: 3 * 1000 });
+          await tree.waitFor({ state: "visible" });
           // The tree has expanded, let's get out of here
           return true;
         } catch {

test/sql/scaleAndSettings/sharedThroughput.spec.ts

@@ -29,7 +29,7 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Create database with shared manual throughput and verify Scale node in UI", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
+      test.setTimeout(120000); // 2 minutes timeout
       // Create database with shared manual throughput (400 RU/s)
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -47,7 +47,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Add container to shared database without dedicated throughput", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared manual throughput
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -101,7 +100,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database manual throughput", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared manual throughput (400 RU/s)
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -127,7 +125,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database from manual to autoscale", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared manual throughput (400 RU/s)
       dbContext = await createTestDB({ throughput: 400 });
 
@@ -162,7 +159,7 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Create database with shared autoscale throughput and verify Scale node in UI", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
+      test.setTimeout(120000); // 2 minutes timeout
 
       // Create database with shared autoscale throughput (max 1000 RU/s)
       dbContext = await createTestDB({ maxThroughput: 1000 });
@@ -181,7 +178,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database autoscale throughput", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared autoscale throughput (max 1000 RU/s)
       dbContext = await createTestDB({ maxThroughput: 1000 });
 
@@ -207,7 +203,6 @@ test.describe("Database with Shared Throughput", () => {
     });
 
     test("Scale shared database from autoscale to manual", async () => {
-      test.setTimeout(180000); // 3 minutes timeout
       // Create database with shared autoscale throughput (max 1000 RU/s)
       dbContext = await createTestDB({ maxThroughput: 1000 });
 

test/testData.ts

@@ -237,7 +237,7 @@ export const setPartitionKeys = (partitionKeys: 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) {

utils/armClientGenerator/generator.ts

@@ -161,7 +161,8 @@ const propertyToType = (property: Property, prop: string, required: boolean) =>
 
 async function main() {
   const response = await fetch(schemaURL);
-  const schema = await response.json();
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const schema: any = await response.json();
 
   // STEP 1: Convert all definitions to TypeScript types and interfaces
   for (const definition in schema.definitions) {

utils/deployment-status/package-lock.json

@@ -14,17 +14,11 @@
         "node-fetch": "^2.6.1"
       }
     },
-    "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=="
-    },
     "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==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "@types/color-name": "^1.1.1",
         "color-convert": "^2.0.1"
       },
       "engines": {
@@ -35,9 +29,9 @@
       }
     },
     "node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -82,23 +76,53 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
       "engines": {
         "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
     "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==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
     }
   }
 }