Merge branch 'main' into remove-use-toast-use-confirmation-modal-hooks

Author: gribnoysup

.github/workflows/authors-and-third-party-notices.yaml

@@ -3,7 +3,7 @@ name: Update Authors and Third Party Notices
 on:
   # Once a week or on pushes to main
   schedule:
-    - cron: "0 3 * * 0"
+    - cron: '0 3 * * 0'
   push:
     branches:
       - main
@@ -13,6 +13,9 @@ permissions:
 
 jobs:
   update_generated_files:
+    if: |
+      github.event_name == 'schedule' ||
+      !startsWith(github.event.head_commit.message, 'chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary')
     name: Update automatically generated files
     runs-on: ubuntu-latest
     env:
@@ -32,13 +35,13 @@ jobs:
 
           # this is important so git log can pick up on
           # the whole history to generate the list of AUTHORS
-          fetch-depth: "0"
+          fetch-depth: '0'
           token: ${{ steps.app-token.outputs.token }}
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20.16.0
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install [email protected]
         run: |
@@ -71,5 +74,15 @@ jobs:
 
       - name: Commit and push
         run: |
-          git commit --no-allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary" || true
-          git push
+          # We can't rely on git not allowing empty commits by default: the
+          # empty commit check happens before the pre-commit hooks run and if
+          # there is no diff exists after precommit logic was executed, empty
+          # commit will still be generated. Instead of that we will allow empty
+          # commit to happen and will check it directly if it's empty or not
+          git commit --allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary"
+          if [ $(git diff-tree --name-only --no-commit-id HEAD | wc -l) -gt 0 ]; then
+            echo "Files changed, pushing update..."
+            git push
+          else
+            echo "No changes to push"
+          fi

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Thu Mar 27 2025.
+This document was automatically generated on Fri Mar 28 2025.
 
 ## List of dependencies
 

docs/security-test-summary.md

@@ -14,7 +14,6 @@ handling and credential revocation upon signout.
 
 <!-- Source File: `packages/atlas-service/src/main.spec.ts` -->
 
-
 ## Connection Import / Export Testing
 
 Compass allows users to export and import connections. Our tests verify that
@@ -23,7 +22,6 @@ that encryption for credentials is correctly applied.
 
 <!-- Source File: `packages/compass-e2e-tests/tests/import-export-connections.test.ts` -->
 
-
 ## In-Use Encryption Testing
 
 MongoDB supports a set of features referred to as "In-Use Encryption".
@@ -38,7 +36,6 @@ and never sent in plaintext.
 
 <!-- Source File: `packages/compass-e2e-tests/tests/in-use-encryption.test.ts` -->
 
-
 ## Enhanced Network Isolation Tests
 
 Compass allows users to specify that the application should not perform any
@@ -49,7 +46,6 @@ We ensure that no such network calls happen when this setting is enabled.
 
 <!-- Source File: `packages/compass-e2e-tests/tests/no-network-traffic.test.ts` -->
 
-
 ## OIDC Authentication End-to-End Tests
 
 In addition to our regular tests for the different authentication mechanisms supported
@@ -62,7 +58,6 @@ what the user has previously specified.
 
 <!-- Source File: `packages/compass-e2e-tests/tests/oidc.test.ts` -->
 
-
 ## Connection String Credential Protection Tests
 
 Compass provides a user- or administrator-configurable setting that prevents the application
@@ -71,7 +66,6 @@ which expose connection information honor this setting.
 
 <!-- Source File: `packages/compass-e2e-tests/tests/protect-connection-strings.test.ts` -->
 
-
 ## Automatic Connection Establishment Tests
 
 Since this application accepts remote host connection information on the command line,
@@ -82,27 +76,23 @@ behavior.
 
 <!-- Source File: `packages/compass/src/main/auto-connect.spec.ts` -->
 
-
 ## Connection Form Password Protection
 
 We verify that database credentials are not displayed to users, unless they
 are actively in the process of editing them.
 
 <!-- Source File: `packages/connection-form/src/components/connection-string-input.spec.tsx` -->
 
-
 ## Connection Option Validation Rules
 
 We explicitly verify that the application warns users about connection settings
 that may result in security issues, for example potentially insecure TLS or Proxy settings.
 
 <!-- Source File: `packages/connection-form/src/utils/validation.spec.ts` -->
 
-
 ## Secure Credential Storage
 
 We ensure that when sensitive information is persisted, in particular database access credentials,
 it is cryptographically protected through an OS keychain encryption integration.
 
 <!-- Source File: `packages/connection-info/src/connection-secrets.spec.ts` -->
-

docs/tracking-plan.md

@@ -6,7 +6,7 @@
 > the tracking plan for the specific Compass version you can use the following
 > URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
 
-Generated on Thu, Mar 27, 2025
+Generated on Fri, Mar 28, 2025
 
 ## Table of Contents
 

package.json

@@ -41,7 +41,9 @@
     "update-authors": "node scripts/generate-authors.js",
     "preupdate-third-party-notices": "npm run -w packages/compass compile",
     "update-third-party-notices": "cp packages/compass/THIRD-PARTY-NOTICES.md .",
+    "postupdate-third-party-notices": "npx prettier-compass THIRD-PARTY-NOTICES.md --write",
     "update-tracking-plan": "npx ts-node scripts/generate-tracking-plan.ts > docs/tracking-plan.md",
+    "postupdate-tracking-plan": "npx prettier-compass docs/tracking-plan.md --write",
     "bump-packages": "bump-monorepo-packages",
     "publish-packages": "lerna publish from-package --no-verify-access --no-push --no-git-tag-version --yes",
     "version": "node ./scripts/align-monorepo-dependencies.js --no-commit",
@@ -50,6 +52,7 @@
     "update-evergreen-config": "node .evergreen/template-yml.js",
     "postupdate-evergreen-config": "evergreen validate .evergreen.yml",
     "update-security-test-summary": "ts-node scripts/generate-security-test-summary.ts > docs/security-test-summary.md",
+    "postupdate-security-test-summary": "npx prettier-compass docs/security-test-summary.md --write",
     "prepare": "husky install",
     "snyk-test": "node scripts/snyk-test.js",
     "pregenerate-vulnerability-report": "npm run compile -w packages/compass && npm run snyk-test",

packages/compass-e2e-tests/tests/collection-documents-tab.test.ts

@@ -10,6 +10,7 @@ import {
   TEST_COMPASS_WEB,
   skipForWeb,
   DEFAULT_CONNECTION_NAME_1,
+  serverSatisfies,
 } from '../helpers/compass';
 import type { Compass } from '../helpers/compass';
 import * as Selectors from '../helpers/selectors';
@@ -691,6 +692,9 @@ FindIterable<Document> result = collection.find(filter);`);
     const REQUIRE_PHONE_VALIDATOR =
       '{ $jsonSchema: { bsonType: "object", required: [ "phone" ] } }';
     beforeEach(async function () {
+      if (serverSatisfies('< 5.0.0')) {
+        return this.skip();
+      }
       await browser.setValidation({
         connectionName: DEFAULT_CONNECTION_NAME_1,
         database: 'test',

packages/compass-e2e-tests/tests/collection-import.test.ts

@@ -10,6 +10,7 @@ import {
   skipForWeb,
   TEST_COMPASS_WEB,
   DEFAULT_CONNECTION_NAME_1,
+  serverSatisfies,
 } from '../helpers/compass';
 import type { Compass } from '../helpers/compass';
 import * as Selectors from '../helpers/selectors';
@@ -527,6 +528,11 @@ describe('Collection import', function () {
     });
 
     it('with JSON + abort on error checked, it displays a validation error with details', async function () {
+      // 4.x doesn't provide validation details
+      if (serverSatisfies('< 5.0.0')) {
+        this.skip();
+      }
+
       const jsonPath = path.resolve(
         __dirname,
         '..',
@@ -578,6 +584,11 @@ describe('Collection import', function () {
     });
 
     it('with CSV + abort on error unchecked, it includes the details in a file', async function () {
+      // 4.x doesn't provide validation details
+      if (serverSatisfies('< 5.0.0')) {
+        this.skip();
+      }
+
       const filename = 'array-documents.csv';
       const csvPath = path.resolve(__dirname, '..', 'fixtures', filename);