Merge branch 'main' into COMPASS-9448-diagram-json-export

mabaasit · web-flow · commit 8c5c14d6b169 · 2025-06-24T10:56:16.000+02:00
diff --git a/AUTHORS b/AUTHORS
@@ -105,3 +105,4 @@ Ruby Dong <ruby.dong@mongodb.com>
 Neal Beeken <neal.beeken@mongodb.com>
 Walter Tan <waltertan12@users.noreply.github.com>
 Raymond Lo <ooorayray@gmail.com>
+Moses Yang <moses_yang@brown.edu>
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 Mon Jun 23 2025.
+This document was automatically generated on Tue Jun 24 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 Mon, Jun 23, 2025
+Generated on Tue, Jun 24, 2025
 
 ## Table of Contents
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-aggregations/src/components/add-stage/add-stage.spec.tsx b/packages/compass-aggregations/src/components/add-stage/add-stage.spec.tsx
@@ -23,7 +23,7 @@ describe('AddStage', function () {
       renderAddStage({ variant: 'icon' });
       const button = screen.getByTestId('add-stage-icon-button');
       expect(() => {
-        within(button).getByText('Add Stage');
+        within(button).getByText('Add stage');
       }).to.throw;
     });
 
@@ -41,7 +41,7 @@ describe('AddStage', function () {
     it('renders text button', function () {
       renderAddStage({ variant: 'button' });
       const button = screen.getByTestId('add-stage');
-      expect(within(button).getByText('Add Stage')).to.exist;
+      expect(within(button).getByText('Add stage')).to.exist;
     });
 
     it('renders help link when stage is not last', function () {
diff --git a/packages/compass-aggregations/src/components/add-stage/add-stage.tsx b/packages/compass-aggregations/src/components/add-stage/add-stage.tsx
@@ -42,7 +42,7 @@ export const AddStage = ({ onAddStage, variant }: AddStageProps) => {
             variant="primary"
             leftGlyph={<Icon glyph="Plus"></Icon>}
           >
-            Add Stage
+            Add stage
           </Button>
 
           <div className={linkContainerStyles}>
diff --git a/packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-builder-ui-workspace/index.spec.tsx b/packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-builder-ui-workspace/index.spec.tsx
@@ -36,7 +36,7 @@ describe('PipelineBuilderUIWorkspace [Component]', function () {
       await renderPipelineBuilderUIWorkspace();
       const buttons = screen.getAllByTestId('add-stage');
       expect(buttons.length).to.equal(1);
-      expect(buttons[0]).to.have.text('Add Stage');
+      expect(buttons[0]).to.have.text('Add stage');
     });
 
     it('adds a stage to the start of pipeline when first icon button is clicked', async function () {
@@ -95,7 +95,7 @@ describe('PipelineBuilderUIWorkspace [Component]', function () {
       await renderPipelineBuilderUIWorkspace({}, { pipeline: [] });
       const button = screen.getByTestId('add-stage');
       expect(button).to.exist;
-      expect(button).to.have.text('Add Stage');
+      expect(button).to.have.text('Add stage');
     });
 
     it('adds a stage when (text) button is clicked', async function () {
diff --git a/packages/compass-crud/src/components/document-list.tsx b/packages/compass-crud/src/components/document-list.tsx
@@ -447,7 +447,7 @@ const DocumentList: React.FunctionComponent<DocumentListProps> = (props) => {
                         variant="primary"
                         size="small"
                       >
-                        Import Data
+                        Import data
                       </Button>
                     )
                   }
diff --git a/packages/compass-schema-validation/src/components/validation-states.tsx b/packages/compass-schema-validation/src/components/validation-states.tsx
@@ -264,7 +264,7 @@ export function ValidationStates({
                     variant={ButtonVariant.PrimaryOutline}
                     size="small"
                   >
-                    Add Rule
+                    Add rule
                   </Button>
                 </div>
               }
diff --git a/packages/compass-schema/src/components/compass-schema.tsx b/packages/compass-schema/src/components/compass-schema.tsx
@@ -269,7 +269,7 @@ const InitialScreen: React.FunctionComponent<{
           variant="primary"
           size="small"
         >
-          Analyze Schema
+          Analyze schema
         </Button>
       }
       callToActionLink={
diff --git a/packages/compass-web/sandbox/sandbox-logger.ts b/packages/compass-web/sandbox/sandbox-logger.ts
@@ -1,5 +1,5 @@
 import createDebug from 'debug';
-import type { LogMessage } from '../src/logger-and-telemetry';
+import type { LogMessage } from '../src/logger';
 
 const logging: LogMessage[] = ((globalThis as any).logging = []);
 
diff --git a/packages/compass-web/src/entrypoint.tsx b/packages/compass-web/src/entrypoint.tsx
@@ -51,18 +51,19 @@ import { TelemetryProvider } from '@mongodb-js/compass-telemetry/provider';
 import CompassConnections from '@mongodb-js/compass-connections';
 import { AtlasCloudConnectionStorageProvider } from './connection-storage';
 import { AtlasCloudAuthServiceProvider } from './atlas-auth-service';
-import type {
-  TrackFunction,
-  LogFunction,
-  DebugFunction,
-} from './logger-and-telemetry';
-import { useCompassWebLoggerAndTelemetry } from './logger-and-telemetry';
+import type { LogFunction, DebugFunction } from './logger';
+import { useCompassWebLogger } from './logger';
 import { type TelemetryServiceOptions } from '@mongodb-js/compass-telemetry';
 import { WebWorkspaceTab as WelcomeWorkspaceTab } from '@mongodb-js/compass-welcome';
 import { useCompassWebPreferences } from './preferences';
 import { WorkspaceTab as DataModelingWorkspace } from '@mongodb-js/compass-data-modeling';
 import { DataModelStorageServiceProviderInMemory } from '@mongodb-js/compass-data-modeling/web';
 
+export type TrackFunction = (
+  event: string,
+  properties: Record<string, any>
+) => void;
+
 const WithAtlasProviders: React.FC = ({ children }) => {
   return (
     <AtlasCloudAuthServiceProvider>
@@ -269,7 +270,7 @@ const CompassWeb = ({
   onFailToLoadConnections,
 }: CompassWebProps) => {
   const appRegistry = useRef(new AppRegistry());
-  const logger = useCompassWebLoggerAndTelemetry({
+  const logger = useCompassWebLogger({
     onLog,
     onDebug,
   });
@@ -285,6 +286,7 @@ const CompassWeb = ({
       : initialAutoconnectId ?? undefined;
 
   const onTrackRef = useRef(onTrack);
+  onTrackRef.current = onTrack;
 
   const telemetryOptions = useRef<TelemetryServiceOptions>({
     sendTrack: (event: string, properties: Record<string, any> | undefined) => {
diff --git a/packages/compass-web/src/logger.spec.tsx b/packages/compass-web/src/logger.spec.tsx
@@ -4,27 +4,22 @@ import {
   LoggerProvider,
   useLogger,
 } from '@mongodb-js/compass-logging/provider';
-import type {
-  DebugFunction,
-  LogFunction,
-  TrackFunction,
-} from './logger-and-telemetry';
-import { useCompassWebLoggerAndTelemetry } from './logger-and-telemetry';
-import { renderHook, cleanup } from '@mongodb-js/testing-library-compass';
+import type { DebugFunction, LogFunction } from './logger';
+import { useCompassWebLogger } from './logger';
+import { renderHook } from '@mongodb-js/testing-library-compass';
 import Sinon from 'sinon';
 import { expect } from 'chai';
 
-describe('useCompassWebLoggerAndTelemetry', function () {
-  function renderLoggerAndTelemetryHook({
+describe('useCompassWebLogger', function () {
+  function renderLoggerHook({
     onDebug,
     onLog,
   }: {
-    onTrack?: TrackFunction;
     onDebug?: DebugFunction;
     onLog?: LogFunction;
   } = {}) {
     const Wrapper: React.FunctionComponent = ({ children }) => {
-      const logger = useCompassWebLoggerAndTelemetry({
+      const logger = useCompassWebLogger({
         onDebug,
         onLog,
       });
@@ -39,20 +34,17 @@ describe('useCompassWebLoggerAndTelemetry', function () {
     );
   }
 
-  beforeEach(cleanup);
-
   it('should call callback props when logger is called', function () {
     const logs: any[] = [];
     const onLog = Sinon.stub().callsFake((entry) => logs.push(entry));
-    const onTrack = Sinon.stub();
     const onDebug = Sinon.stub();
 
     const {
-      result: { current: loggerAndTelemetry },
-    } = renderLoggerAndTelemetryHook({ onLog, onTrack, onDebug });
+      result: { current: logger },
+    } = renderLoggerHook({ onLog, onDebug });
 
-    loggerAndTelemetry.debug('foo bar');
-    loggerAndTelemetry.log.info(mongoLogId(123), 'Ctx', 'msg', { attr: 1 });
+    logger.debug('foo bar');
+    logger.log.info(mongoLogId(123), 'Ctx', 'msg', { attr: 1 });
 
     expect(onDebug).to.have.been.calledOnceWith('TEST', 'foo bar');
     expect(logs).to.deep.equal([
diff --git a/packages/compass-web/src/logger.tsx b/packages/compass-web/src/logger.tsx
@@ -4,11 +4,6 @@ import { PassThrough } from 'stream';
 import { mongoLogId } from '@mongodb-js/compass-logging/provider';
 import { useRef } from 'react';
 
-export type TrackFunction = (
-  event: string,
-  properties: Record<string, any>
-) => void;
-
 export type LogMessage = {
   id: number;
   t: { $date: string };
@@ -53,7 +48,7 @@ function createCompassWebDebugger(
   );
 }
 
-export class CompassWebLoggerAndTelemetry implements Logger {
+export class CompassWebLogger implements Logger {
   log: Logger['log'];
 
   debug: Debugger;
@@ -81,19 +76,19 @@ export class CompassWebLoggerAndTelemetry implements Logger {
   mongoLogId = mongoLogId;
 
   createLogger = (component: string): Logger => {
-    return new CompassWebLoggerAndTelemetry(component, this.callbackRef);
+    return new CompassWebLogger(component, this.callbackRef);
   };
 }
 
-export function useCompassWebLoggerAndTelemetry(callbacks: {
+export function useCompassWebLogger(callbacks: {
   onLog?: LogFunction;
   onDebug?: DebugFunction;
-}): CompassWebLoggerAndTelemetry {
+}): CompassWebLogger {
   const callbackRef = useRef(callbacks);
   callbackRef.current = callbacks;
-  const loggerAndTelemetryRef = useRef<CompassWebLoggerAndTelemetry>();
+  const loggerAndTelemetryRef = useRef<CompassWebLogger>();
   if (!loggerAndTelemetryRef.current) {
-    loggerAndTelemetryRef.current = new CompassWebLoggerAndTelemetry(
+    loggerAndTelemetryRef.current = new CompassWebLogger(
       'COMPASS-WEB',
       callbackRef
     );

-Original file line number
+Diff line change
 Neal Beeken <[email protected]>
 Walter Tan <[email protected]>
 Raymond Lo <[email protected]>
 +Moses Yang <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export const AddStage = ({ onAddStage, variant }: AddStageProps) => {`
`42`	`42`	`variant="primary"`
`43`	`43`	`leftGlyph={<Icon glyph="Plus"></Icon>}`
`44`	`44`	`>`
`45`		`- Add Stage`
	`45`	`+ Add stage`
`46`	`46`	`</Button>`
`47`	`47`
`48`	`48`	`<div className={linkContainerStyles}>`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ const DocumentList: React.FunctionComponent<DocumentListProps> = (props) => {`
`447`	`447`	`variant="primary"`
`448`	`448`	`size="small"`
`449`	`449`	`>`
`450`		`- Import Data`
	`450`	`+ Import data`
`451`	`451`	`</Button>`
`452`	`452`	`)`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ export function ValidationStates({`
`264`	`264`	`variant={ButtonVariant.PrimaryOutline}`
`265`	`265`	`size="small"`
`266`	`266`	`>`
`267`		`- Add Rule`
	`267`	`+ Add rule`
`268`	`268`	`</Button>`
`269`	`269`	`</div>`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ const InitialScreen: React.FunctionComponent<{`
`269`	`269`	`variant="primary"`
`270`	`270`	`size="small"`
`271`	`271`	`>`
`272`		`- Analyze Schema`
	`272`	`+ Analyze schema`
`273`	`273`	`</Button>`
`274`	`274`	`}`
`275`	`275`	`callToActionLink={`