INT-677 move autofill connect code from window-manager to connectview

Author: WaleyChen

package.json

@@ -75,7 +75,7 @@
     "keytar": "^3.0.0",
     "localforage": "^1.3.0",
     "mongodb-collection-model": "^0.1.1",
-    "mongodb-connection-model": "^3.0.6",
+    "mongodb-connection-model": "^3.0.7",
     "mongodb-instance-model": "^1.0.2",
     "mongodb-ns": "^1.0.1",
     "mongodb-js-metrics": "^0.2.2",

src/connect/index.js

@@ -1,15 +1,20 @@
-var View = require('ampersand-view');
-var SidebarView = require('./sidebar');
 var BehaviorStateMachine = require('./behavior');
-var ConnectionCollection = require('../models/connection-collection');
 var ConnectFormView = require('./connect-form-view');
 var Connection = require('../models/connection');
-var debug = require('debug')('scout:connect:index');
+var ConnectionCollection = require('../models/connection-collection');
+var MongoDBConnection = require('mongodb-connection-model');
+var SidebarView = require('./sidebar');
+var View = require('ampersand-view');
+
 var _ = require('lodash');
 var app = require('ampersand-app');
+var debug = require('debug')('scout:connect:index');
 var format = require('util').format;
 var metrics = require('mongodb-js-metrics');
 
+var remote = window.require('remote');
+var Clipboard = remote.require('clipboard');
+
 /**
  * AuthenticationOptionCollection
  */
@@ -227,13 +232,40 @@ var ConnectView = View.extend({
       this.replaceAuthMethodFields.bind(this));
     this.listenToAndRun(this, 'change:sslMethod',
       this.replaceSslMethodFields.bind(this));
-    this.listenTo(app, 'update-connection',
-      this.updateConnectionFromMsg.bind(this));
+
+    this.listenTo(app, 'autofill-connection-from-clipboard',
+      this.autofillFromClipboard.bind(this));
+    this.listenTo(app, 'connect-window-focused',
+      this.checkIfCanAutofillFromClipboard.bind(this));
 
     // always start in NEW_EMPTY state
     this.dispatch('new connection clicked');
   },
 
+  autofillFromClipboard: function() {
+    var connectionFromCB = MongoDBConnection.from(this.lastClipboardTxt).toJSON();
+    this.connection = new Connection();
+    /* eslint guard-for-in: 0 */
+    for (var attr in connectionFromCB) {
+      this.connection[attr] = connectionFromCB[attr];
+    }
+    /* eslint guard-for-in: 1 */
+    this.updateForm();
+  },
+
+  checkIfCanAutofillFromClipboard: function() {
+    var cbTxt = Clipboard.readText();
+    if (cbTxt === this.lastClipboardTxt) {
+      return;
+    }
+    this.lastClipboardTxt = cbTxt;
+
+    if (MongoDBConnection.isURI(cbTxt)) {
+      debug('mongoURI detected.');
+      app.sendMessage('show autofill connection notification');
+    }
+  },
+
   connectionNameEmptyChanged: function() {
     if (this.connectionNameEmpty) {
       this.dispatch('name removed');
@@ -242,7 +274,6 @@ var ConnectView = View.extend({
     }
   },
 
-
   // === External hooks
 
   /**
@@ -310,16 +341,6 @@ var ConnectView = View.extend({
     });
   },
 
-  updateConnectionFromMsg: function(connection) {
-    this.connection = new Connection();
-    /* eslint guard-for-in: 0 */
-    for (var attr in connection) {
-      this.connection[attr] = connection[attr];
-    }
-    /* eslint guard-for-in: 1 */
-    this.updateForm();
-  },
-
   /**
    *
    * remove favorite, then saves the connection (if it has been used before)

src/electron/window-manager.js

@@ -7,56 +7,43 @@
 var AppMenu = require('./menu');
 var BrowserWindow = require('browser-window');
 var Clipboard = require('clipboard');
-var Connection = require('mongodb-connection-model');
 var Notifier = require('node-notifier');
+var Path = require('path');
 
 var _ = require('lodash');
 var app = require('app');
 var config = require('./config');
 var debug = require('debug')('scout-electron:window-manager');
 var dialog = require('dialog');
-var path = require('path');
 
 /**
  * When running in electron, we're in `RESOURCES/src/electron`.
  */
-var RESOURCES = path.resolve(__dirname, '../../');
+var RESOURCES = Path.resolve(__dirname, '../../');
 var SCOUT_ICON_PATH = RESOURCES + '/images/scout.png';
 
 /**
  * The app's HTML shell which is the output of `./src/index.jade`
  * created by the `build:pages` gulp task.
  */
-var DEFAULT_URL = 'file://' + path.join(RESOURCES, 'index.html#connect');
+var DEFAULT_URL = 'file://' + Path.join(RESOURCES, 'index.html#connect');
 
 /**
  * We want the Connect dialog window to be special
  * and for there to ever only be one instance of it
  * so we'll use scope to essentially make it a Singleton.
  */
 var connectWindow;
-var curNotifierOnClickFn;
-var lastClipboardTxt;
 
 // @todo (imlucas): Removed in setup branch as we dont need to do this anymore
 // as a `all-windows-closed` event has been added to the `app` event api
 // since this code was laid down.
 var windowsOpenCount = 0;
 
-var autofillConnect = function() {
-  debug('autofillConnect()');
-  var connection = Connection.from(Clipboard.readText()).toJSON();
-  connectWindow.webContents.send('message', 'update-connection', connection);
-};
-
 function isConnectDialog(url) {
   return url === DEFAULT_URL;
 }
 
-function isMongoURI(str) {
-  return str.indexOf('mongodb://') > -1;
-}
-
 // returns true if the application is a single instance application otherwise
 // focus the second window (which we'll quit from) and return false
 // see "app.makeSingleInstance" in https://github.com/atom/electron/blob/master/docs/api/app.md
@@ -137,22 +124,7 @@ module.exports.create = function(opts) {
     connectWindow = _window;
     connectWindow.on('focus', function() {
       debug('connect window focused.');
-      var cbTxt = Clipboard.readText();
-      if (cbTxt === lastClipboardTxt) {
-        return;
-      }
-      lastClipboardTxt = cbTxt;
-
-      if (isMongoURI(cbTxt)) {
-        debug('mongoURI detected.');
-        curNotifierOnClickFn = autofillConnect;
-        Notifier.notify({
-          'icon': SCOUT_ICON_PATH,
-          'message': 'Click this notification to autofill the connection fields from your clipboard.',
-          'title': 'Autofill Connection',
-          'wait': true
-        });
-      }
+      connectWindow.webContents.send('message', 'connect-window-focused');
     });
     connectWindow.on('closed', function() {
       debug('connect window closed.');
@@ -196,6 +168,19 @@ app.on('show about dialog', function() {
   });
 });
 
+app.on('show autofill connection notification', function() {
+  Notifier.notify({
+    'icon': SCOUT_ICON_PATH,
+    'message': 'Click this notification to autofill the connection fields from your clipboard.',
+    'title': 'Autofill Connection',
+    'wait': true
+  }, function(err, resp) {
+    if (resp === 'Activate\n') {
+      connectWindow.webContents.send('message', 'autofill-connection-from-clipboard');
+    }
+  });
+});
+
 app.on('hide connect submenu', function() {
   AppMenu.hideConnect();
 });
@@ -218,12 +203,15 @@ app.on('show share submenu', function() {
 
 app.on('show bugsnag OS notification', function(errorMsg) {
   if (_.contains(['development', 'testing'], process.env.NODE_ENV)) {
-    curNotifierOnClickFn = openDevTools;
     Notifier.notify({
       'icon': SCOUT_ICON_PATH,
       'message': errorMsg,
       'title': 'MongoDB Compass Exception',
       'wait': true
+    }, function(err, resp) {
+      if (resp === 'Activate\n') {
+        openDevTools();
+      }
     });
   }
 });
@@ -236,10 +224,6 @@ app.on('show bugsnag OS notification', function(errorMsg) {
  */
 app.on('ready', function() {
   app.emit('show connect dialog');
-
-  Notifier.on('click', function() {
-    curNotifierOnClickFn();
-  });
 });
 
 var ipc = require('ipc');