Merge branch 'main' of github.com:mongodb-js/compass into CLOUDP-333851/mock-data-gen-disclaimer

Author: jcobis

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 Aug 18 2025.
+This document was automatically generated on Thu Aug 21 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, Aug 18, 2025
+Generated on Thu, Aug 21, 2025
 
 ## Table of Contents
 

package-lock.json

@@ -88,7 +88,6 @@
     "mongodb-ns": "^2.4.2",
     "mongodb-query-parser": "^4.3.0",
     "mongodb-schema": "^12.6.2",
-    "prop-types": "^15.7.2",
     "re-resizable": "^6.9.0",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",

packages/compass-aggregations/package.json

@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Badge, BadgeVariant, css } from '@mongodb-js/compass-components';
 
 const modifySourceBannerStyles = css({
@@ -26,8 +25,4 @@ const ModifySourceBanner = (props: { editViewName: string }) => {
   );
 };
 
-ModifySourceBanner.propTypes = {
-  editViewName: PropTypes.string.isRequired,
-};
-
 export default ModifySourceBanner;

packages/compass-aggregations/src/components/modify-source-banner/modify-source-banner.tsx

@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import {
   Banner,
   WorkspaceContainer,
@@ -83,33 +82,6 @@ class Pipeline extends PureComponent<
 > {
   static displayName = 'PipelineComponent';
 
-  static propTypes = {
-    saveCurrentPipeline: PropTypes.func.isRequired,
-    clonePipeline: PropTypes.func.isRequired,
-    isCommenting: PropTypes.bool.isRequired,
-    name: PropTypes.string,
-    dismissViewError: PropTypes.func.isRequired,
-    updateViewError: PropTypes.string,
-    settings: PropTypes.object.isRequired,
-    toggleSettingsIsExpanded: PropTypes.func.isRequired,
-    toggleSettingsIsCommentMode: PropTypes.func.isRequired,
-    setSettingsSampleSize: PropTypes.func.isRequired,
-    setSettingsLimit: PropTypes.func.isRequired,
-    limit: PropTypes.number.isRequired,
-    largeLimit: PropTypes.number.isRequired,
-    maxTimeMS: PropTypes.number,
-    applySettings: PropTypes.func.isRequired,
-    savingPipelineNameChanged: PropTypes.func.isRequired,
-    savingPipelineApply: PropTypes.func.isRequired,
-    savingPipelineCancel: PropTypes.func.isRequired,
-    savingPipeline: PropTypes.object.isRequired,
-    workspace: PropTypes.string.isRequired,
-    showExportButton: PropTypes.bool.isRequired,
-    showRunButton: PropTypes.bool.isRequired,
-    showExplainButton: PropTypes.bool.isRequired,
-    enableSearchActivationProgramP1: PropTypes.bool.isRequired,
-  };
-
   static defaultProps = {
     maxTimeMS: DEFAULT_MAX_TIME_MS,
     limit: DEFAULT_SAMPLE_SIZE,

packages/compass-aggregations/src/components/pipeline/pipeline.tsx

@@ -1,6 +1,5 @@
 import type { ChangeEvent } from 'react';
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { FormModal, TextInput } from '@mongodb-js/compass-components';
 import type { TrackFunction } from '@mongodb-js/compass-telemetry';
 import { withTelemetry } from '@mongodb-js/compass-telemetry/provider';
@@ -23,17 +22,6 @@ export interface SavingPipelineModalProps {
 class SavingPipelineModal extends PureComponent<SavingPipelineModalProps> {
   static displayName = 'SavingPipelineModalComponent';
 
-  static propTypes = {
-    isOpen: PropTypes.bool.isRequired,
-    isSaveAs: PropTypes.bool.isRequired,
-    name: PropTypes.string.isRequired,
-    savingPipelineCancel: PropTypes.func.isRequired,
-    savingPipelineApply: PropTypes.func.isRequired,
-    savingPipelineNameChanged: PropTypes.func.isRequired,
-    saveCurrentPipeline: PropTypes.func.isRequired,
-    clonePipeline: PropTypes.func.isRequired,
-  };
-
   componentDidUpdate(prevProps: SavingPipelineModalProps) {
     if (prevProps.isOpen !== this.props.isOpen && this.props.isOpen) {
       this.props.track('Screen', { name: 'save_pipeline_modal' }, undefined);

packages/compass-aggregations/src/components/saving-pipeline-modal/saving-pipeline-modal.tsx

@@ -2,11 +2,11 @@ import React from 'react';
 import { render, screen, userEvent } from '@mongodb-js/testing-library-compass';
 import { AssistantChat } from './assistant-chat';
 import { expect } from 'chai';
-import type { UIMessage } from './@ai-sdk/react/use-chat';
 import { createMockChat } from '../test/utils';
+import type { AssistantMessage } from './compass-assistant-provider';
 
 describe('AssistantChat', function () {
-  const mockMessages: UIMessage[] = [
+  const mockMessages: AssistantMessage[] = [
     {
       id: 'user',
       role: 'user',
@@ -24,7 +24,7 @@ describe('AssistantChat', function () {
     },
   ];
 
-  function renderWithChat(messages: UIMessage[]) {
+  function renderWithChat(messages: AssistantMessage[]) {
     const chat = createMockChat({ messages });
     return {
       result: render(<AssistantChat chat={chat} />),
@@ -181,7 +181,7 @@ describe('AssistantChat', function () {
   });
 
   it('handles messages with multiple text parts', function () {
-    const messagesWithMultipleParts: UIMessage[] = [
+    const messagesWithMultipleParts: AssistantMessage[] = [
       {
         id: '1',
         role: 'assistant',
@@ -198,7 +198,7 @@ describe('AssistantChat', function () {
   });
 
   it('handles messages with mixed part types (filters to text only)', function () {
-    const messagesWithMixedParts: UIMessage[] = [
+    const messagesWithMixedParts: AssistantMessage[] = [
       {
         id: '1',
         role: 'assistant',
@@ -217,4 +217,33 @@ describe('AssistantChat', function () {
       .exist;
     expect(screen.queryByText('This should be filtered out.')).to.not.exist;
   });
+
+  it('displays displayText instead of message parts when displayText is set', function () {
+    const messagesWithDisplayText: AssistantMessage[] = [
+      {
+        id: '1',
+        role: 'assistant',
+        parts: [
+          { type: 'text', text: 'This message part should be ignored.' },
+          { type: 'text', text: 'Another part that should not display.' },
+        ],
+        metadata: {
+          displayText: 'This is the custom display text that should show.',
+        },
+      },
+    ];
+
+    renderWithChat(messagesWithDisplayText);
+
+    // Should display the displayText
+    expect(
+      screen.getByText('This is the custom display text that should show.')
+    ).to.exist;
+
+    // Should NOT display the message parts
+    expect(screen.queryByText('This message part should be ignored.')).to.not
+      .exist;
+    expect(screen.queryByText('Another part that should not display.')).to.not
+      .exist;
+  });
 });

packages/compass-assistant/src/assistant-chat.spec.tsx

@@ -1,10 +1,10 @@
 import React, { useCallback, useState } from 'react';
-import type { UIMessage } from './@ai-sdk/react/use-chat';
+import type { AssistantMessage } from './compass-assistant-provider';
 import type { Chat } from './@ai-sdk/react/chat-react';
 import { useChat } from './@ai-sdk/react/use-chat';
 
 interface AssistantChatProps {
-  chat: Chat<UIMessage>;
+  chat: Chat<AssistantMessage>;
 }
 
 /**
@@ -69,10 +69,12 @@ export const AssistantChat: React.FunctionComponent<AssistantChatProps> = ({
               whiteSpace: 'pre-wrap',
             }}
           >
-            {message.parts
-              ?.filter((part) => part.type === 'text')
-              .map((part) => part.text)
-              .join('') || ''}
+            {message.metadata?.displayText ||
+              message.parts
+                ?.filter((part) => part.type === 'text')
+                .map((part) => part.text)
+                .join('') ||
+              ''}
           </div>
         ))}
       </div>

packages/compass-assistant/src/assistant-chat.tsx

@@ -8,10 +8,10 @@ import {
 import {
   AssistantProvider,
   CompassAssistantProvider,
+  type AssistantMessage,
 } from './compass-assistant-provider';
 import { expect } from 'chai';
 import sinon from 'sinon';
-import type { UIMessage } from './@ai-sdk/react/use-chat';
 import { Chat } from './@ai-sdk/react/chat-react';
 
 import {
@@ -24,7 +24,7 @@ import { createMockChat } from '../test/utils';
 
 // Test component that renders AssistantProvider with children
 const TestComponent: React.FunctionComponent<{
-  chat: Chat<UIMessage>;
+  chat: Chat<AssistantMessage>;
   autoOpen?: boolean;
 }> = ({ chat, autoOpen }) => {
   return (
@@ -78,7 +78,7 @@ describe('AssistantProvider', function () {
     });
 
     async function renderOpenAssistantDrawer(
-      mockChat: Chat<UIMessage>
+      mockChat: Chat<AssistantMessage>
     ): Promise<ReturnType<typeof render>> {
       const result = render(<TestComponent chat={mockChat} autoOpen={true} />, {
         preferences: { enableAIAssistant: true },
@@ -92,7 +92,7 @@ describe('AssistantProvider', function () {
     }
 
     it('displays messages in the chat feed', async function () {
-      const mockMessages: UIMessage[] = [
+      const mockMessages: AssistantMessage[] = [
         {
           id: '1',
           role: 'user',
@@ -120,7 +120,7 @@ describe('AssistantProvider', function () {
     });
 
     it('handles message sending with custom chat when drawer is open', async function () {
-      const mockChat = new Chat<UIMessage>({
+      const mockChat = new Chat<AssistantMessage>({
         messages: [
           {
             id: 'assistant',
@@ -149,7 +149,7 @@ describe('AssistantProvider', function () {
     });
 
     it('new messages are added to the chat feed when the send button is clicked', async function () {
-      const mockChat = new Chat<UIMessage>({
+      const mockChat = new Chat<AssistantMessage>({
         messages: [
           {
             id: 'assistant',