Merge pull request #213 from 10gen/INT-677-import-connection-URL

Waley Chen · Waley Chen · commit 08de58426968 · 2015-11-16T14:13:26.000-05:00
INT-677 autofill connection dialog from mongodb URI in clipboard
diff --git a/package.json b/package.json
@@ -18,21 +18,22 @@
       "./src/index.js"
     ],
     "ignore": [
-      "bootstrap",
-      "font-awesome",
-      "octicons",
-      "app",
-      "auto-updater",
-      "crash-reporter",
-      "dialog",
-      "browser-window",
-      "menu",
-      "jade",
-      "scout-server",
-      "glob",
-      "electron-squirrel-startup",
-      "ipc",
-      "keytar"
+      "app", 
+      "auto-updater", 
+      "bootstrap", 
+      "browser-window", 
+      "clipboard",
+      "crash-reporter", 
+      "dialog", 
+      "electron-squirrel-startup", 
+      "font-awesome", 
+      "glob", 
+      "ipc", 
+      "jade", 
+      "keytar", 
+      "menu", 
+      "octicons", 
+      "scout-server"
     ]
   },
   "fonts": [
@@ -74,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",
diff --git a/src/connect/index.js b/src/connect/index.js
@@ -1,15 +1,23 @@
-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 format = require('util').format;
 var metrics = require('mongodb-js-metrics');
 
+var remote = window.require('remote');
+var dialog = remote.require('dialog');
+var Clipboard = remote.require('clipboard');
+var BrowserWindow = remote.require('browser-window');
+
+var debug = require('debug')('scout:connect:index');
+
 /**
  * AuthenticationOptionCollection
  */
@@ -61,6 +69,10 @@ var ConnectView = View.extend({
     previousSslMethod: {
       type: 'string',
       default: null
+    },
+    clipboardText: {
+      type: 'string',
+      default: ''
     }
   },
   derived: {
@@ -223,15 +235,60 @@ var ConnectView = View.extend({
     });
 
     this.registerSubview(this.form);
+
     this.listenToAndRun(this, 'change:authMethod',
       this.replaceAuthMethodFields.bind(this));
+
     this.listenToAndRun(this, 'change:sslMethod',
       this.replaceSslMethodFields.bind(this));
 
+    this.listenToAndRun(app, 'connect-window-focused',
+      this.onConnectWindowFocused.bind(this));
+
     // always start in NEW_EMPTY state
     this.dispatch('new connection clicked');
   },
 
+  // === MongoDB URI clipboard Handling
+
+  /**
+   * Called when the user clicked "YES" in the message dialog after
+   * a MongoDB URI was detected.
+   */
+  autofillFromClipboard: function() {
+    this.connection = MongoDBConnection.from(this.clipboardText);
+    this.updateForm();
+  },
+
+  /**
+   * Called when the Connect Window receives focus.
+   */
+  onConnectWindowFocused: function() {
+    var clipboardText = Clipboard.readText();
+    if (clipboardText === this.clipboardText) {
+      // we have seen this value already, don't ask user again
+      return;
+    }
+    this.clipboardText = clipboardText;
+
+    if (MongoDBConnection.isURI(clipboardText)) {
+      debug('MongoDB URI detected.', clipboardText);
+      // ask user if Compass should use it to fill out form
+      dialog.showMessageBox(BrowserWindow.getFocusedWindow(), {
+        type: 'info',
+        message: 'MongoDB connection string detected',
+        detail: 'Compass detected a MongoDB connection string in your '
+          + 'clipboard. Do you want to use the connection string to '
+          + 'fill out this form?',
+        buttons: ['Yes', 'No']
+      }, function(response) {
+        if (response === 0) {
+          this.autofillFromClipboard();
+        }
+      }.bind(this));
+    }
+  },
+
   connectionNameEmptyChanged: function() {
     if (this.connectionNameEmpty) {
       this.dispatch('name removed');
@@ -240,7 +297,6 @@ var ConnectView = View.extend({
     }
   },
 
-
   // === External hooks
 
   /**
diff --git a/src/electron/window-manager.js b/src/electron/window-manager.js
@@ -3,26 +3,29 @@
  * [BrowserWindow](https://github.com/atom/electron/blob/master/docs/api/browser-window.md)
  * class
  */
-var path = require('path');
-var _ = require('lodash');
-var app = require('app');
+
 var AppMenu = require('./menu');
 var BrowserWindow = require('browser-window');
+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 Notifier = require('node-notifier');
 
 /**
  * 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
@@ -36,6 +39,38 @@ var connectWindow;
 // since this code was laid down.
 var windowsOpenCount = 0;
 
+function isConnectDialog(url) {
+  return url === DEFAULT_URL;
+}
+
+// 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
+function isSingleInstance(_window) {
+  var isNotSingle = app.makeSingleInstance(function(commandLine, workingDirectory) {
+    debug('Someone tried to run a second instance! We should focus our window', {
+      commandLine: commandLine,
+      workingDirectory: workingDirectory
+    });
+    if (_window) {
+      if (_window.isMinimized()) {
+        _window.restore();
+      }
+      _window.focus();
+    }
+    return true;
+  });
+
+  return !isNotSingle;
+}
+
+function openDevTools() {
+  debug('openDevTools()');
+  AppMenu.lastFocusedWindow.openDevTools({
+    detach: true
+  });
+}
+
 /**
  * Call me instead of using `new BrowserWindow()` directly because i'll:
  *
@@ -66,23 +101,7 @@ module.exports.create = function(opts) {
   });
   AppMenu.load(_window);
 
-  // makes the application a single instance application
-  // see "app.makeSingleInstance" in https://github.com/atom/electron/blob/master/docs/api/app.md
-  var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
-    debug('Someone tried to run a second instance! We should focus our window', {
-      commandLine: commandLine,
-      workingDirectory: workingDirectory
-    });
-    if (_window) {
-      if (_window.isMinimized()) {
-        _window.restore();
-      }
-      _window.focus();
-    }
-    return true;
-  });
-
-  if (shouldQuit) {
+  if (!isSingleInstance(_window)) {
     app.quit();
     return null;
   }
@@ -99,9 +118,13 @@ module.exports.create = function(opts) {
     });
   });
 
-  if (opts.url === DEFAULT_URL) { // if it's the connect dialog
+  if (isConnectDialog(opts.url)) {
     AppMenu.hideConnect(_window);
     connectWindow = _window;
+    connectWindow.on('focus', function() {
+      debug('connect window focused.');
+      connectWindow.webContents.send('message', 'connect-window-focused');
+    });
     connectWindow.on('closed', function() {
       debug('connect window closed.');
       connectWindow = null;
@@ -167,10 +190,17 @@ app.on('show share submenu', function() {
 app.on('show bugsnag OS notification', function(errorMsg) {
   if (_.contains(['development', 'testing'], process.env.NODE_ENV)) {
     Notifier.notify({
-      'icon': RESOURCES + '/images/scout.png',
+      'icon': SCOUT_ICON_PATH,
       'message': errorMsg,
       'title': 'MongoDB Compass Exception',
       'wait': true
+    }, function(err, resp) {
+      if (err) {
+        debug(err);
+      }
+      if (resp === 'Activate\n') {
+        openDevTools();
+      }
     });
   }
 });
@@ -183,12 +213,6 @@ app.on('show bugsnag OS notification', function(errorMsg) {
  */
 app.on('ready', function() {
   app.emit('show connect dialog');
-
-  Notifier.on('click', function() {
-    AppMenu.lastFocusedWindow.openDevTools({
-      detach: true
-    });
-  });
 });
 
 var ipc = require('ipc');
