Bugfix: 3107, 3123, 3042, 3102, 3126

Author: aherlihy

package-lock.json

@@ -226,23 +226,23 @@
     "url": "git://github.com/10gen/compass.git"
   },
   "dependencies": {
-    "@mongodb-js/compass-aggregations": "^1.8.0",
+    "@mongodb-js/compass-aggregations": "^1.8.1",
     "@mongodb-js/compass-auth-kerberos": "^1.0.1",
     "@mongodb-js/compass-auth-ldap": "^1.0.1",
     "@mongodb-js/compass-auth-x509": "^1.0.1",
     "@mongodb-js/compass-auto-updates": "^0.0.2",
     "@mongodb-js/compass-collection-stats": "^3.0.1",
     "@mongodb-js/compass-connect": "^3.4.0",
-    "@mongodb-js/compass-crud": "^5.3.5",
+    "@mongodb-js/compass-crud": "^5.3.7",
     "@mongodb-js/compass-deployment-awareness": "^6.1.1",
     "@mongodb-js/compass-document-validation": "^8.0.3",
-    "@mongodb-js/compass-export-to-language": "^2.3.0",
+    "@mongodb-js/compass-export-to-language": "^2.3.2",
     "@mongodb-js/compass-find-in-page": "^1.0.2",
     "@mongodb-js/compass-import-export": "^1.0.4",
     "@mongodb-js/compass-instance": "^1.0.1",
     "@mongodb-js/compass-license": "^1.0.0",
     "@mongodb-js/compass-plugin-info": "^1.0.0",
-    "@mongodb-js/compass-query-bar": "^1.0.28",
+    "@mongodb-js/compass-query-bar": "^1.0.30",
     "@mongodb-js/compass-query-history": "^3.0.2",
     "@mongodb-js/compass-server-version": "^2.0.1",
     "@mongodb-js/compass-serverstats": "^12.1.0",

package.json

@@ -19,7 +19,7 @@ class CreateCollectionCheckbox extends React.Component {
         <label>
           <input
             type="checkbox"
-            onClick={this.props.onClickHandler}
+            onChange={this.props.onClickHandler}
             checked={this.props.checked}
             className={this.props.inputClassName} />
           <p className={this.props.titleClassName}>{this.props.name}</p>

src/internal-plugins/database/lib/components/create-collection-checkbox.jsx

@@ -15,7 +15,7 @@ class CreateIndexCheckbox extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      checked: false
+      checked: props.checked
     };
   }
 
@@ -61,7 +61,8 @@ CreateIndexCheckbox.displayName = 'CreateIndexCheckbox';
 CreateIndexCheckbox.propTypes = {
   description: PropTypes.string.isRequired,
   isParam: PropTypes.bool.isRequired,
-  option: PropTypes.string.isRequired
+  option: PropTypes.string.isRequired,
+  checked: PropTypes.bool.isRequired
 };
 
 module.exports = CreateIndexCheckbox;

src/internal-plugins/indexes/lib/component/create-index-checkbox.jsx

@@ -83,13 +83,7 @@ class CreateIndexModal extends React.Component {
    * Handle clicking the collation checkbox.
    */
   onCollationClicked() {
-    this.setState({ isCustomCollation: !this.state.isCustomCollation }, () => {
-      if (this.state.isCustomCollation) {
-        Action.updateOption('collation', {locale: 'simple'});
-      } else {
-        Action.updateOption('collation', false);
-      }
-    });
+    this.setState({ isCustomCollation: !this.state.isCustomCollation });
   }
 
   /**
@@ -101,24 +95,35 @@ class CreateIndexModal extends React.Component {
     let idx = 0;
     const options = [];
     for (const option of INDEX_OPTIONS) {
+      const propOption = this.state.options[option.name];
+      const checked = propOption === undefined ? false : propOption.value;
       options.push(
         <CreateIndexCheckbox
           key={idx++}
           description={option.desc}
           isParam={false}
           dataTestId={`create-index-modal-${option.name}-checkbox`}
-          option={option.name} />
+          option={option.name}
+          checked={checked}/>
       );
       if (option.param) {
-        const propOption = this.state.options[option.name];
+        let val;
+        if (propOption === undefined || propOption.param === undefined) {
+          val = option.name === 'partialFilterExpression'
+            ? '{}'
+            : '';
+        } else {
+          val = propOption.param;
+        }
         options.push(
           <CreateIndexTextField
             key={idx++}
             enabled={propOption ? propOption.value : false}
             isParam
             option={option.name}
             dataTestId={`create-index-modal-${option.name}-field`}
-            units={option.paramUnit} />
+            units={option.paramUnit}
+            value={val}/>
         );
       }
     }
@@ -129,6 +134,7 @@ class CreateIndexModal extends React.Component {
         titleClassName="create-index-collation-title"
         helpUrl={HELP_URL_COLLATION}
         onClickHandler={this.onCollationClicked.bind(this)}
+        checked={this.state.isCustomCollation}
       />
     </div>);
     options.push(this.renderCollation(idx++));
@@ -302,7 +308,8 @@ class CreateIndexModal extends React.Component {
                 autoFocus
                 isParam={false}
                 option={'name'}
-                dataTestId="create-index-modal-name" />
+                dataTestId="create-index-modal-name"
+                value={''}/>
 
               <div className="create-index-fields">
                 <p className="create-index-description">Configure the index definition</p>

src/internal-plugins/indexes/lib/component/create-index-modal.jsx

@@ -18,11 +18,8 @@ class CreateIndexTextField extends React.Component {
   constructor(props) {
     super(props);
     const state = {
-      value: ''
+      value: props.value
     };
-    if (this.props.option === 'partialFilterExpression') {
-      state.value = '{}';
-    }
     this.state = state;
   }
 
@@ -166,7 +163,8 @@ CreateIndexTextField.propTypes = {
   isParam: PropTypes.bool.isRequired,
   option: PropTypes.string.isRequired,
   units: PropTypes.string,
-  dataTestId: PropTypes.string
+  dataTestId: PropTypes.string,
+  value: PropTypes.string.isRequired
 };
 
 CreateIndexTextField.defaultProps = {