Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

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 Sun Nov 26 2023.
+This document was automatically generated on Wed Nov 29 2023.
 
 ## List of dependencies
 

package-lock.json

@@ -101,6 +101,14 @@ export class AtlasService {
     this.emitter.off(evt, listener);
     return this;
   }
+  removeListener<T extends keyof AtlasServiceEvents>(
+    evt: T,
+    listener: (...args: AtlasServiceEvents[T]) => void
+  ): this;
+  removeListener(evt: string, listener: (...args: any[]) => void): this {
+    this.emitter.off(evt, listener);
+    return this;
+  }
 
   emit<T extends keyof AtlasServiceEvents>(
     evt: T,

packages/atlas-service/src/renderer.ts

@@ -64,6 +64,7 @@
     "@dnd-kit/core": "^6.0.7",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@mongodb-js/compass-collection": "^4.19.1",
     "@mongodb-js/eslint-config-compass": "^1.0.11",
     "@mongodb-js/mocha-config-compass": "^1.3.2",
     "@mongodb-js/prettier-config-compass": "^1.0.1",

packages/compass-aggregations/package.json

@@ -2,13 +2,12 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { expect } from 'chai';
 
-import Aggregations from '../aggregations';
+import Aggregations from '.';
 import configureStore from '../../../test/configure-store';
-import styles from './aggregations.module.less';
 import { Provider } from 'react-redux';
 
 describe('Aggregations [Component]', function () {
-  let component;
+  let component: ReturnType<typeof mount> | null;
 
   beforeEach(function () {
     component = mount(
@@ -23,11 +22,11 @@ describe('Aggregations [Component]', function () {
   });
 
   afterEach(function () {
-    component.unmount();
+    component?.unmount();
     component = null;
   });
 
   it('renders the correct root classname', function () {
-    expect(component.find(`.${styles.aggregations}`)).to.be.present();
+    expect(component?.find(`[data-testid="compass-aggregations"]`)).exist;
   });
 });

…ations/src/components/add-stage/index.js …ations/src/components/add-stage/index.tspackages/compass-aggregations/src/components/add-stage/index.js renamed to packages/compass-aggregations/src/components/add-stage/index.ts packages/compass-aggregations/src/components/add-stage/index.js renamed to packages/compass-aggregations/src/components/add-stage/index.ts

@@ -14,26 +14,35 @@ import {
   savingPipelineNameChanged,
   savingPipelineApply,
   savingPipelineCancel,
-  savingPipelineOpen,
 } from '../../modules/saving-pipeline';
 import { dismissViewError } from '../../modules/update-view';
 
-import styles from './aggregations.module.less';
+import type { RootState } from '../../modules';
+import type { PipelineProps } from '../pipeline/pipeline';
+import { css, palette } from '@mongodb-js/compass-components';
+
+const aggregationsStyles = css({
+  display: 'flex',
+  alignItems: 'flex-start',
+  backgroundColor: palette.gray.light3,
+  position: 'relative',
+  width: '100%',
+  zIndex: 0,
+  height: '100%',
+});
 
 /**
  * The core aggregations component.
  */
-class Aggregations extends Component {
+class Aggregations extends Component<PipelineProps> {
   static displayName = 'AggregationsComponent';
 
   /**
    * Render Aggregations component.
-   *
-   * @returns {React.Component} The rendered component.
    */
   render() {
     return (
-      <div className={styles.aggregations}>
+      <div className={aggregationsStyles} data-testid="compass-aggregations">
         <Pipeline {...this.props} />
       </div>
     );
@@ -47,7 +56,7 @@ class Aggregations extends Component {
  *
  * @returns {Object} The mapped properties.
  */
-const mapStateToProps = (state) => ({
+const mapStateToProps = (state: RootState) => ({
   namespace: state.namespace,
   name: state.name,
   collationString: state.collationString,
@@ -77,7 +86,6 @@ const MappedAggregations = connect(mapStateToProps, {
   savingPipelineNameChanged,
   savingPipelineApply,
   savingPipelineCancel,
-  savingPipelineOpen,
   dismissViewError,
 })(Aggregations);
 

packages/compass-aggregations/src/components/aggregations/aggregations.module.less

@@ -22,21 +22,21 @@ const renderFocusMode = () => {
 describe('FocusMode', function () {
   it('does not show modal when closed', function () {
     const store = renderFocusMode();
-    store.dispatch(disableFocusMode());
+    store.dispatch(disableFocusMode() as any);
     expect(() => {
       screen.getByTestId('focus-mode-modal');
     }).to.throw;
   });
 
   it('shows modal when open', function () {
     const store = renderFocusMode();
-    store.dispatch(enableFocusMode(0));
+    store.dispatch(enableFocusMode(0) as any);
     expect(screen.getByTestId('focus-mode-modal')).to.exist;
   });
 
   it('hides modal when close button is clicked', function () {
     const store = renderFocusMode();
-    store.dispatch(enableFocusMode(0));
+    store.dispatch(enableFocusMode(0) as any);
     screen.getByLabelText(/close modal/i).click();
 
     expect(() => {