Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,10 +12,12 @@
 ## Description
 <!--- Describe your changes in detail -->
 <!--- If applicable, describe (or illustrate) architecture flow -->
+<!--- If the UI changes in a non-trivial way, consider adding screenshots/video illustrating the new flows -->
 
 ### Checklist
 - [ ] New tests and/or benchmarks are included
 - [ ] Documentation is changed or added
+- [ ] If this change updates the UI, screenshots/videos are added and a design review is requested
 - [ ] I have signed the MongoDB Contributor License Agreement (https://www.mongodb.com/legal/contributor-agreement)
 
 ## Motivation and Context

configs/webpack-config-compass/package.json

@@ -73,7 +73,7 @@
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^32.3.2",
+    "electron": "^32.3.3",
     "html-webpack-plugin": "^5.6.0",
     "less": "^3.13.1",
     "less-loader": "^10.0.1",

package-lock.json

@@ -65,8 +65,8 @@
   },
   "//": "See depcheck for why we have some of these dependencies at the root of the monorepo",
   "devDependencies": {
-    "@mongodb-js/monorepo-tools": "^1.1.1",
-    "@mongodb-js/sbom-tools": "^0.7.0",
+    "@mongodb-js/monorepo-tools": "^1.1.16",
+    "@mongodb-js/sbom-tools": "^0.7.2",
     "@testing-library/dom": "^8.20.1",
     "husky": "^8.0.3",
     "js-yaml": "^4.1.0",

package.json

@@ -84,7 +84,7 @@
     "@mongodb-js/oidc-plugin": "^1.1.6",
     "hadron-app-registry": "^9.4.5",
     "compass-preferences-model": "^2.33.5",
-    "electron": "^32.3.2",
+    "electron": "^32.3.3",
     "hadron-ipc": "^3.4.5",
     "lodash": "^4.17.21",
     "react": "^17.0.2",

packages/atlas-service/package.json

@@ -59,7 +59,7 @@
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "depcheck": "^1.4.1",
-    "electron": "^32.3.2",
+    "electron": "^32.3.3",
     "electron-mocha": "^12.2.0",
     "enzyme": "^3.11.0",
     "eslint": "^7.25.0",

packages/compass-crud/package.json

@@ -1153,7 +1153,7 @@ export const UpdateValidationButton =
   '[data-testid="update-validation-button"]';
 export const ValidationMatchingDocumentsPreview =
   '[data-testid="validation-content"] [data-testid="matching-documents"] [data-testid="document-preview"]';
-export const ValidationLoadMatchingDocumentsBtn = `${ValidationMatchingDocumentsPreview} [data-testid="load-sample-document"]`;
+export const ValidationLoadSampleDocumentsBtn = `[data-testid="load-sample-documents"]`;
 export const ValidationNotMatchingDocumentsPreview =
   '[data-testid="validation-content"] [data-testid="notmatching-documents"] [data-testid="document-preview"]';
 export const ValidationLoadNotMatchingDocumentsBtn = `${ValidationNotMatchingDocumentsPreview} [data-testid="load-sample-document"]`;

packages/compass-e2e-tests/helpers/selectors.ts

@@ -50,7 +50,7 @@
     "cross-spawn": "^7.0.5",
     "debug": "^4.3.4",
     "depcheck": "^1.4.1",
-    "electron": "^32.3.2",
+    "electron": "^32.3.3",
     "electron-to-chromium": "^1.5.109",
     "eslint": "^7.25.0",
     "glob": "^10.2.5",
@@ -62,7 +62,7 @@
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-log-writer": "^2.3.4",
-    "mongodb-runner": "^5.6.3",
+    "mongodb-runner": "^5.8.0",
     "node-fetch": "^2.7.0",
     "nyc": "^15.1.0",
     "prettier": "^2.7.1",
@@ -72,7 +72,7 @@
     "semver": "^7.6.3",
     "tree-kill": "^1.2.2",
     "ts-node": "^10.9.1",
-    "webdriverio": "^9.4.1",
+    "webdriverio": "^9.11.0",
     "why-is-node-running": "^2.3.0",
     "xvfb-maybe": "^0.2.1",
     "yargs": "^17.7.2"

packages/compass-e2e-tests/package.json

@@ -10,7 +10,6 @@ import * as Selectors from '../helpers/selectors';
 import { createNumbersCollection } from '../helpers/insert-data';
 
 const NO_PREVIEW_DOCUMENTS = 'No Preview Documents';
-const LOAD_SAMPLE_DOCUMENT = 'Load document';
 const PASSING_VALIDATOR = '{ $jsonSchema: {} }';
 const FAILING_VALIDATOR =
   '{ $jsonSchema: { bsonType: "object", required: [ "phone" ] } }';
@@ -54,9 +53,11 @@ describe('Collection validation tab', function () {
   }
 
   context('when the schema validation is set or modified', function () {
-    it('provides users with a button to load sample documents', async function () {
+    it('provides users with a single button to load sample documents', async function () {
       await addValidation(PASSING_VALIDATOR);
 
+      await browser.clickVisible(Selectors.ValidationLoadSampleDocumentsBtn);
+
       await browser.waitUntil(async () => {
         const matchTextElement = browser.$(
           Selectors.ValidationMatchingDocumentsPreview
@@ -67,18 +68,15 @@ describe('Collection validation tab', function () {
         );
         const notMatchingText = await notMatchingTextElement.getText();
         return (
-          matchText === LOAD_SAMPLE_DOCUMENT &&
-          notMatchingText === LOAD_SAMPLE_DOCUMENT
+          matchText.includes('ObjectId(') &&
+          notMatchingText === NO_PREVIEW_DOCUMENTS
         );
       });
     });
 
     it('supports rules in JSON schema', async function () {
       await addValidation(FAILING_VALIDATOR);
-      await browser.clickVisible(Selectors.ValidationLoadMatchingDocumentsBtn);
-      await browser.clickVisible(
-        Selectors.ValidationLoadNotMatchingDocumentsBtn
-      );
+      await browser.clickVisible(Selectors.ValidationLoadSampleDocumentsBtn);
 
       // nothing passed, everything failed
       await browser.waitUntil(async () => {
@@ -107,10 +105,7 @@ describe('Collection validation tab', function () {
 
       // the automatic indentation and brackets makes multi-line values very fiddly here
       await browser.setValidation(PASSING_VALIDATOR);
-      await browser.clickVisible(Selectors.ValidationLoadMatchingDocumentsBtn);
-      await browser.clickVisible(
-        Selectors.ValidationLoadNotMatchingDocumentsBtn
-      );
+      await browser.clickVisible(Selectors.ValidationLoadSampleDocumentsBtn);
 
       // nothing failed, everything passed
       await browser.waitUntil(async () => {

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

@@ -58,7 +58,7 @@
     "@types/d3-hierarchy": "^3.1.2",
     "chai": "^4.2.0",
     "depcheck": "^1.4.1",
-    "electron": "^32.3.2",
+    "electron": "^32.3.3",
     "electron-mocha": "^12.2.0",
     "eslint": "^7.25.0",
     "mocha": "^10.2.0",