Merge branch 'main' into 1.29-releases

Author: alenakhineika

.github/workflows/connectivity-tests.yaml

@@ -67,7 +67,7 @@ jobs:
         run: |
           git clone https://github.com/mongodb-js/devtools-docker-test-envs.git
           cd devtools-docker-test-envs
-          git checkout v1.2.1
+          git checkout v1.2.2
           docker-compose -f docker/enterprise/docker-compose.yaml up -d
           docker-compose -f docker/ldap/docker-compose.yaml up -d
           docker-compose -f docker/scram/docker-compose.yaml up -d

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 Tue Nov 23 2021.
+This document was automatically generated on Mon Nov 29 2021.
 
 ## List of dependencies
 

package-lock.json

@@ -83,6 +83,15 @@ function propagateCollectionEvents(namespace) {
   };
 }
 
+function getParentByType(model, type) {
+  const parent = getParent(model);
+  return parent
+    ? parent.modelType === type
+      ? parent
+      : getParentByType(parent, type)
+    : null;
+}
+
 function pickCollectionInfo({
   type,
   readonly,
@@ -235,18 +244,26 @@ const CollectionCollection = AmpersandCollection.extend(
      * @returns {Promise<void>}
      */
     async fetch({ dataService, fetchInfo = true }) {
-      const databaseName = this.parent && this.parent.getId();
+      const databaseName = getParentByType(this, 'Database')?.getId();
 
       if (!databaseName) {
         throw new Error(
-          "Trying to fetch MongoDBCollectionCollection that doesn't have the parent model"
+          `Trying to fetch ${this.modelType} that doesn't have the Database parent model`
+        );
+      }
+
+      const instanceModel = getParentByType(this, 'Instance');
+
+      if (!instanceModel) {
+        throw new Error(
+          `Trying to fetch ${this.modelType} that doesn't have the Instance parent model`
         );
       }
 
       const collections = await dataService.listCollections(
         databaseName,
         {},
-        { nameOnly: !fetchInfo }
+        { nameOnly: !fetchInfo, privileges: instanceModel.auth.privileges }
       );
 
       this.set(

packages/collection-model/lib/model.js

@@ -41,6 +41,9 @@ const store = configureStore({
   globalAppRegistry: appRegistry,
   serverVersion: '4.4.0',
   env: 'adl',
+  isTimeSeries: false,
+  isReadonly: false,
+  sourceName: null,
   fields: [
     { name: 'harry',
       value: 'harry',

packages/compass-aggregations/electron/renderer/index.js

@@ -119,6 +119,9 @@ const mapStateToProps = (state) => ({
   inputDocuments: state.inputDocuments,
   namespace: state.namespace,
   env: state.env,
+  isTimeSeries: state.isTimeSeries,
+  isReadonly: state.isReadonly,
+  sourceName: state.sourceName,
   serverVersion: state.serverVersion,
   pipeline: state.pipeline,
   savedPipeline: state.savedPipeline,

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

@@ -19,6 +19,9 @@ class PipelineWorkspace extends PureComponent {
     allowWrites: PropTypes.bool.isRequired,
     editViewName: PropTypes.string,
     env: PropTypes.string.isRequired,
+    isTimeSeries: PropTypes.bool.isRequired,
+    isReadonly: PropTypes.bool.isRequired,
+    sourceName: PropTypes.string,
     pipeline: PropTypes.array.isRequired,
     toggleInputDocumentsCollapsed: PropTypes.func.isRequired,
     refreshInputDocuments: PropTypes.func.isRequired,
@@ -47,22 +50,45 @@ class PipelineWorkspace extends PureComponent {
     newPipelineFromPaste: PropTypes.func.isRequired
   };
 
+  /**
+   * The stage moved handler.
+   *
+   * @param {Number} fromIndex - The original index.
+   * @param {Number} toIndex - The index to move to.
+   */
   onStageMoved = (fromIndex, toIndex) => {
     this.props.stageMoved(fromIndex, toIndex);
     this.props.runStage(0);
   }
 
+  /**
+   * Render the modify source banner if neccessary.
+   *
+   * @returns {Component} The component.
+   */
   renderModifyingViewSourceBanner() {
     if (this.props.editViewName) {
       return (<ModifySourceBanner editViewName={this.props.editViewName} />);
     }
   }
 
+  /**
+   * Render a stage.
+   *
+   * @param {Object} stage - The current stage info.
+   * @param {Number} i - The current index.
+   * @param {Function} connectDragSource - The function to render a stage editor toolbar.
+   *
+   * @returns {Component} The component.
+   */
   renderStage = (stage, i, connectDragSource) => {
     return (<Stage
       allowWrites={this.props.allowWrites}
       connectDragSource={connectDragSource}
       env={this.props.env}
+      isTimeSeries={this.props.isTimeSeries}
+      isReadonly={this.props.isReadonly}
+      sourceName={this.props.sourceName}
       stage={stage.stage}
       stageOperator={stage.stageOperator}
       snippet={stage.snippet}
@@ -102,6 +128,11 @@ class PipelineWorkspace extends PureComponent {
     />);
   }
 
+  /**
+   * Render a stage list.
+   *
+   * @returns {Component} The component.
+   */
   renderStageList = () => {
     return (<SortableStageList
       items={this.props.pipeline}

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

@@ -51,6 +51,9 @@ function createPipelineWorkspace({
   allowWrites = false,
   pipeline = [],
   env = 'atlas',
+  isTimeSeries = false,
+  isReadonly = false,
+  sourceName = null,
   toggleInputDocumentsCollapsed = () => {},
   refreshInputDocuments = () => {},
   stageAdded = () => {},
@@ -81,6 +84,9 @@ function createPipelineWorkspace({
     allowWrites={allowWrites}
     pipeline={pipeline}
     env={env}
+    isTimeSeries={isTimeSeries}
+    isReadonly={isReadonly}
+    sourceName={sourceName}
     toggleInputDocumentsCollapsed={toggleInputDocumentsCollapsed}
     refreshInputDocuments={refreshInputDocuments}
     stageAdded={stageAdded}
@@ -111,12 +117,25 @@ function createPipelineWorkspace({
 
 describe('PipelineWorkspace [Component]', () => {
   it('renders', () => {
-    mount(createPipelineWorkspace());
+    mount(createPipelineWorkspace({
+      inputDocuments: {
+        documents: [],
+        isLoading: false,
+        isExpanded: true,
+        count: 0
+      }
+    }));
   });
 
   it('renders the stages contained in the pipeline', () => {
     const wrapper = mount(createPipelineWorkspace({
-      pipeline: PIPELINE_1
+      pipeline: PIPELINE_1,
+      inputDocuments: {
+        documents: [],
+        isLoading: false,
+        isExpanded: true,
+        count: 0
+      }
     }));
     expect(wrapper.find(Stage)).to.have.lengthOf(2);
   });

packages/compass-aggregations/src/components/pipeline-workspace/pipeline-workspace.spec.js

@@ -114,7 +114,8 @@ class Pipeline extends PureComponent {
     newPipelineFromPaste: PropTypes.func.isRequired,
     openCreateView: PropTypes.func.isRequired,
     isNewPipelineConfirm: PropTypes.bool.isRequired,
-    setIsNewPipelineConfirm: PropTypes.func.isRequired
+    setIsNewPipelineConfirm: PropTypes.func.isRequired,
+    inputDocuments: PropTypes.object.isRequired
   };
 
   static defaultProps = {

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

@@ -9,9 +9,9 @@ import styles from './select-option-with-tooltip.module.less';
 
 class SelectOptionWithTooltip extends Component {
   static propTypes = {
-    option: PropTypes.object,
+    option: PropTypes.object.isRequired,
     className: PropTypes.string,
-    children: PropTypes.array,
+    children: PropTypes.node,
   };
 
   render() {