Merge branch 'main' into 1.32-releases

Author: mcasimir

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Mon Jul 18 2022.
+This document was automatically generated on Sun Jul 24 2022.
 
 ## List of dependencies
 

package-lock.json

@@ -20,7 +20,7 @@
     "webpack": "webpack-compass",
     "start": "npm run webpack serve -- --mode development",
     "analyze": "npm run webpack -- --mode production --analyze",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "depcheck": "compass-scripts check-peer-deps && depcheck",
     "eslint": "eslint",
     "lint": "npm run eslint .",

packages/compass-aggregations/package.json

@@ -55,7 +55,8 @@ class PipelineWorkspace extends PureComponent {
     isOverviewOn: PropTypes.bool.isRequired,
     projections: PropTypes.array.isRequired,
     projectionsChanged: PropTypes.func.isRequired,
-    newPipelineFromPaste: PropTypes.func.isRequired
+    newPipelineFromPaste: PropTypes.func.isRequired,
+    isAtlasDeployed: PropTypes.bool
   };
 
   /**
@@ -132,6 +133,7 @@ class PipelineWorkspace extends PureComponent {
       projections={this.props.projections}
       projectionsChanged={this.props.projectionsChanged}
       newPipelineFromPaste={this.props.newPipelineFromPaste}
+      isAtlasDeployed={this.props.isAtlasDeployed}
     />);
   }
 

packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-builder-workspace.jsx

@@ -16,7 +16,6 @@ const renderPipelineExplain = (
       isModalOpen={true}
       onCancelExplain={() => {}}
       onCloseModal={() => {}}
-      onRunExplain={() => {}}
       {...props}
     />
   );
@@ -33,7 +32,7 @@ describe('PipelineExplain', function () {
     expect(within(modal).getByTestId('pipeline-explain-cancel')).to.exist;
     expect(onCancelExplainSpy.callCount).to.equal(0);
 
-    userEvent.click(within(modal).getByText(/cancel/gi), null, {
+    userEvent.click(within(modal).getByText(/cancel/gi), undefined, {
       skipPointerEventsCheck: true,
     });
     expect(onCancelExplainSpy.callCount).to.equal(1);

packages/compass-aggregations/src/components/pipeline-explain/index.spec.tsx

@@ -78,7 +78,7 @@ describe('PipelineToolbar', function () {
       expect(
         within(settings)
           .getByTestId('pipeline-name')
-          .textContent.trim()
+          ?.textContent?.trim()
           .toLowerCase(),
         'shows untitled as default name'
       ).to.equal('untitled');

packages/compass-aggregations/src/components/pipeline-toolbar/index.spec.tsx

@@ -68,7 +68,7 @@ describe('PipelineActions', function () {
     it('calls onToggleOptions on click', function () {
       const button = screen.getByTestId('pipeline-toolbar-options-button');
       expect(button).to.exist;
-      expect(button.textContent.toLowerCase().trim()).to.equal('less options');
+      expect(button?.textContent?.toLowerCase().trim()).to.equal('less options');
       expect(within(button).getByLabelText('Caret Down Icon')).to.exist;
 
       userEvent.click(button);
@@ -101,7 +101,7 @@ describe('PipelineActions', function () {
     it('toggle options action button', function () {
       const button = screen.getByTestId('pipeline-toolbar-options-button');
       expect(button).to.exist;
-      expect(button.textContent.toLowerCase().trim()).to.equal('more options');
+      expect(button?.textContent?.toLowerCase().trim()).to.equal('more options');
       expect(within(button).getByLabelText('Caret Right Icon')).to.exist;
 
       userEvent.click(button);

packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/pipeline-actions.spec.tsx

@@ -7,7 +7,7 @@ import { PipelineName } from './pipeline-name';
 describe('PipelineName', function () {
   it('renders Untitled as default name', function () {
     render(<PipelineName name={''} isModified={false} />);
-    expect(screen.getByTestId('pipeline-name').textContent.trim()).to.equal(
+    expect(screen.getByTestId('pipeline-name')?.textContent?.trim()).to.equal(
       'Untitled'
     );
   });
@@ -17,14 +17,14 @@ describe('PipelineName', function () {
     expect(
       screen
         .getByTestId('pipeline-name')
-        .textContent.trim()
+        ?.textContent?.trim()
         .replace(/\u00a0/g, ' ')
     ).to.equal('Untitled – modified');
   });
 
   it('renders pipeline name', function () {
     render(<PipelineName name={'Hello'} isModified={false} />);
-    expect(screen.getByTestId('pipeline-name').textContent.trim()).to.equal(
+    expect(screen.getByTestId('pipeline-name')?.textContent?.trim()).to.equal(
       'Hello'
     );
   });
@@ -34,7 +34,7 @@ describe('PipelineName', function () {
     expect(
       screen
         .getByTestId('pipeline-name')
-        .textContent.trim()
+        ?.textContent?.trim()
         .replace(/\u00a0/g, ' ')
     ).to.equal('Name changed – modified');
   });

packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-settings/pipeline-name.spec.tsx

@@ -230,6 +230,7 @@ class Pipeline extends PureComponent {
         projections={this.props.projections}
         projectionsChanged={this.props.projectionsChanged}
         newPipelineFromPaste={this.props.newPipelineFromPaste}
+        isAtlasDeployed={this.props.isAtlasDeployed}
       />
     );
   }

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

@@ -1,8 +1,7 @@
-import { AtlasLogoMark, Body, Link } from '@mongodb-js/compass-components';
+import { AtlasLogoMark, Body, Link, Button } from '@mongodb-js/compass-components';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Document } from '@mongodb-js/compass-crud';
-import { TextButton } from 'hadron-react-buttons';
 import LoadingOverlay from '../loading-overlay';
 import { OUT, MERGE } from '../../modules/pipeline';
 import decomment from 'decomment';
@@ -29,10 +28,10 @@ class StagePreview extends Component {
     isComplete: PropTypes.bool.isRequired,
     // Can be undefined on the initial render
     isMissingAtlasOnlyStageSupport: PropTypes.bool,
-    openLink: PropTypes.func.isRequired,
     index: PropTypes.number.isRequired,
     stageOperator: PropTypes.string,
-    stage: PropTypes.string
+    stage: PropTypes.string,
+    isAtlasDeployed: PropTypes.bool
   }
 
   /**
@@ -57,14 +56,6 @@ class StagePreview extends Component {
     this.props.runOutStage(this.props.index);
   }
 
-  /**
-   * Called when the Atlas Signup CTA link is clicked.
-   */
-  onAtlasSignupCtaClicked = () => {
-    track('Atlas Link Clicked', { screen: 'agg_builder' });
-    this.props.openLink('https://www.mongodb.com/cloud/atlas/lp/search-1?utm_campaign=atlas_search&utm_source=compass&utm_medium=product&utm_content=v1');
-  }
-
   /**
    * If the stage operator is $merge we have special behaviour.
    *
@@ -98,6 +89,15 @@ class StagePreview extends Component {
           The $merge operator will cause the pipeline to persist the results to
           the specified location.
         </div>
+        {this.props.isAtlasDeployed && (
+          <Button
+            variant="primary"
+            data-testid="save-merge-documents"
+            onClick={this.onSaveDocuments}
+          >
+            Merge documents
+          </Button>
+        )}
       </div>
     );
   }
@@ -136,6 +136,15 @@ class StagePreview extends Component {
           the specified location (collection, S3, or Atlas). If the collection
           exists it will be replaced.
         </div>
+        {this.props.isAtlasDeployed && (
+          <Button
+            variant="primary"
+            data-testid="save-out-documents"
+            onClick={this.onSaveDocuments}
+          >
+            Save documents
+          </Button>
+        )}
       </Body>
     );
   }
@@ -149,17 +158,29 @@ class StagePreview extends Component {
   renderAtlasOnlyStagePreviewSection() {
     return (
       <div className={styles['stage-preview-missing-search-support']}>
-        <AtlasLogoMark size={30} className={styles['stage-preview-missing-search-support-icon']} />
-        <div data-test-id="stage-preview-missing-search-support" className={styles['stage-preview-missing-search-support-text']}>
-          This stage is only available with MongoDB Atlas.
-
-          Create a free cluster or connect to an Atlas cluster to build search indexes and use {this.props.stageOperator} aggregation stage to run fast, relevant search queries.
-        </div>
-        <TextButton
-          text="Create Free Cluster"
-          className="btn btn-xs btn-primary"
-          clickHandler={this.onAtlasSignupCtaClicked}
+        <AtlasLogoMark
+          size={30}
+          className={styles['stage-preview-missing-search-support-icon']}
         />
+        <div
+          data-test-id="stage-preview-missing-search-support"
+          className={styles['stage-preview-missing-search-support-text']}
+        >
+          This stage is only available with MongoDB Atlas. Create a free cluster
+          or connect to an Atlas cluster to build search indexes and use{' '}
+          {this.props.stageOperator} aggregation stage to run fast, relevant
+          search queries.
+        </div>
+        <Button
+          href="https://www.mongodb.com/cloud/atlas/lp/search-1?utm_campaign=atlas_search&utm_source=compass&utm_medium=product&utm_content=v1"
+          target="_blank"
+          onClick={() => {
+            track('Atlas Link Clicked', { screen: 'agg_builder' });
+          }}
+          variant="primary"
+        >
+          Create free cluster
+        </Button>
       </div>
     );
   }