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

Author: gribnoysup

THIRD-PARTY-NOTICES.md

@@ -1,6 +1,6 @@
 {
   "name": "bson-transpilers",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "apiVersion": "0.0.1",
   "productName": "BSON Transpilers",
   "description": "Source to source compilers using ANTLR",
@@ -36,12 +36,12 @@
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
     "eslint-config-mongodb-js": "^2.1.0",
-    "js-yaml": "^3.11.0",
     "mocha": "^8.4.0"
   },
   "dependencies": {
     "antlr4": "4.7.2",
     "bson": "4.1.0",
-    "context-eval": "^0.1.0"
+    "context-eval": "^0.1.0",
+    "js-yaml": "^3.11.0"
   }
 }

package-lock.json

@@ -2,7 +2,7 @@
   "name": "mongodb-collection-model",
   "description": "MongoDB collection model.",
   "author": "Lucas Hrabovsky <[email protected]>",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "bugs": "https://github.com/mongodb-js/mongodb-collection-model/issues",
   "homepage": "https://github.com/mongodb-js/mongodb-collection-model",
   "repository": "git://github.com/mongodb-js/mongodb-collection-model.git",
@@ -26,7 +26,7 @@
     "lodash.clone": "^4.5.0",
     "lodash.foreach": "^4.2.0",
     "lodash.result": "^4.5.2",
-    "mongodb-index-model": "^3.2.0",
+    "mongodb-index-model": "^3.3.0",
     "mongodb-ns": "^2.0.0"
   },
   "peerDependencies": {
@@ -40,7 +40,7 @@
     "eslint": "^7.25.0",
     "eslint-config-mongodb-js": "^5.0.3",
     "mocha": "^7.0.0",
-    "mongodb-data-service": "^21.3.0",
+    "mongodb-data-service": "^21.5.0",
     "raf": "^3.4.1",
     "xvfb-maybe": "^0.2.1"
   }

packages/bson-transpilers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mongodb-js/compass-aggregations",
   "productName": "Aggregations plugin",
-  "version": "8.5.0",
+  "version": "8.8.0",
   "apiVersion": "3.0.0",
   "description": "Compass Aggregation Pipeline Builder",
   "main": "lib/index.js",
@@ -57,15 +57,15 @@
     "@babel/preset-react": "^7.13.13",
     "@babel/register": "^7.13.16",
     "@hot-loader/react-dom": "^16.8.4",
-    "@mongodb-js/compass-crud": "^12.5.0",
-    "@mongodb-js/compass-export-to-language": "^7.5.0",
-    "@mongodb-js/compass-field-store": "^7.5.0",
+    "@mongodb-js/compass-crud": "^12.8.0",
+    "@mongodb-js/compass-export-to-language": "^7.7.0",
+    "@mongodb-js/compass-field-store": "^7.7.0",
     "async": "^1.5.2",
     "autoprefixer": "^9.4.10",
     "babel-loader": "^8.2.2",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
     "brace": "^0.11.1",
-    "bson-transpilers": "^1.0.0",
+    "bson-transpilers": "^1.1.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-enzyme": "1.0.0-beta.1",
@@ -85,12 +85,12 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
-    "hadron-app": "^4.5.0",
+    "hadron-app": "^4.7.0",
     "hadron-app-registry": "^8.3.0",
     "hadron-document": "^7.4.0",
     "hadron-react-bson": "^5.4.0",
     "hadron-react-buttons": "^5.3.0",
-    "hadron-react-components": "^5.3.0",
+    "hadron-react-components": "^5.4.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
     "istanbul-instrumenter-loader": "^3.0.1",
@@ -113,8 +113,8 @@
     "mongodb-ace-autocompleter": "^0.6.0",
     "mongodb-ace-mode": "^1.2.0",
     "mongodb-ace-theme": "^1.2.0",
-    "mongodb-connection-model": "^21.3.0",
-    "mongodb-data-service": "^21.3.0",
+    "mongodb-connection-model": "^21.5.0",
+    "mongodb-data-service": "^21.5.0",
     "mongodb-js-metrics": "^7.3.0",
     "mongodb-query-parser": "^2.3.0",
     "mongodb-reflux-store": "^0.0.1",

packages/collection-model/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mongodb-js/compass-app-stores",
   "productName": "App Stores plugin",
-  "version": "5.5.0",
+  "version": "5.7.0",
   "apiVersion": "3.0.0",
   "description": "The external stores repo for compass",
   "main": "lib/index.js",
@@ -64,10 +64,10 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
-    "hadron-app": "^4.5.0",
+    "hadron-app": "^4.7.0",
     "hadron-app-registry": "^8.3.0",
     "hadron-react-bson": "^5.4.0",
-    "hadron-react-components": "^5.3.0",
+    "hadron-react-components": "^5.4.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
     "istanbul-instrumenter-loader": "^3.0.0",
@@ -89,11 +89,11 @@
     "lodash.result": "^4.5.2",
     "mocha": "^5.0.0",
     "mocha-webpack": "^2.0.0-beta.0",
-    "mongodb-collection-model": "^4.5.0",
-    "mongodb-connection-model": "^21.3.0",
-    "mongodb-data-service": "^21.3.0",
+    "mongodb-collection-model": "^4.7.0",
+    "mongodb-connection-model": "^21.5.0",
+    "mongodb-data-service": "^21.5.0",
     "mongodb-database-model": "^1.2.0",
-    "mongodb-instance-model": "^11.5.0",
+    "mongodb-instance-model": "^11.7.0",
     "mongodb-js-metrics": "^7.3.0",
     "mongodb-reflux-store": "^0.0.1",
     "node-loader": "^0.6.0",

packages/compass-aggregations/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mongodb-js/compass-auto-updates",
   "productName": "Compass Auto Updates plugin",
-  "version": "3.5.0",
+  "version": "3.7.0",
   "apiVersion": "3.0.0",
   "description": "Compass Auto Updates Plugin",
   "main": "lib/index.js",
@@ -57,7 +57,7 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
-    "hadron-app": "^4.5.0",
+    "hadron-app": "^4.7.0",
     "hadron-app-registry": "^8.3.0",
     "hadron-ipc": "^2.3.0",
     "hadron-react-buttons": "^5.3.0",
@@ -79,7 +79,7 @@
     "less-loader": "^5.0.0",
     "mocha": "^4.1.0",
     "mocha-webpack": "^2.0.0-beta.0",
-    "mongodb-data-service": "^21.3.0",
+    "mongodb-data-service": "^21.5.0",
     "mongodb-reflux-store": "^0.0.1",
     "node-loader": "^0.6.0",
     "nyc": "^11.0.3",

packages/compass-app-stores/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mongodb-js/compass-collection-stats",
   "productName": "Collection Stats",
-  "version": "6.5.0",
+  "version": "6.7.0",
   "apiVersion": "3.0.0",
   "description": "Compass Collection Stats Plugin",
   "main": "lib/index.js",
@@ -53,7 +53,6 @@
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
     "chai": "^4.1.2",
     "chai-enzyme": "1.0.0-beta.1",
-    "classnames": "^2.2.5",
     "core-js": "^3.12.1",
     "cross-env": "^7.0.0",
     "css-loader": "^4.3.0",
@@ -69,10 +68,10 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^5.1.0",
     "font-awesome": "^4.7.0",
-    "hadron-app": "^4.5.0",
+    "hadron-app": "^4.7.0",
     "hadron-app-registry": "^8.3.0",
     "hadron-react-bson": "^5.4.0",
-    "hadron-react-components": "^5.3.0",
+    "hadron-react-components": "^5.4.0",
     "html-webpack-plugin": "^3.2.0",
     "ignore-loader": "^0.1.2",
     "istanbul-instrumenter-loader": "^3.0.0",
@@ -92,8 +91,8 @@
     "mocha": "^5.0.0",
     "mocha-webpack": "^2.0.0-beta.0",
     "mongodb-client-encryption": "^1.2.3",
-    "mongodb-connection-model": "^21.3.0",
-    "mongodb-data-service": "^21.3.0",
+    "mongodb-connection-model": "^21.5.0",
+    "mongodb-data-service": "^21.5.0",
     "mongodb-ns": "^2.0.0",
     "mongodb-reflux-store": "^0.0.1",
     "node-loader": "^0.6.0",

packages/compass-auto-updates/package.json

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import classnames from 'classnames';
 
 import styles from './collection-stats-item.less';
 
@@ -48,11 +47,11 @@ class CollectionStatsItem extends Component {
    */
   render() {
     return (
-      <div className={classnames(styles[BASE_CLASS])}>
-        <div className={classnames(styles[this.props.primary ? PRIMARY_LABEL : LABEL])}>
+      <div className={styles[BASE_CLASS]}>
+        <div className={styles[this.props.primary ? PRIMARY_LABEL : LABEL]}>
           {this.props.label}
         </div>
-        <div className={classnames(styles[this.props.primary ? PRIMARY_VALUE : VALUE])}>
+        <div className={styles[this.props.primary ? PRIMARY_VALUE : VALUE]}>
           {this.props.value}
         </div>
       </div>

packages/compass-collection-stats/package.json

@@ -1,25 +1,25 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
+import DocumentStatsItem from '../document-stats-item';
+import IndexStatsItem from '../index-stats-item';
+
 import styles from './collection-stats.less';
 
 class CollectionStats extends Component {
   static displayName = 'CollectionStatsComponent';
 
   static propTypes = {
-    isReadonly: PropTypes.bool
+    documentCount: PropTypes.string.isRequired,
+    totalDocumentSize: PropTypes.string.isRequired,
+    avgDocumentSize: PropTypes.string.isRequired,
+    indexCount: PropTypes.string.isRequired,
+    totalIndexSize: PropTypes.string.isRequired,
+    avgIndexSize: PropTypes.string.isRequired,
+    isReadonly: PropTypes.bool.isRequired,
+    isTimeSeries: PropTypes.bool.isRequired
   };
 
-  /**
-   * Instantiate the component.
-   *
-   * @param {Object} props - The properties.
-   */
-  constructor(props) {
-    super(props);
-    this.roles = global.hadronApp.appRegistry.getRole('CollectionHUD.Item');
-  }
-
   /**
    * Render CollectionStats component.
    *
@@ -30,10 +30,23 @@ class CollectionStats extends Component {
       return <div className={styles['collection-stats-empty']} />;
     }
 
-    const children = (this.roles || []).map((role, i) => {
-      return <role.component key={i} {...this.props} />;
-    });
-    return <div className={styles['collection-stats']}>{children}</div>;
+    return (
+      <div className={styles['collection-stats']}>
+        <DocumentStatsItem
+          isTimeSeries={this.props.isTimeSeries}
+          documentCount={this.props.documentCount}
+          totalDocumentSize={this.props.totalDocumentSize}
+          avgDocumentSize={this.props.avgDocumentSize}
+        />
+        {!this.props.isTimeSeries && (
+          <IndexStatsItem
+            indexCount={this.props.indexCount}
+            totalIndexSize={this.props.totalIndexSize}
+            avgIndexSize={this.props.avgIndexSize}
+          />
+        )}
+      </div>
+    );
   }
 }