resolve merge conflicts

Author: rubydong

.evergreen/functions.yml

@@ -53,6 +53,7 @@ variables:
     MONGODB_RUNNER_LOG_DIR: ${workdir}/src/.testserver/
     DOCKERHUB_USERNAME: ${dockerhub_username}
     DOCKERHUB_PASSWORD: ${dockerhub_password}
+    REQUESTER: ${requester}
   - &compass-e2e-secrets
     E2E_TESTS_METRICS_URI: ${e2e_tests_metrics_string}
     E2E_TESTS_ATLAS_HOST: ${e2e_tests_atlas_host}
@@ -421,7 +422,8 @@ functions:
       params:
         working_dir: src
         shell: bash
-        include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
+        include_expansions_in_env:
+          [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
         env:
           ARTIFACTORY_USERNAME: ${artifactory_username}
           ARTIFACTORY_PASSWORD: ${artifactory_password}
@@ -506,7 +508,7 @@ functions:
   publish:
     - command: ec2.assume_role
       params:
-        role_arn: "arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass"
+        role_arn: 'arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass'
     - command: shell.exec
       params:
         working_dir: src
@@ -661,7 +663,7 @@ functions:
     - command: github.generate_token
       params:
         expansion_name: generated_token
-        permissions:  # optional
+        permissions: # optional
           actions: write
     - 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 Mon Apr 21 2025.
+This document was automatically generated on Wed Apr 23 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 Mon, Apr 21, 2025
+Generated on Wed, Apr 23, 2025
 
 ## Table of Contents
 
@@ -153,6 +153,7 @@ Generated on Mon, Apr 21, 2025
 - [Screen](#event--ScreenEvent)
 - [Secret Storage Not Available](#event--SecretStorageNotAvailableEvent)
 - [Experiment Viewed](#event--ExperimentViewedEvent)
+- [Create Index Button Clicked](#event--CreateIndexButtonClickedEvent)
 
 ### Performance Tab
 
@@ -1789,6 +1790,16 @@ a system that doesn't offer a suitable secret storage backend.
 - **test_name** (required): `string`
 - **is_compass_web** (optional): `true | undefined`
 
+<a name="event--CreateIndexButtonClickedEvent"></a>
+
+### Create Index Button Clicked
+
+**Properties**:
+
+- **flow** (optional): `"Start with Query" | "Start with Index" | undefined`
+- **context** (required): `"Create Index Modal"`
+- **is_compass_web** (optional): `true | undefined`
+
 ## Performance Tab
 
 <a name="event--CurrentOpShowOperationDetailsEvent"></a>

packages/compass-generative-ai/src/components/ai-optin-modal.tsx

@@ -116,15 +116,16 @@ export const AIOptInModal: React.FunctionComponent<OptInModalProps> = ({
           {isProjectAIEnabled
             ? 'AI features are enabled for project users with data access.'
             : 'AI features are disabled for project users.'}{' '}
-          Project Owners can change this setting in the{' '}
+          Project Owners can {isProjectAIEnabled ? 'disable' : 'enable'} Data
+          Explorer AI features in the{' '}
           {PROJECT_SETTINGS_LINK !== null ? (
             <Link href={PROJECT_SETTINGS_LINK} target="_blank">
-              AI features
+              Project Settings
             </Link>
           ) : (
-            'AI features '
+            'Project Settings'
           )}
-          section.
+          .
         </Banner>
         <div className={disclaimerStyles}>
           This is a feature powered by generative AI, and may give inaccurate

packages/compass-indexes/src/components/create-index-form/create-index-form.tsx

@@ -18,6 +18,7 @@ import {
   useConnectionSupports,
 } from '@mongodb-js/compass-connections/provider';
 import { usePreference } from 'compass-preferences-model/provider';
+import IndexFlowSection from './index-flow-section';
 import QueryFlowSection from './query-flow-section';
 
 const createIndexModalFieldsStyles = css({
@@ -80,6 +81,8 @@ function CreateIndexForm({
       });
   }, [schemaFields]);
 
+  const showIndexesGuidanceIndexFlow =
+    showIndexesGuidanceVariant && currentTab === 'IndexFlow';
   const showIndexesGuidanceQueryFlow =
     showIndexesGuidanceVariant && currentTab === 'QueryFlow';
 
@@ -89,7 +92,11 @@ function CreateIndexForm({
         className={createIndexModalFieldsStyles}
         data-testid="create-index-form"
       >
-        {showIndexesGuidanceVariant ? (
+        {!showIndexesGuidanceVariant ? (
+          <Body weight="medium" className={indexFieldsHeaderStyles}>
+            Index fields
+          </Body>
+        ) : (
           <RadioBoxGroup
             aria-labelledby="index-flows"
             data-testid="create-index-form-flows"
@@ -107,29 +114,46 @@ function CreateIndexForm({
               Start with a Query
             </RadioBox>
           </RadioBoxGroup>
-        ) : (
-          <Body weight="medium" className={indexFieldsHeaderStyles}>
-            Index fields
-          </Body>
         )}
 
-        {/* Only show the fields if user is in the Start with an index flow or if they're in the control */}
-        {fields.length > 0 &&
-        (!showIndexesGuidanceVariant || currentTab === 'IndexFlow') ? (
-          <CreateIndexFields
-            schemaFields={schemaFieldNames}
-            fields={fields}
-            serverVersion={serverVersion}
-            isRemovable={!(fields.length > 1)}
-            onSelectFieldNameClick={onSelectFieldNameClick}
-            onSelectFieldTypeClick={onSelectFieldTypeClick}
-            onAddFieldClick={onAddFieldClick}
-            onRemoveFieldClick={onRemoveFieldClick}
-          />
+        {fields.length > 0 ? (
+          // Variant UI
+          showIndexesGuidanceVariant && showIndexesGuidanceIndexFlow ? (
+            <IndexFlowSection
+              createIndexFieldsComponent={
+                <CreateIndexFields
+                  schemaFields={schemaFieldNames}
+                  fields={fields}
+                  serverVersion={serverVersion}
+                  isRemovable={!(fields.length > 1)}
+                  onSelectFieldNameClick={onSelectFieldNameClick}
+                  onSelectFieldTypeClick={onSelectFieldTypeClick}
+                  onAddFieldClick={onAddFieldClick}
+                  onRemoveFieldClick={onRemoveFieldClick}
+                />
+              }
+            />
+          ) : (
+            // Control UI
+            !showIndexesGuidanceQueryFlow && (
+              <CreateIndexFields
+                schemaFields={schemaFieldNames}
+                fields={fields}
+                serverVersion={serverVersion}
+                isRemovable={!(fields.length > 1)}
+                onSelectFieldNameClick={onSelectFieldNameClick}
+                onSelectFieldTypeClick={onSelectFieldTypeClick}
+                onAddFieldClick={onAddFieldClick}
+                onRemoveFieldClick={onRemoveFieldClick}
+              />
+            )
+          )
         ) : null}
-
-        {showIndexesGuidanceQueryFlow && <QueryFlowSection />}
       </div>
+
+      {showIndexesGuidanceQueryFlow && <QueryFlowSection />}
+
+      {/* TODO in CLOUDP-314036: update the accordion design */}
       <Accordion data-testid="create-index-modal-toggle-options" text="Options">
         <div
           data-testid="create-index-modal-options"

packages/compass-indexes/src/components/create-index-form/index-flow-section.spec.tsx

@@ -0,0 +1,59 @@
+import React from 'react';
+import { render, screen } from '@mongodb-js/testing-library-compass';
+import IndexFlowSection from './index-flow-section';
+import { expect } from 'chai';
+
+describe('IndexFlowSection', () => {
+  const renderComponent = (createIndexFieldsComponent?: JSX.Element) => {
+    render(
+      <IndexFlowSection
+        createIndexFieldsComponent={createIndexFieldsComponent ?? null}
+      />
+    );
+  };
+  it('renders the Input Index header', () => {
+    renderComponent();
+    expect(screen.getByText('Input Index')).to.be.visible;
+  });
+
+  it('renders the Code Equivalent toggle', () => {
+    renderComponent();
+    expect(screen.getByLabelText('Toggle Code Equivalent')).to.be.visible;
+  });
+
+  it('renders the Show me covered queries button', () => {
+    renderComponent();
+    expect(screen.getByText('Show me covered queries')).to.be.visible;
+  });
+
+  it('renders the Covered Queries header', () => {
+    renderComponent();
+    expect(screen.getByText('Covered Queries')).to.be.visible;
+  });
+
+  it('renders the provided createIndexFieldsComponent', () => {
+    const mockComponent = (
+      <div data-testid="mock-component">Mock Component</div>
+    );
+    renderComponent(mockComponent);
+    expect(screen.getByTestId('mock-component')).to.be.visible;
+  });
+
+  it('renders the covered queries examples', () => {
+    renderComponent();
+    expect(screen.getByTestId('index-flow-section-covered-queries-examples')).to
+      .exist;
+  });
+
+  it('renders the optimal query examples', () => {
+    renderComponent();
+    expect(screen.getByTestId('index-flow-section-optimal-query-examples')).to
+      .exist;
+  });
+
+  it('renders the Learn More link', () => {
+    renderComponent();
+    const link = screen.getByText('Learn More');
+    expect(link).to.be.visible;
+  });
+});