Merge branch 'main' into COMPASS-9667

DarshanaVenkatesh · web-flow · commit f6cee341abac · 2025-08-13T11:30:12.000-07:00
diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
@@ -245,7 +245,7 @@ buildvariants:
     tasks:
     <% for (const group of E2E_TEST_GROUPS) { %>
     <% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
-    - name: test-packaged-app-macos13-<%= group.number %>
+    - name: test-packaged-app-macos-11-<%= group.number %>
     <% } else { %>
     - name: test-packaged-app-<%= group.number %>
     <% } %>
@@ -508,7 +508,7 @@ tasks:
           e2e_test_group: <%= group.number %>
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
-  - name: test-packaged-app-macos13-<%= group.number %>
+  - name: test-packaged-app-macos-11-<%= group.number %>
     tags:
       - required-for-publish
       - run-on-pr
diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
@@ -210,9 +210,9 @@ buildvariants:
       - name: package-compass
         variant: package-macos-arm
     tasks:
-      - name: test-packaged-app-macos13-1
-      - name: test-packaged-app-macos13-2
-      - name: test-packaged-app-macos13-3
+      - name: test-packaged-app-macos-11-1
+      - name: test-packaged-app-macos-11-2
+      - name: test-packaged-app-macos-11-3
   - name: test-packaged-app-macos-11-x64
     display_name: Test Packaged App MacOS x64 11
     run_on: macos-11-gui
@@ -221,9 +221,9 @@ buildvariants:
       - name: package-compass
         variant: package-macos-x64
     tasks:
-      - name: test-packaged-app-macos13-1
-      - name: test-packaged-app-macos13-2
-      - name: test-packaged-app-macos13-3
+      - name: test-packaged-app-macos-11-1
+      - name: test-packaged-app-macos-11-2
+      - name: test-packaged-app-macos-11-3
   - name: test-packaged-app-macos-14-arm
     display_name: Test Packaged App MacOS arm64 14
     run_on: macos-14-arm64-gui
@@ -1294,7 +1294,7 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-macos13-1
+  - name: test-packaged-app-macos-11-1
     tags:
       - required-for-publish
       - run-on-pr
@@ -1344,7 +1344,7 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-macos13-2
+  - name: test-packaged-app-macos-11-2
     tags:
       - required-for-publish
       - run-on-pr
@@ -1394,7 +1394,7 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: test-packaged-app-macos13-3
+  - name: test-packaged-app-macos-11-3
     tags:
       - required-for-publish
       - run-on-pr
diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml
@@ -149,23 +149,11 @@ functions:
           <<: *compass-env
         script: |
           set -e
-          eval $(.evergreen/print-compass-env.sh)
-
-          # Make all the dirs
-          mkdir -p $ARTIFACTS_PATH
+          .evergreen/install-node.sh
 
-    - command: shell.exec
-      type: setup
-      params:
-        working_dir: src
-        shell: bash
-        env:
-          <<: *compass-env
-        script: |
-          set -e
           eval $(.evergreen/print-compass-env.sh)
 
-          .evergreen/preinstall.sh
+          .evergreen/print-debug-info.sh
 
           # Make sure install worked
           echo "Using node version:";
diff --git a/.evergreen/install-node.sh b/.evergreen/install-node.sh
@@ -2,30 +2,12 @@
 
 set -e
 
-echo "========================="
-echo "Important Environment Variables"
-echo "========================="
-echo "PLATFORM: $PLATFORM"
-echo "ARCH: $ARCH"
-echo "NODE_JS_VERSION: $NODE_JS_VERSION"
-echo "NPM_VERSION: $NPM_VERSION"
-echo "APPDATA: $APPDATA"
-echo "PATH: $PATH"
-
-# these are super useful if you want to run the smoke tests locally
-echo "export DEV_VERSION_IDENTIFIER=$DEV_VERSION_IDENTIFIER"
-echo "export EVERGREEN_BUCKET_KEY_PREFIX=$EVERGREEN_BUCKET_KEY_PREFIX"
-echo "export EVERGREEN_BUCKET_NAME=$EVERGREEN_BUCKET_NAME"
-
-echo "IS_OSX: $IS_OSX"
-echo "IS_LINUX: $IS_LINUX"
-echo "IS_WINDOWS: $IS_WINDOWS"
-echo "IS_RHEL: $IS_RHEL"
-echo "IS_UBUNTU: $IS_UBUNTU"
+SCRIPTDIR="$(cd $(dirname "$0"); pwd)"
 
-echo "DOCKER_CONFIG: $DOCKER_CONFIG"
+source $SCRIPTDIR/set-platform-env.sh
 
-SCRIPTDIR="$(cd $(dirname "$0"); pwd)"
+# Ensure the .deps directory exists
+mkdir -p .deps
 
 if [ -n "$IS_WINDOWS" ]; then
     echo "Installing nodejs v$NODE_JS_VERSION for windows..."
diff --git a/.evergreen/print-compass-env.js b/.evergreen/print-compass-env.js
@@ -1,6 +1,6 @@
-#! /usr/bin/env node
 'use strict';
-const path = require('path');
+const path = require('node:path');
+const fs = require('node:fs');
 
 /*
 This script writes a bash script that can be eval()'d in evergreen to modify the
@@ -84,7 +84,11 @@ function printCompassEnv() {
   // to be a non-cygwin path
   const npmCacheDir = path.resolve(__dirname, '..', '.deps', '.npm-cache');
 
-  printVar('ARTIFACTS_PATH', `${newPWD}/.deps`);
+  const artifactsPath = path.resolve(newPWD, '.deps');
+  if (!fs.existsSync(artifactsPath)) {
+    fs.mkdirSync(artifactsPath, { recursive: true });
+  }
+
   printVar('NPM_CACHE_DIR', npmCacheDir);
 
   // all npm var names need to be lowercase
diff --git a/.evergreen/print-compass-env.sh b/.evergreen/print-compass-env.sh
@@ -2,28 +2,7 @@
 
 set -e
 
-if [[ $OSTYPE == "cygwin" ]]; then
-    export PLATFORM='win32'
-    export IS_WINDOWS=true
-    export ARCH=x64
-elif [[ $(uname) == Darwin ]]; then
-    export PLATFORM='darwin'
-    export IS_OSX=true
-    if [ `uname -m` = x86_64 ]; then
-        export ARCH=x64
-    else
-        export ARCH=arm64
-    fi
-else
-    export PLATFORM='linux'
-    export IS_LINUX=true
-    export ARCH=x64
-    if [[ $(cat /etc/*release | grep ^NAME | grep Red) ]]; then
-        export IS_RHEL=true
-    elif [[ $(cat /etc/*release | grep ^NAME | grep Ubuntu) ]]; then
-        export IS_UBUNTU=true
-    fi
-fi
+source .evergreen/set-platform-env.sh
 
 export BASHPATH="$PATH"
 export OSTYPE="$OSTYPE"
@@ -49,5 +28,9 @@ if [[ "${EVERGREEN_PROJECT}" == "10gen-compass-main" ]]; then
     fi
 fi
 
-
-.evergreen/print-compass-env.js
+# We cannot rely on node from the PATH, as the script we're calling is setting up that PATH.
+if [ -n "$IS_WINDOWS" ]; then
+  .deps/node.exe .evergreen/print-compass-env.js
+else
+  .deps/bin/node .evergreen/print-compass-env.js
+fi
diff --git a/.evergreen/print-debug-info.sh b/.evergreen/print-debug-info.sh
@@ -0,0 +1,24 @@
+#! /usr/bin/env bash
+
+echo "========================="
+echo "Important Environment Variables"
+echo "========================="
+echo "PLATFORM: $PLATFORM"
+echo "ARCH: $ARCH"
+echo "NODE_JS_VERSION: $NODE_JS_VERSION"
+echo "NPM_VERSION: $NPM_VERSION"
+echo "APPDATA: $APPDATA"
+echo "PATH: $PATH"
+
+# these are super useful if you want to run the smoke tests locally
+echo "export DEV_VERSION_IDENTIFIER=$DEV_VERSION_IDENTIFIER"
+echo "export EVERGREEN_BUCKET_KEY_PREFIX=$EVERGREEN_BUCKET_KEY_PREFIX"
+echo "export EVERGREEN_BUCKET_NAME=$EVERGREEN_BUCKET_NAME"
+
+echo "IS_OSX: $IS_OSX"
+echo "IS_LINUX: $IS_LINUX"
+echo "IS_WINDOWS: $IS_WINDOWS"
+echo "IS_RHEL: $IS_RHEL"
+echo "IS_UBUNTU: $IS_UBUNTU"
+
+echo "DOCKER_CONFIG: $DOCKER_CONFIG"
diff --git a/.evergreen/set-platform-env.sh b/.evergreen/set-platform-env.sh
@@ -0,0 +1,24 @@
+#! /usr/bin/env bash
+
+if [[ $OSTYPE == "cygwin" ]]; then
+    export PLATFORM='win32'
+    export IS_WINDOWS=true
+    export ARCH=x64
+elif [[ $(uname) == Darwin ]]; then
+    export PLATFORM='darwin'
+    export IS_OSX=true
+    if [ `uname -m` = x86_64 ]; then
+        export ARCH=x64
+    else
+        export ARCH=arm64
+    fi
+else
+    export PLATFORM='linux'
+    export IS_LINUX=true
+    export ARCH=x64
+    if [[ $(cat /etc/*release | grep ^NAME | grep Red) ]]; then
+        export IS_RHEL=true
+    elif [[ $(cat /etc/*release | grep ^NAME | grep Ubuntu) ]]; then
+        export IS_UBUNTU=true
+    fi
+fi
diff --git a/THIRD-PARTY-NOTICES.md b/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 Tue Aug 12 2025.
+This document was automatically generated on Wed Aug 13 2025.
 
 ## List of dependencies
 
diff --git a/docs/tracking-plan.md b/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 Tue, Aug 12, 2025
+Generated on Wed, Aug 13, 2025
 
 ## Table of Contents
 
diff --git a/packages/compass-components/src/components/drawer-portal.spec.tsx b/packages/compass-components/src/components/drawer-portal.spec.tsx
@@ -1,5 +1,10 @@
 import React, { useState } from 'react';
-import { render, screen, waitFor } from '@mongodb-js/testing-library-compass';
+import {
+  render,
+  screen,
+  userEvent,
+  waitFor,
+} from '@mongodb-js/testing-library-compass';
 import {
   DrawerContentProvider,
   DrawerSection,
@@ -47,4 +52,114 @@ describe('DrawerSection', function () {
         .be.visible;
     });
   });
+
+  // Doesn't really matter, but leafygreen uses these as keys when rendering and
+  // this produces a ton of warnings in the logs if they are not unique
+  const icons = ['ArrowDown', 'CaretDown', 'ChevronDown'] as const;
+
+  it('switches drawer content when selecting a different section in the toolbar', async function () {
+    render(
+      <DrawerContentProvider>
+        <DrawerAnchor>
+          {[1, 2, 3].map((n, idx) => {
+            return (
+              <DrawerSection
+                key={`section-${n}`}
+                id={`section-${n}`}
+                label={`Section ${n}`}
+                title={`Section ${n}`}
+                glyph={icons[idx]}
+              >
+                This is section {n}
+              </DrawerSection>
+            );
+          })}
+        </DrawerAnchor>
+      </DrawerContentProvider>
+    );
+
+    userEvent.click(screen.getByRole('button', { name: 'Section 1' }));
+    await waitFor(() => {
+      expect(screen.getByText('This is section 1')).to.be.visible;
+    });
+
+    userEvent.click(screen.getByRole('button', { name: 'Section 2' }));
+    await waitFor(() => {
+      expect(screen.getByText('This is section 2')).to.be.visible;
+    });
+
+    userEvent.click(screen.getByRole('button', { name: 'Section 3' }));
+    await waitFor(() => {
+      expect(screen.getByText('This is section 3')).to.be.visible;
+    });
+
+    userEvent.click(screen.getByRole('button', { name: 'Section 1' }));
+    await waitFor(() => {
+      expect(screen.getByText('This is section 1')).to.be.visible;
+    });
+
+    userEvent.click(screen.getByRole('button', { name: 'Close drawer' }));
+    await waitFor(() => {
+      expect(screen.queryByText('This is section 1')).not.to.exist;
+      expect(screen.queryByText('This is section 2')).not.to.exist;
+      expect(screen.queryByText('This is section 3')).not.to.exist;
+    });
+  });
+
+  it('closes drawer when opened section is removed from toolbar data', async function () {
+    // Render two sections, auto-open first one
+    const { rerender } = render(
+      <DrawerContentProvider>
+        <DrawerAnchor>
+          <DrawerSection
+            id="test-section-1"
+            label="Test section 1"
+            title="Test section 1"
+            glyph="Trash"
+            autoOpen
+          >
+            This is a test section
+          </DrawerSection>
+          <DrawerSection
+            id="test-section-2"
+            label="Test section 2"
+            title="Test section 2"
+            glyph="Bell"
+          >
+            This is another test section
+          </DrawerSection>
+        </DrawerAnchor>
+      </DrawerContentProvider>
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('This is a test section')).to.be.visible;
+    });
+
+    // Now render without opened section
+    rerender(
+      <DrawerContentProvider>
+        <DrawerAnchor>
+          <DrawerSection
+            id="test-section-2"
+            label="Test section 2"
+            title="Test section 2"
+            glyph="Bell"
+          >
+            This is another test section
+          </DrawerSection>
+        </DrawerAnchor>
+      </DrawerContentProvider>
+    );
+
+    await waitFor(() => {
+      expect(screen.queryByText('This is a test section')).not.to.exist;
+    });
+
+    expect(
+      // Specifically a selector for the drawer content section, not the whole
+      // drawer with toolbar
+      screen.getByTestId('lg-drawer')
+    ).to.have.attribute('aria-hidden', 'true');
+  });
 });
diff --git a/packages/compass-components/src/components/drawer-portal.tsx b/packages/compass-components/src/components/drawer-portal.tsx
@@ -221,6 +221,7 @@ export const DrawerAnchor: React.FunctionComponent<{
           ...data,
           content: (
             <div
+              key={data.id}
               data-drawer-section={data.id}
               className={drawerSectionPortalStyles}
             ></div>
diff --git a/packages/compass-components/src/components/drawer/drawer-toolbar-layout/drawer-toolbar-layout-container.tsx b/packages/compass-components/src/components/drawer/drawer-toolbar-layout/drawer-toolbar-layout-container.tsx
diff --git a/packages/compass-e2e-tests/tests/time-to-first-query.test.ts b/packages/compass-e2e-tests/tests/time-to-first-query.test.ts
