COMPASS-9674: merge

Author: johnjackweir

.evergreen/start-docker-envs.sh

@@ -39,7 +39,7 @@ if [ "$HAS_DOCKER" = true ]; then
   LOGS_DIR="$SCRIPT_DIR/logs"
   mkdir -p "$LOGS_DIR"
 
-  git clone -b v1.3.2 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
+  git clone -b v1.3.4 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
   $DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
   $DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
   $DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d

.snyk

@@ -7,14 +7,12 @@ ignore:
         reason: >-
           Not applicable as we do not use a valueFormatter or cellRenderer
           function
-        expires: 2025-09-17T13:05:57.065Z
         created: 2024-01-18T18:27:24.353Z
   SNYK-JS-AGGRIDCOMMUNITY-7414157:
     - '*':
         reason: >-
           Not applicable as we don't use ag-grid utils and the library never
           passes user input directly to the merge function
-        expires: 2025-09-17T13:05:57.065Z
         created: 2024-09-17T13:05:57.071Z
   SNYK-JS-ELECTRON-8642944:
     - '*':

THIRD-PARTY-NOTICES.md

@@ -11,7 +11,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"

configs/testing-library-compass/package.json

@@ -400,7 +400,29 @@ function createWrapper(
   return { wrapperState, wrapper };
 }
 
-export type RenderConnectionsOptions = RenderOptions & TestConnectionsOptions;
+/**
+ * Returns a new {@link RenderResult} with the {@link RenderResult.container} replaced by the container inserted by the context menu provider.
+ */
+function unwrapContextMenuContainer(result: RenderResult) {
+  const { container, ...rest } = result;
+  const { firstChild } = container;
+  if (
+    firstChild instanceof HTMLElement &&
+    firstChild.getAttribute('data-testid') === 'context-menu-children-container'
+  ) {
+    return { container: firstChild, ...rest };
+  } else {
+    return { container, ...rest };
+  }
+}
+
+export type RenderConnectionsOptions = RenderOptions &
+  TestConnectionsOptions & {
+    /**
+     * Whether to include the context menu container and menu in the container of the returned result.
+     */
+    includeContextMenu?: boolean;
+  };
 
 export type RenderWithConnectionsResult = ReturnType<
   typeof createWrapper
@@ -415,6 +437,7 @@ function renderWithConnections(
     baseElement,
     queries,
     hydrate,
+    includeContextMenu = false,
     ...connectionsOptions
   }: RenderConnectionsOptions = {}
 ): RenderWithConnectionsResult {
@@ -443,7 +466,10 @@ function renderWithConnections(
     true,
     'Expected initial connections to load before rendering rest of the tested UI, but it did not happen'
   );
-  return { ...wrapperState, ...result };
+  return {
+    ...wrapperState,
+    ...(includeContextMenu ? result : unwrapContextMenuContainer(result)),
+  };
 }
 
 export type RenderHookConnectionsOptions<HookProps> = Omit<

configs/testing-library-compass/src/index.tsx

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -66,12 +66,12 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "babel-loader": "^8.2.5",
     "babel-plugin-istanbul": "^5.2.0",
-    "browserslist": "^4.25.3",
+    "browserslist": "^4.26.2",
     "chalk": "^4.1.2",
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^37.4.0",
+    "electron": "^37.5.1",
     "html-webpack-plugin": "^5.6.0",
     "less": "^3.13.1",
     "less-loader": "^10.0.1",

configs/webpack-config-compass/package.json

@@ -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 Tue, Sep 16, 2025
+Generated on Fri, Sep 19, 2025
 
 ## Table of Contents
 
@@ -84,8 +84,14 @@ Generated on Tue, Sep 16, 2025
 
 ### Data Modeling
 
+- [Data Modeling Collection Added](#event--DataModelingDiagramCollectionAdded)
+- [Data Modeling Collection Removed](#event--DataModelingDiagramCollectionRemoved)
+- [Data Modeling Collection Renamed](#event--DataModelingDiagramCollectionRenamed)
 - [Data Modeling Diagram Created](#event--DataModelingDiagramCreated)
 - [Data Modeling Diagram Exported](#event--DataModelingDiagramExported)
+- [Data Modeling Field Removed](#event--DataModelingDiagramFieldRemoved)
+- [Data Modeling Field Renamed](#event--DataModelingDiagramFieldRenamed)
+- [Data Modeling Field Type Changed](#event--DataModelingDiagramFieldTypeChanged)
 - [Data Modeling Diagram Imported](#event--DataModelingDiagramImported)
 - [Data Modeling Relationship Added](#event--DataModelingDiagramRelationshipAdded)
 - [Data Modeling Relationship Form Opened](#event--DataModelingDiagramRelationshipEdited)
@@ -131,6 +137,7 @@ Generated on Tue, Sep 16, 2025
 - [Assistant Prompt Submitted](#event--AssistantPromptSubmittedEvent)
 - [Assistant Response Failed](#event--AssistantResponseFailedEvent)
 - [Assistant Entry Point Used](#event--AssistantEntryPointUsedEvent)
+- [Assistant Confirmation Submitted](#event--AssistantConfirmationSubmittedEvent)
 - [AI Opt In Modal Shown](#event--AiOptInModalShownEvent)
 - [AI Opt In Modal Dismissed](#event--AiOptInModalDismissedEvent)
 - [AI Generate Query Clicked](#event--AiGenerateQueryClickedEvent)
@@ -631,6 +638,7 @@ This event is fired when a user submits feedback for the assistant.
 - **feedback** (required): `"positive" | "negative"`
 - **text** (optional): `string | undefined`
 - **request_id** (required): `string | null`
+- **source** (required): `"explain plan" | "performance insights" | "connection error" | "chat response"`
 - **is_compass_web** (optional): `true | undefined`
 
 ## Atlas
@@ -1041,6 +1049,39 @@ This event is fired when a context menu item is clicked.
 
 ## Data Modeling
 
+<a name="event--DataModelingDiagramCollectionAdded"></a>
+
+### Data Modeling Collection Added
+
+This event is fired when user adds a collection in a data modeling diagram.
+
+**Properties**:
+
+- **source** (required): `"toolbar"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--DataModelingDiagramCollectionRemoved"></a>
+
+### Data Modeling Collection Removed
+
+This event is fired when user removes a collection in a data modeling diagram.
+
+**Properties**:
+
+- **source** (required): `"side_panel"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--DataModelingDiagramCollectionRenamed"></a>
+
+### Data Modeling Collection Renamed
+
+This event is fired when user renames a collection in a data modeling diagram.
+
+**Properties**:
+
+- **source** (required): `"side_panel"`
+- **is_compass_web** (optional): `true | undefined`
+
 <a name="event--DataModelingDiagramCreated"></a>
 
 ### Data Modeling Diagram Created
@@ -1060,7 +1101,42 @@ This event is fired when user exports data modeling diagram.
 
 **Properties**:
 
-- **format** (required): `"json" | "png" | "diagram"`
+- **format** (required): `"png" | "json" | "diagram"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--DataModelingDiagramFieldRemoved"></a>
+
+### Data Modeling Field Removed
+
+This event is fired when user removes a field in a data modeling diagram.
+
+**Properties**:
+
+- **source** (required): `"side_panel"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--DataModelingDiagramFieldRenamed"></a>
+
+### Data Modeling Field Renamed
+
+This event is fired when user renames a field in a data modeling diagram.
+
+**Properties**:
+
+- **source** (required): `"side_panel"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--DataModelingDiagramFieldTypeChanged"></a>
+
+### Data Modeling Field Type Changed
+
+This event is fired when user changes a field type in a data modeling diagram.
+
+**Properties**:
+
+- **source** (required): `"side_panel"`
+- **from** (optional): `string | undefined`
+- **to** (optional): `string | undefined`
 - **is_compass_web** (optional): `true | undefined`
 
 <a name="event--DataModelingDiagramImported"></a>
@@ -1169,7 +1245,7 @@ This event is fired when user clones a document.
 
 **Properties**:
 
-- **mode** (required): `"list" | "json" | "table"`
+- **mode** (required): `"json" | "list" | "table"`
   - The view used to clone the document.
 - **is_compass_web** (optional): `true | undefined`
 - **connection_id** (optional): `string | undefined`
@@ -1183,7 +1259,7 @@ This event is fired when user copies a document to the clipboard.
 
 **Properties**:
 
-- **mode** (required): `"list" | "json" | "table"`
+- **mode** (required): `"json" | "list" | "table"`
   - The view used to copy the document.
 - **is_compass_web** (optional): `true | undefined`
 - **connection_id** (optional): `string | undefined`
@@ -1197,7 +1273,7 @@ This event is fired when user deletes a document.
 
 **Properties**:
 
-- **mode** (required): `"list" | "json" | "table"`
+- **mode** (required): `"json" | "list" | "table"`
   - The view used to delete the document.
 - **is_compass_web** (optional): `true | undefined`
 - **connection_id** (optional): `string | undefined`
@@ -1227,7 +1303,7 @@ This event is fired when user updates a document
 
 **Properties**:
 
-- **mode** (required): `"list" | "json" | "table"`
+- **mode** (required): `"json" | "list" | "table"`
   - The view used to delete the document.
 - **is_compass_web** (optional): `true | undefined`
 - **connection_id** (optional): `string | undefined`
@@ -1293,7 +1369,7 @@ This event is fired when user executes a query
   - The type of the collection on which the query was executed.
 - **used_regex** (required): `boolean`
   - Indicates whether the query used a regular expression.
-- **mode** (required): `"list" | "json" | "table"`
+- **mode** (required): `"json" | "list" | "table"`
   - The view used to run the query.
 - **is_compass_web** (optional): `true | undefined`
 - **connection_id** (optional): `string | undefined`
@@ -1469,6 +1545,18 @@ This event is fired when a user uses an assistant entry point.
 - **source** (required): `"explain plan" | "performance insights" | "connection error"`
 - **is_compass_web** (optional): `true | undefined`
 
+<a name="event--AssistantConfirmationSubmittedEvent"></a>
+
+### Assistant Confirmation Submitted
+
+This event is fired when a user confirms a confirmation message in the assistant chat.
+
+**Properties**:
+
+- **status** (required): `"confirmed" | "rejected"`
+- **source** (required): `"explain plan" | "performance insights" | "connection error" | "chat response"`
+- **is_compass_web** (optional): `true | undefined`
+
 <a name="event--AiOptInModalShownEvent"></a>
 
 ### AI Opt In Modal Shown