Merge remote-tracking branch 'origin/main' into COMPASS-9610-portal-drawer

Author: gribnoysup

docs/tracking-plan.md

@@ -77,6 +77,9 @@ Generated on Thu, Jul 24, 2025
 
 - [Data Modeling Diagram Created](#event--DataModelingDiagramCreated)
 - [Data Modeling Diagram Exported](#event--DataModelingDiagramExported)
+- [Data Modeling Relationship Added](#event--DataModelingDiagramRelationshipAdded)
+- [Data Modeling Relationship Form Opened](#event--DataModelingDiagramRelationshipEdited)
+- [Data Modeling Relationship Deleted](#event--DataModelingDiagramRelationshipDeleted)
 
 ### Database / Collection List
 
@@ -1006,6 +1009,34 @@ This event is fired when user exports data modeling diagram.
 - **format** (required): `"json" | "png"`
 - **is_compass_web** (optional): `true | undefined`
 
+<a name="event--DataModelingDiagramRelationshipAdded"></a>
+
+### Data Modeling Relationship Added
+
+This event is fired when user adds a new relationship to a data modeling diagram.
+
+**Properties**:
+
+- **num_relationships** (required): `number`
+- **is_compass_web** (optional): `true | undefined`
+
+<a name="event--DataModelingDiagramRelationshipEdited"></a>
+
+### Data Modeling Relationship Form Opened
+
+This event is fired when user edits a relationship in a data modeling diagram.
+
+<a name="event--DataModelingDiagramRelationshipDeleted"></a>
+
+### Data Modeling Relationship Deleted
+
+This event is fired when user deletes a relationship from a data modeling diagram.
+
+**Properties**:
+
+- **num_relationships** (required): `number`
+- **is_compass_web** (optional): `true | undefined`
+
 ## Database / Collection List
 
 <a name="event--CollectionCreatedEvent"></a>

packages/compass-components/src/components/accordion.spec.tsx

@@ -1,12 +1,7 @@
 import React from 'react';
 import { expect } from 'chai';
 
-import {
-  fireEvent,
-  render,
-  screen,
-  cleanup,
-} from '@mongodb-js/testing-library-compass';
+import { userEvent, render, screen } from '@mongodb-js/testing-library-compass';
 
 import { Accordion } from './accordion';
 
@@ -21,25 +16,36 @@ function renderAccordion(
 }
 
 describe('Accordion Component', function () {
-  afterEach(cleanup);
-
   it('should open the accordion on click', function () {
     renderAccordion();
 
     expect(screen.getByTestId('my-test-id')).to.exist;
     const button = screen.getByText('Accordion Test');
-    fireEvent.click(button);
+    userEvent.click(button);
+    expect(screen.getByText('Hello World')).to.be.visible;
+  });
+
+  it('should close the accordion on click - default open', function () {
+    renderAccordion({
+      defaultOpen: true,
+    });
+
+    expect(screen.getByTestId('my-test-id')).to.exist;
+    const button = screen.getByText('Accordion Test');
     expect(screen.getByText('Hello World')).to.be.visible;
+    userEvent.click(button);
+
+    expect(screen.queryByText('Hello World')).not.to.exist;
   });
 
   it('should close the accordion after clicking to open then close', function () {
     renderAccordion();
 
     expect(screen.getByTestId('my-test-id')).to.exist;
     const button = screen.getByText('Accordion Test');
-    fireEvent.click(button);
+    userEvent.click(button);
     expect(screen.getByText('Hello World')).to.be.visible;
-    fireEvent.click(button);
+    userEvent.click(button);
     expect(screen.queryByText('Hello World')).to.not.exist;
   });
 

packages/compass-components/src/components/accordion.tsx

@@ -50,18 +50,22 @@ const buttonHintStyles = css({
 interface AccordionProps extends React.HTMLProps<HTMLButtonElement> {
   text: string | React.ReactNode;
   hintText?: string;
+  textClassName?: string;
   open?: boolean;
+  defaultOpen?: boolean;
   setOpen?: (newValue: boolean) => void;
 }
 function Accordion({
   text,
   hintText,
+  textClassName,
   open: _open,
   setOpen: _setOpen,
+  defaultOpen = false,
   ...props
 }: React.PropsWithChildren<AccordionProps>): React.ReactElement {
   const darkMode = useDarkMode();
-  const [localOpen, setLocalOpen] = useState(_open ?? false);
+  const [localOpen, setLocalOpen] = useState(_open ?? defaultOpen);
   const setOpenRef = useRef(_setOpen);
   setOpenRef.current = _setOpen;
   const onOpenChange = useCallback(() => {
@@ -80,7 +84,8 @@ function Accordion({
         {...props}
         className={cx(
           darkMode ? buttonDarkThemeStyles : buttonLightThemeStyles,
-          buttonStyles
+          buttonStyles,
+          textClassName
         )}
         id={labelId}
         type="button"

packages/compass-data-modeling/src/components/diagram-editor-side-panel.spec.tsx

@@ -17,7 +17,10 @@ import {
   selectRelationship,
 } from '../store/diagram';
 import dataModel from '../../test/fixtures/data-model-with-relationships.json';
-import type { MongoDBDataModelDescription } from '../services/data-model-storage';
+import type {
+  MongoDBDataModelDescription,
+  Relationship,
+} from '../services/data-model-storage';
 
 async function comboboxSelectItem(
   label: string,
@@ -67,7 +70,37 @@ describe('DiagramEditorSidePanel', function () {
     result.plugin.store.dispatch(
       selectRelationship('204b1fc0-601f-4d62-bba3-38fade71e049')
     );
-    expect(screen.getByText('Edit Relationship')).to.be.visible;
+
+    const name = screen.getByLabelText('Name');
+    expect(name).to.be.visible;
+    expect(name).to.have.value('Airport Country');
+
+    const localCollectionInput = screen.getByLabelText('Local collection');
+    expect(localCollectionInput).to.be.visible;
+    expect(localCollectionInput).to.have.value('countries');
+
+    const foreignCollectionInput = screen.getByLabelText('Foreign collection');
+    expect(foreignCollectionInput).to.be.visible;
+    expect(foreignCollectionInput).to.have.value('airports');
+
+    const localFieldInput = screen.getByLabelText('Local field');
+    expect(localFieldInput).to.be.visible;
+    expect(localFieldInput).to.have.value('name');
+
+    const foreignFieldInput = screen.getByLabelText('Foreign field');
+    expect(foreignFieldInput).to.be.visible;
+    expect(foreignFieldInput).to.have.value('Country');
+
+    const localCardinalityInput = screen.getByLabelText('Local cardinality');
+    expect(localCardinalityInput).to.be.visible;
+    expect(localCardinalityInput).to.have.value('1');
+
+    const foreignCardinalityInput = screen.getByLabelText(
+      'Foreign cardinality'
+    );
+    expect(foreignCardinalityInput).to.be.visible;
+    expect(foreignCardinalityInput).to.have.value('100');
+
     expect(
       document.querySelector(
         '[data-relationship-id="204b1fc0-601f-4d62-bba3-38fade71e049"]'
@@ -120,7 +153,7 @@ describe('DiagramEditorSidePanel', function () {
     userEvent.click(
       within(relationshipCard!).getByRole('button', { name: 'Edit' })
     );
-    expect(screen.getByText('Edit Relationship')).to.be.visible;
+    expect(screen.getByLabelText('Local field')).to.be.visible;
 
     // Select new values
     await comboboxSelectItem('Local collection', 'planes');
@@ -133,7 +166,7 @@ describe('DiagramEditorSidePanel', function () {
     // model here
     const modifiedRelationship = selectCurrentModel(
       getCurrentDiagramFromState(result.plugin.store.getState()).edits
-    ).relationships.find((r) => {
+    ).relationships.find((r: Relationship) => {
       return r.id === '204b1fc0-601f-4d62-bba3-38fade71e049';
     });
 
@@ -148,7 +181,7 @@ describe('DiagramEditorSidePanel', function () {
         {
           ns: 'flights.countries',
           fields: ['iso_code'],
-          cardinality: 1,
+          cardinality: 100,
         },
       ]);
   });