Merge branch 'main' into 1.35-releases

Author: lerouxb

THIRD-PARTY-NOTICES.md

@@ -1,11 +1,11 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Tue Dec 06 2022.
+This document was automatically generated on Thu Dec 15 2022.
 
 ## List of dependencies
 
 Package|Version|License
 -------|-------|-------
-**[@mongosh/node-runtime-worker-thread](#15af2bd3c4e8ac5324529caabe5d302ad7a91ec05bc5e17e7dd3e24c7152de76)**|1.6.0|Apache-2.0
+**[@mongosh/node-runtime-worker-thread](#55b577e859dd7306c9d9c90bfb15989f6b79a9587706cd98be99f4cd5038c19a)**|1.6.1|Apache-2.0
 **[ansi-regex](#945d39147a145d6a28d87154006fa731c2e69d2a19e76cc7012624a1109f9317)**|2.1.1|MIT
 **[ansi-regex](#f4a8a360dfe3cdd0cbb8fcfa0cff23bb22eafa4225343577912ddf831d670411)**|3.0.0|MIT
 **[aproba](#b8b30f42274956b772cec4ea9f13cebaa5900724e514eaf0098a3ad6f1f7f16e)**|1.2.0|ISC
@@ -82,7 +82,7 @@ Package|Version|License
 **[simple-get](#c2c12990b6319daff653bdf953cadfa368185f0edc671124fb1028f6979df829)**|4.0.1|MIT
 **[simple-get](#ade55c33f4d681462bccf90b122b9e974e43632f78545b6d8dc845e7f185e5da)**|3.1.0|MIT
 **[smart-buffer](#bc8fbee089eb9cddf673c4c9dbc15edd13839063c27e2814009b6a0448065875)**|4.2.0|MIT
-**[socks](#d248334926a1dc960150cbe3b2ab15fa021e1b8b498cf04f0f32a9a876263e66)**|2.7.0|MIT
+**[socks](#16837d081453b731932951f203fc17778642c71f7cdc0c4557bc2dbd68a6fd1d)**|2.7.1|MIT
 **[string-width](#b0725207ba4a78809dec9436283671608c6a6c89b5f5cc66db6ce6da7bfb0cc0)**|1.0.2|MIT
 **[string-width](#e3ae6ddac7d522ef262f26fbded9f398d3642ba93321363b4634916ce1962b01)**|2.1.1|MIT
 **[strip-ansi](#79e4e45eb767932cbcc94ba2f18534155184857640dee665f4b43ae6d5294646)**|3.0.1|MIT
@@ -100,8 +100,8 @@ Package|Version|License
 
 ## Package details
 
-<a id="15af2bd3c4e8ac5324529caabe5d302ad7a91ec05bc5e17e7dd3e24c7152de76"></a>
-### [@mongosh/node-runtime-worker-thread](https://www.npmjs.com/package/@mongosh/node-runtime-worker-thread) (version 1.6.0)
+<a id="55b577e859dd7306c9d9c90bfb15989f6b79a9587706cd98be99f4cd5038c19a"></a>
+### [@mongosh/node-runtime-worker-thread](https://www.npmjs.com/package/@mongosh/node-runtime-worker-thread) (version 1.6.1)
 <!-- initially found at node_modules/@mongosh/node-runtime-worker-thread -->
 > MongoDB shell runtime that lives in a worker thread
 
@@ -4403,8 +4403,8 @@ Authors:
 * syvita
 
 
-<a id="d248334926a1dc960150cbe3b2ab15fa021e1b8b498cf04f0f32a9a876263e66"></a>
-### [socks](https://www.npmjs.com/package/socks) (version 2.7.0)
+<a id="16837d081453b731932951f203fc17778642c71f7cdc0c4557bc2dbd68a6fd1d"></a>
+### [socks](https://www.npmjs.com/package/socks) (version 2.7.1)
 <!-- initially found at node_modules/socks -->
 > Fully featured SOCKS proxy client supporting SOCKSv4, SOCKSv4a, and SOCKSv5. Includes Bind and Associate functionality.
 

package-lock.json

@@ -49,8 +49,7 @@ If you're interested in helping with the Aggregation Builder plugin, we'd be ove
 - [`<ExportToLanguage />`](https://github.com/mongodb-js/compass-export-to-language) Modal plugin that connects `<Aggregation />` to `bson-transpilers` [for actual compiling to another language](https://github.com/mongodb-js/bson-transpilers)
 - [`mongodb-js/stage-validator`](https://github.com/mongodb-js/stage-validator) Aggregation Pipeline Stage grammar.
 - [`bson-transpilers`](https://github.com/mongodb-js/bson-transpilers) Read the amazing: [Compiler in JavaScript using ANTLR](https://medium.com/dailyjs/compiler-in-javascript-using-antlr-9ec53fd2780f)
-- [`mongodb-js/ace-mode`](https://github.com/mongodb-js/ace-mode) MongoDB highlighting rules for ACE.
-- [`mongodb-js/ace-autocompleter`](https://github.com/mongodb-js/ace-autocompleter) Makes ACE autocompletion aware of MongoDB Aggregation Pipeline [operators, expressions, and fields](https://github.com/mongodb-js/ace-autocompleter/tree/master/lib/constants).
+- [`@mongodb-js/compass-editor`](https://github.com/mongodb-js/compass/tree/main/packages/compass-editor) Reusable Compass editor component based on ace-editor with MongoDB-specific ace modes, themes, and autocompleters.
 
 ## Usage
 

packages/compass-aggregations/README.md

@@ -65,7 +65,6 @@
     "@types/lodash": "^4.14.188",
     "@types/semver": "^7.3.9",
     "chai": "^4.3.6",
-    "classnames": "^2.2.6",
     "debug": "^4.2.0",
     "decomment": "^0.9.2",
     "depcheck": "^1.4.1",
@@ -74,10 +73,9 @@
     "enzyme": "^3.11.0",
     "eslint": "^7.25.0",
     "hadron-app-registry": "^9.0.2",
-    "is-electron-renderer": "^2.0.1",
     "lodash": "^4.17.21",
     "mocha": "^8.4.0",
-    "mongodb": "^4.10.0",
+    "mongodb": "^4.12.1",
     "mongodb-data-service": "^22.3.0",
     "mongodb-ns": "^2.4.0",
     "mongodb-query-parser": "^2.4.6",

packages/compass-aggregations/package.json

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
-import { Button, Icon, css, spacing } from '@mongodb-js/compass-components';
+import { Button, Icon, css, spacing, Link } from '@mongodb-js/compass-components';
 
 import { addStage } from '../../modules/pipeline-builder/stage-editor';
 
@@ -13,6 +13,12 @@ const containerStyles = css({
   marginBottom: spacing[3]
 });
 
+const linkContainerStyles = css({
+  textAlign: 'center',
+  marginTop: spacing[3],
+  marginBottom: spacing[3],
+});
+
 export class AddStage extends PureComponent {
   static displayName = 'AddStageComponent';
 
@@ -35,6 +41,10 @@ export class AddStage extends PureComponent {
         <Button data-testid="add-stage" onClick={this.onClick} variant="primary" leftGlyph={<Icon glyph="Plus"></Icon>}>
           Add Stage
         </Button>
+
+        <div className={linkContainerStyles}>
+          <Link href='https://www.mongodb.com/docs/manual/reference/operator/aggregation-pipeline/'>Learn more about aggregation pipeline stages</Link>
+        </div>
       </div>
     );
   }

packages/compass-aggregations/src/components/add-stage/add-stage.jsx

@@ -1,24 +1,10 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import Pipeline from '../pipeline';
-import { maxTimeMSChanged } from '../../modules/max-time-ms';
-import { collationStringChanged } from '../../modules/collation-string';
-import { toggleAutoPreview } from '../../modules/auto-preview';
-import { exportToLanguage } from '../../modules/export-to-language';
-import { openLink } from '../../modules/link';
 import { clonePipeline } from "../../modules/clone-pipeline";
 import {
   saveCurrentPipeline,
-  savedPipelineAdd,
-  getSavedPipelines,
 } from '../../modules/saved-pipeline';
-import {
-  newPipeline,
-  newPipelineFromText,
-  closeImport,
-  confirmNew
-} from '../../modules/import-pipeline';
-import { setIsNewPipelineConfirm } from '../../modules/is-new-pipeline-confirm';
 import {
   toggleSettingsIsExpanded,
   toggleSettingsIsCommentMode,
@@ -34,7 +20,6 @@ import {
 } from '../../modules/saving-pipeline';
 import {
   dismissViewError,
-  updateView
 } from '../../modules/update-view';
 
 import styles from './aggregations.module.less';
@@ -73,14 +58,11 @@ const mapStateToProps = (state) => ({
   isCommenting: state.comments,
   isAtlasDeployed: state.isAtlasDeployed,
   isAutoPreviewing: state.autoPreview,
-  isImportConfirmationNeeded: state.importPipeline.isConfirmationNeeded,
   settings: state.settings,
   limit: state.limit,
   largeLimit: state.largeLimit,
   maxTimeMS: state.maxTimeMS,
   savingPipeline: state.savingPipeline,
-  isNewPipelineConfirm: state.isNewPipelineConfirm,
-  setIsNewPipelineConfirm: state.setIsNewPipelineConfirm,
   updateViewError: state.updateViewError,
   workspace: state.workspace,
 });
@@ -92,30 +74,17 @@ const mapStateToProps = (state) => ({
 const MappedAggregations = connect(
   mapStateToProps,
   {
-    collationStringChanged,
-    toggleAutoPreview,
     toggleSettingsIsExpanded,
     toggleSettingsIsCommentMode,
     setSettingsSampleSize,
     setSettingsLimit,
-    exportToLanguage,
     saveCurrentPipeline,
-    savedPipelineAdd,
-    getSavedPipelines,
-    newPipeline,
-    newPipelineFromText,
-    closeImport,
     clonePipeline,
-    confirmNew,
-    openLink,
     applySettings,
-    maxTimeMSChanged,
     savingPipelineNameChanged,
     savingPipelineApply,
     savingPipelineCancel,
     savingPipelineOpen,
-    updateView,
-    setIsNewPipelineConfirm,
     dismissViewError
   }
 )(Aggregations);

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

@@ -25,7 +25,7 @@ const atlasTextStyles = css({
   maxWidth: '400px',
 });
 
-export const AtlastStagePreivew = ({
+export const AtlasStagePreview = ({
   stageOperator,
 }: {
   stageOperator: string;

packages/compass-aggregations/src/components/atlas-stage-preview.tsx

@@ -10,7 +10,6 @@ import LoadingOverlay from './loading-overlay';
 
 const cardStyles = css({
   margin: `0 ${spacing[3]}px`,
-  marginBottom: spacing[3]
 });
 
 const headerStyles = css({
@@ -42,10 +41,10 @@ const bodyStylesDark = css({
 
 const documentsContainerStyles = css({
   marginTop: spacing[2],
+  paddingBottom: spacing[2],
   display: 'flex',
   overflowX: 'scroll',
   gap: spacing[2],
-  paddingBottom: spacing[2]
 });
 
 const documentContainerStyles = css({
@@ -78,13 +77,15 @@ function PipelineBuilderInputDocuments({
     toggleInputDocumentsCollapsed(!isExpanded);
   };
 
+  const expandTooltipText = isExpanded ? 'Collapse' : 'Expand';
+
   return (<KeylineCard className={cardStyles}>
     <div className={headerStyles}>
-      <IconButton onClick={toggleExpanded} aria-label={isExpanded ? 'Collapse' : 'Expand'}>
+      <IconButton onClick={toggleExpanded} title={expandTooltipText} aria-label={expandTooltipText}>
         <Icon glyph={isExpanded ? 'ChevronDown' : 'ChevronRight'} size="small"></Icon>
       </IconButton>
       <Body className={headerTextStyles}><b>{count} Document{count === 1 ? '' : 's'}</b> in the collection</Body>
-      <IconButton onClick={refreshInputDocuments} aria-label="Refresh">
+      <IconButton onClick={refreshInputDocuments} aria-label="Refresh" title="Refresh">
         <Icon glyph="Refresh" size="small" />
       </IconButton>
     </div>

packages/compass-aggregations/src/components/pipeline-builder-input-documents.tsx

@@ -17,7 +17,7 @@ import { PipelineOutputOptionsMenu } from '../../pipeline-output-options-menu';
 import type { PipelineOutputOption } from '../../pipeline-output-options-menu';
 import { getPipelineStageOperatorsFromBuilderState } from '../../../modules/pipeline-builder/builder-helpers';
 import { OutputStageBanner } from './pipeline-stages-preview';
-import { AtlastStagePreivew } from './../../atlas-stage-preview';
+import { AtlasStagePreview } from './../../atlas-stage-preview';
 import {
   isMissingAtlasStageSupport,
   findAtlasOperator,
@@ -114,7 +114,7 @@ const PreviewResults = ({
   if (isMissingAtlasSupport) {
     return (
       <div className={centerStyles}>
-        <AtlastStagePreivew stageOperator={atlasOperator} />
+        <AtlasStagePreview stageOperator={atlasOperator} />
       </div>
     );
   }

packages/compass-aggregations/src/components/pipeline-builder-workspace/pipeline-as-text-workspace/pipeline-preview.tsx

@@ -0,0 +1,57 @@
+import React from 'react';
+import type { ComponentProps } from 'react';
+import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import sinon from 'sinon';
+import { expect } from 'chai';
+
+import { PipelineConfirmModal } from './pipeline-confirm-modal';
+
+const renderPipelineConfirmModal = (
+  props: Partial<ComponentProps<typeof PipelineConfirmModal>> = {}
+) => {
+  render(
+    <PipelineConfirmModal
+      isModalOpen={true}
+      onConfirmNewPipeline={() => {}}
+      onCloseModal={() => {}}
+      {...props}
+    />
+  );
+};
+
+describe('PipelineConfirmModal [Component]', function() {
+  it('renders correct text', function() {
+    renderPipelineConfirmModal();
+    expect(screen.findByText('Are you sure you want to create a new pipeline?')).to.exist;
+    expect(screen.findByText('Creating this pipeline will abandon unsaved changes to the current pipeline.')).to.exist;
+  });
+
+  it('calls onCancel when clicking the cancel button', function() {
+    const onCancelSpy = sinon.spy();
+    renderPipelineConfirmModal({
+      onCloseModal: onCancelSpy,
+    });
+    const modal = screen.getByTestId('confirm-new-pipeline-modal');
+    expect(onCancelSpy.callCount).to.equal(0);
+
+    userEvent.click(within(modal).getByText(/cancel/gi), undefined, {
+      skipPointerEventsCheck: true,
+    });
+    expect(onCancelSpy.callCount).to.equal(1);
+  });
+
+  it('calls onConfirmNewPipeline when clicking the confirm button', function() {
+    const onConfirmNewPipelineSpy = sinon.spy();
+    renderPipelineConfirmModal({
+      onConfirmNewPipeline: onConfirmNewPipelineSpy,
+    });
+    const modal = screen.getByTestId('confirm-new-pipeline-modal');
+    expect(onConfirmNewPipelineSpy.callCount).to.equal(0);
+
+    userEvent.click(within(modal).getByText(/confirm/gi), undefined, {
+      skipPointerEventsCheck: true,
+    });
+    expect(onConfirmNewPipelineSpy.callCount).to.equal(1);
+  });
+});