INT-780 save ssl cert paths, removing debug msgs

Author: rueckstiess

src/connect/behavior.js

@@ -1,9 +1,10 @@
 var State = require('ampersand-state');
-var debug = require('debug')('scout:connect:behavior');
 var assert = require('assert');
 var Connection = require('../models/connection');
 var _ = require('lodash');
 
+// var debug = require('debug')('scout:connect:behavior');
+
 module.exports = State.extend({
   props: {
     view: 'any',
@@ -79,9 +80,9 @@ module.exports = State.extend({
   },
   dispatch: function(action) {
     var newState = this.reduce(this.state, action);
-    if (newState !== this.state) {
-      debug('transition: (%s, %s) ==> %s', this.state, action, newState);
-    }
+    // if (newState !== this.state) {
+    //   debug('transition: (%s, %s) ==> %s', this.state, action, newState);
+    // }
     this.state = newState;
     return this.state;
   },
@@ -100,7 +101,7 @@ module.exports = State.extend({
 
     // check if the current state allows the given action
     if (this.validTransitions[state].indexOf(action) === -1) {
-      debug('ignoring action `%s` in state `%s`', action, state);
+      // debug('ignoring action `%s` in state `%s`', action, state);
       return state;
     }
     // general actions, independent of state

src/connect/connect-form-view.js

@@ -4,7 +4,7 @@ var SelectView = require('ampersand-select-view');
 var authOptions = require('./authentication');
 var sslOptions = require('./ssl');
 var FilteredCollection = require('ampersand-filtered-subcollection');
-var debug = require('debug')('scout:connect:connect-form-view');
+// var debug = require('debug')('scout:connect:connect-form-view');
 
 
 require('bootstrap/js/popover');
@@ -66,7 +66,6 @@ var ConnectFormView = FormView.extend({
       return;
     }
     var name = obj.hostname + ':' + obj.port;
-    debug('obj', obj);
     if (obj.authentication === 'MONGODB') {
       if (obj.mongodb_username) {
         name = obj.mongodb_username + '@' + name;

src/connect/filereader-view.js

@@ -0,0 +1,64 @@
+var InputView = require('./input-view');
+var _ = require('lodash');
+// var path = require('path');
+var fileReaderTemplate = require('./filereader-default.jade');
+
+// var debug = require('debug')('scout:connect:filereader-view');
+
+module.exports = InputView.extend({
+  template: fileReaderTemplate,
+  clean: function() {
+    var value;
+    value = _.chain(this.input.files)
+      .map(function(file) {
+        return _.get(file, 'path', null);
+      })
+      .filter()
+      .value();
+    if (value.length === 0) {
+      value = '';
+    }
+    return value;
+  },
+  setValue: function(value, skipValidation) {
+    if (!this.input) {
+      this.inputValue = value;
+      return;
+    }
+    this.input.value = '';
+    /**
+     * Cannot set input value for file types. @see INT-780
+     */
+    // if (value || value === 0) {
+    //   if (!_.isArray(value)) {
+    //     value = [value];
+    //   }
+    //   if (value.length <= 1) {
+    //     this.input.value = path.basename(value);
+    //   } else {
+    //     this.input.value = 'multiple files';
+    //   }
+    //   this.input.files = _.map(value, function(f) {
+    //     return {
+    //       name: path.basename(f),
+    //       path: f
+    //     };
+    //   });
+    // }
+    this.inputValue = this.clean();
+    if (!skipValidation && !this.getErrorMessage()) {
+      this.shouldValidate = true;
+    } else if (skipValidation) {
+      this.shouldValidate = false;
+    }
+  },
+  handleChange: function() {
+    if (this.inputValue && this.changed) {
+      this.shouldValidate = true;
+    }
+    // for `file` type input fields, this is the only event and we need
+    // to set this.inputValue here again.
+    this.inputValue = this.clean();
+    this.runTests();
+  }
+});

src/connect/index.js

@@ -94,6 +94,7 @@ var ConnectView = View.extend({
     'input input[name=name]': 'onNameInputChanged',
     'change input[name=name]': 'onNameInputChanged',
     'input input': 'onAnyInputChanged',
+    'change input': 'onAnyInputChanged',
     'change select': 'onAnyInputChanged'
   },
 
@@ -292,14 +293,8 @@ var ConnectView = View.extend({
    */
   updateConnection: function() {
     if (this.connection) {
-      debug('updating existing connection from form data');
-      // set previous auth fields
-      var authFields = Connection.getFieldNames(this.previousAuthMethod);
-      debug('authFields', authFields);
       this.connection.set(this.form.data);
-      debug('after', this.connection.serialize());
     } else {
-      debug('creating new connection from form data');
       this.connection = new Connection(this.form.data);
     }
     this.connection.is_favorite = true;
@@ -339,10 +334,6 @@ var ConnectView = View.extend({
       return;
     }
     app.statusbar.show();
-    debug('trying to connect with URL %s and options %j',
-      connection.driver_url,
-      connection.driver_options
-    );
 
     connection.test(function(err) {
       app.statusbar.hide();

src/connect/input-view.js

@@ -1,11 +1,9 @@
 var InputView = require('ampersand-input-view');
-var _ = require('lodash');
-
 // var debug = require('debug')('scout:connect:input-view');
 
 /**
- * Need to overwrite render() method and pass in `this` for renderWithTemplate(), so that
- * label gets correctly rendered on subsequent render() calls.
+ * Need to overwrite render() method and pass in `this` for renderWithTemplate()
+ * so that label gets correctly rendered on subsequent render() calls.
  */
 module.exports = InputView.extend({
   initialize: function() {
@@ -23,38 +21,5 @@ module.exports = InputView.extend({
     // if the field is not required
     this.setValue(this.inputValue, !this.required);
     return this;
-  },
-  clean: function(val) {
-    if (this.type === 'number') {
-      return Number(val);
-    } else if (this.type === 'string') {
-      return val.trim();
-    }
-    return val;
-  },
-  /**
-   * overwriting InputView#beforeSubmit to handle `file` type correctly.
-   * For `file` type, the input view returns the actual path (provided by
-   * electron) rather than the browser fake path.
-   * @see https://github.com/atom/electron/blob/master/docs/api/file-object.md
-   */
-  beforeSubmit: function() {
-    var value;
-    if (this.type === 'file') {
-      value = _.chain(this.input.files)
-        .map(function(file) {
-          return _.get(file, 'path', null);
-        })
-        .filter()
-        .value();
-      if (value.length === 0) {
-        value = '';
-      }
-    } else {
-      value = this.input.value;
-    }
-    this.inputValue = this.clean(value);
-    this.shouldValidate = true;
-    this.runTests();
   }
 });

src/connect/ssl.js

@@ -6,8 +6,8 @@
 var SSLOptionCollection = require('./models/ssl-option-collection');
 
 var InputView = require('./input-view');
+var FileReaderView = require('./filereader-view');
 var inputTemplate = require('./input-default.jade');
-var fileReaderTemplate = require('./filereader-default.jade');
 
 // var debug = require('debug')('scout:connect:ssl');
 
@@ -37,8 +37,7 @@ var SERVER = {
   // enabled: app.isFeatureEnabled('Connect with SSL SERVER'),
   enabled: true,
   fields: [
-    new InputView({
-      template: fileReaderTemplate,
+    new FileReaderView({
       name: 'ssl_ca',
       type: 'file',
       label: 'Certificate Authority',
@@ -57,24 +56,21 @@ var ALL = {
   // enabled: app.isFeatureEnabled('Connect with SSL ALL'),
   enabled: true,
   fields: [
-    new InputView({
-      template: fileReaderTemplate,
+    new FileReaderView({
       name: 'ssl_ca',
       type: 'file',
       label: 'Certificate Authority',
       placeholder: '',
       required: true
     }),
-    new InputView({
-      template: fileReaderTemplate,
+    new FileReaderView({
       name: 'ssl_private_key',
       type: 'file',
       label: 'Certificate Key',
       placeholder: '',
       required: true
     }),
-    new InputView({
-      template: fileReaderTemplate,
+    new FileReaderView({
       name: 'ssl_certificate',
       type: 'file',
       label: 'Certificate',