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

Author: github-actions[bot]

.evergreen.yml

@@ -1,5 +1,6 @@
 stepback: false
 exec_timeout_secs: 5400
+foliage_should_block_merges: false
 ignore:
   - docs/**/*.md
   - AUTHORS

.evergreen/buildvariants-and-tasks.in.yml

@@ -290,6 +290,12 @@ buildvariants:
     <% } %>
     <% } %>
 
+  - name: test-can-bundle-compass-web
+    display_name: Test Can Bundle Compass Web
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-can-bundle-compass-web
+
   - name: test-web-sandbox-atlas-cloud
     display_name: Test Web Sandbox (w/ Atlas Cloud login)
     run_on: ubuntu2004-large
@@ -557,6 +563,19 @@ tasks:
   <% } %>
 <% } %>
 
+  - name: test-can-bundle-compass-web
+    tags:
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: compile-compass-web
+        vars:
+          debug: 'compass*,electron*,hadron*,mongo*'
+
   - name: test-web-sandbox-atlas-cloud
     tags:
       - required-for-publish

.evergreen/buildvariants-and-tasks.yml

@@ -280,6 +280,11 @@ buildvariants:
       - name: test-web-sandbox-firefox-1
       - name: test-web-sandbox-firefox-2
       - name: test-web-sandbox-firefox-3
+  - name: test-can-bundle-compass-web
+    display_name: Test Can Bundle Compass Web
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-can-bundle-compass-web
   - name: test-web-sandbox-atlas-cloud
     display_name: Test Web Sandbox (w/ Atlas Cloud login)
     run_on: ubuntu2004-large
@@ -1552,6 +1557,18 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-can-bundle-compass-web
+    tags:
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: compile-compass-web
+        vars:
+          debug: compass*,electron*,hadron*,mongo*
   - name: test-web-sandbox-atlas-cloud
     tags:
       - required-for-publish

.evergreen/functions.yml

@@ -688,6 +688,22 @@ functions:
             npm run --workspace @mongodb-js/compass-smoke-tests start -- dispatch --ref ${branch_name}
           fi
 
+  # Creating the webpack compass-web bundle ensures
+  # that the bundle size does not grow too large for.
+  # The webpack compile fails when it exceeds the size limit.
+  compile-compass-web:
+    - command: shell.exec
+      # Fail the task if it's idle for 10 mins
+      timeout_secs: 600
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          DEBUG: ${debug|}
+        script: |
+          set -e
+          npm run --workspace @mongodb-js/compass-web compile
+
   test-web-sandbox:
     - command: shell.exec
       # Fail the task if it's idle for 10 mins

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 Wed May 28 2025.
+This document was automatically generated on Sun Jun 01 2025.
 
 ## List of dependencies
 

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 Wed, May 28, 2025
+Generated on Sun, Jun 1, 2025
 
 ## Table of Contents
 
@@ -110,6 +110,11 @@ Generated on Wed, May 28, 2025
 
 ### Gen AI
 
+- [AI Opt In Modal Shown](#event--AiOptInModalShownEvent)
+- [AI Opt In Modal Dismissed](#event--AiOptInModalDismissedEvent)
+- [AI Sign In Modal Shown](#event--AiSignInModalShownEvent)
+- [AI Sign In Modal Dismissed](#event--AiSignInModalDismissedEvent)
+- [AI Generate Query Clicked](#event--AiGenerateQueryClickedEvent)
 - [AI Prompt Submitted](#event--AiPromptSubmittedEvent)
 - [AI Query Feedback](#event--AiQueryFeedbackEvent)
 - [AI Response Failed](#event--AiResponseFailedEvent)
@@ -154,6 +159,8 @@ Generated on Wed, May 28, 2025
 - [Secret Storage Not Available](#event--SecretStorageNotAvailableEvent)
 - [Experiment Viewed](#event--ExperimentViewedEvent)
 - [Create Index Button Clicked](#event--CreateIndexButtonClickedEvent)
+- [Error parsing query](#event--CreateIndexErrorParsingQueryEvent)
+- [Error generating covered queries](#event--CreateIndexErrorGettingCoveredQueriesEvent)
 - [UUID Encountered](#event--UUIDEncounteredEvent)
 
 ### Performance Tab
@@ -1291,6 +1298,42 @@ the query results.
 
 ## Gen AI
 
+<a name="event--AiOptInModalShownEvent"></a>
+
+### AI Opt In Modal Shown
+
+This event is fired when the AI Opt-In Modal is shown to the user.
+
+<a name="event--AiOptInModalDismissedEvent"></a>
+
+### AI Opt In Modal Dismissed
+
+This event is fired when the AI Opt-In Modal is dismissed by the user.
+
+<a name="event--AiSignInModalShownEvent"></a>
+
+### AI Sign In Modal Shown
+
+This event is fired when the AI Sign-In Modal is shown to the user.
+
+<a name="event--AiSignInModalDismissedEvent"></a>
+
+### AI Sign In Modal Dismissed
+
+This event is fired when the AI Sign-In Modal is dismissed by the user.
+
+<a name="event--AiGenerateQueryClickedEvent"></a>
+
+### AI Generate Query Clicked
+
+This event is fired when a user clicks the Generate Query / Aggregation entry point.
+
+**Properties**:
+
+- **type** (required): `"aggregation" | "query"`
+  - The type of query being generated.
+- **is_compass_web** (optional): `true | undefined`
+
 <a name="event--AiPromptSubmittedEvent"></a>
 
 ### AI Prompt Submitted
@@ -1803,6 +1846,24 @@ a system that doesn't offer a suitable secret storage backend.
 - **context** (required): `"Create Index Modal"`
 - **is_compass_web** (optional): `true | undefined`
 
+<a name="event--CreateIndexErrorParsingQueryEvent"></a>
+
+### Error parsing query
+
+**Properties**:
+
+- **context** (required): `"Create Index Modal"`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--CreateIndexErrorGettingCoveredQueriesEvent"></a>
+
+### Error generating covered queries
+
+**Properties**:
+
+- **context** (required): `"Create Index Modal"`
+- **is_compass_web** (optional): `true | undefined`
+
 <a name="event--UUIDEncounteredEvent"></a>
 
 ### UUID Encountered

package-lock.json

@@ -1852,7 +1852,7 @@ class CrudStoreImpl
 
   openCreateIndexModal() {
     this.localAppRegistry.emit('open-create-index-modal', {
-      query: EJSON.serialize(this.queryBar.getLastAppliedQuery('crud')),
+      query: EJSON.serialize(this.queryBar.getLastAppliedQuery('crud')?.filter),
     });
   }
 

packages/compass-crud/src/stores/crud-store.ts

@@ -57,6 +57,7 @@
     "@mongodb-js/compass-connections": "^1.57.0",
     "@mongodb-js/compass-intercom": "^0.23.0",
     "@mongodb-js/compass-logging": "^1.6.10",
+    "@mongodb-js/compass-telemetry": "^1.7.1",
     "@mongodb-js/compass-utils": "^0.8.9",
     "bson": "^6.10.3",
     "compass-preferences-model": "^2.39.0",

packages/compass-generative-ai/package.json

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import {
   css,
   cx,
@@ -8,6 +8,10 @@ import {
   useDarkMode,
   WorkspaceContainer,
 } from '@mongodb-js/compass-components';
+import {
+  type TrackFunction,
+  useTelemetry,
+} from '@mongodb-js/compass-telemetry/provider';
 
 import {
   AIEntrySVG,
@@ -95,14 +99,20 @@ function AIExperienceEntry({
   onClick: () => void;
 }) {
   const darkMode = useDarkMode();
+  const track = useTelemetry();
+
+  const handleClick = useCallback(() => {
+    track('AI Generate Query Clicked', { type });
+    onClick();
+  }, [track, onClick, type]);
 
   return (
     <button
       className={cx(
         aiEntryStyles,
         darkMode ? aiEntryDarkModeStyles : aiEntryLightModeStyles
       )}
-      onClick={onClick}
+      onClick={handleClick}
       data-testid={dataTestId}
       type="button"
       title={`Generate ${type}`}
@@ -119,10 +129,12 @@ function createAIPlaceholderHTMLPlaceholder({
   onClickAI,
   darkMode,
   placeholderText,
+  track,
 }: {
   onClickAI: () => void;
   darkMode?: boolean;
   placeholderText: string;
+  track: TrackFunction;
 }): HTMLElement {
   const containerEl = document.createElement('div');
 
@@ -144,6 +156,7 @@ function createAIPlaceholderHTMLPlaceholder({
   aiButtonEl.addEventListener('click', (e) => {
     e.preventDefault();
     e.stopPropagation();
+    track('AI Generate Query Clicked' as const, { type: 'query' });
     onClickAI();
   });