Allow to cancel loader window when connecting to server #105

Paxa · Oct 17, 2020 · c27da86 · c27da86
1 parent bc53845
commit c27da86
Show file tree

Hide file tree

Showing 9 changed files with 265 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### Version 0.9.0
+
+* Fix ssl connection & heroku connection (Thanks to [https://github.com/egallup02360](@egallup02360) #95)
+* Postgres 12 support
+* Update to electron 10.1.2
+* Fix "Snippets" and "See History" on windows (Thanks to [https://github.com/mastazi](@mastazi) #118)
+* Allow to cancel loader window when connecting to server
+
 ### Version 0.8.4 (20-nov-2019)
 
 * Fix `electron.systemPreferences.subscribeNotification` is not a function

diff --git a/app.js b/app.js
@@ -306,7 +306,19 @@ global.App = {
   },
 
   openConnection: function (options, connectionName, callback) {
-    this.startLoading("Connecting...");
+    var showConnectionError = true;
+    var runCallback = true;
+
+    this.startLoading("Connecting...", 500, {
+      cancel() {
+        App.stopRunningQuery();
+        App.stopLoading();
+        showConnectionError = false
+        if (callback) callback(false);
+        runCallback = false
+      }
+    });
+    //this.startLoading("Connecting...");
 
     if (typeof options == 'string') {
       options = Connection.parseConnectionString(options);
@@ -321,13 +333,17 @@ global.App = {
       if (status) {
         var tab = this.addDbScreen(conn, connectionName, options);
         tab.activate();
-        if (callback) callback(tab);
+        if (callback && runCallback) callback(tab);
       } else {
-        $u.alertError("Connection error", {
-          detail: this.humanErrorMessage(error)
-        });
+        if (showConnectionError) {
+          $u.alertError("Connection error", {
+            detail: this.humanErrorMessage(error)
+          });
+        } else {
+          console.error(error)
+        }
         //window.alertify.alert(this.humanErrorMessage(message));
-        if (callback) callback(false);
+        if (callback && runCallback) callback(false);
       }
     });
   },

diff --git a/app/connection.js b/app/connection.js
@@ -244,6 +244,7 @@ class Connection {
   _initConnection(connectString) /*: pg.ClientExt */ {
     // @ts-ignore
     var clientConfig = Connection.parseConnectionString(connectString) /*:: as pg.ClientConfig */;
+    // clientConfig.connectionTimeoutMillis = 10000; // 10 sec
     return new pg.Client(clientConfig) /*:: as pg.ClientExt */;
   }
 

diff --git a/app/login_components/login_postgres_url_form.js b/app/login_components/login_postgres_url_form.js
@@ -80,7 +80,14 @@ class LoginPostgresUrlForm {
   }
 
   testConnection () {
-    App.startLoading("Connecting...");
+    var showConnectionError = true;
+    App.startLoading("Connecting...", 500, {
+      cancel() {
+        App.stopRunningQuery();
+        App.stopLoading();
+        showConnectionError = false;
+      }
+    });
 
     var options = this.getFormData();
     var conn = new Connection();
@@ -90,7 +97,14 @@ class LoginPostgresUrlForm {
         window.alertify.alert("Successfully connected!");
         conn.close();
       } else {
-        window.alertify.alert(App.humanErrorMessage(error));
+        if (showConnectionError) {
+          $u.alertError("Connection Error", {
+            detail: App.humanErrorMessage(error)
+          });
+        } else {
+          console.error(error)
+        }
+        //window.alertify.alert(App.humanErrorMessage(error));
       }
     });
   }

diff --git a/app/login_components/login_standard_form.js b/app/login_components/login_standard_form.js
@@ -99,9 +99,12 @@ class LoginStandardForm {
   }
 
   testConnection () {
-    App.startLoading("Connecting...", 100, {
+    var showConnectionError = true;
+    App.startLoading("Connecting...", 500, {
       cancel() {
+        App.stopRunningQuery();
         App.stopLoading();
+        showConnectionError = false;
       }
     });
 
@@ -113,9 +116,13 @@ class LoginStandardForm {
         window.alertify.alert("Successfully connected!");
         conn.close();
       } else {
-        $u.alertError("Connection Error", {
-          detail: App.humanErrorMessage(error)
-        });
+        if (showConnectionError) {
+          $u.alertError("Connection Error", {
+            detail: App.humanErrorMessage(error)
+          });
+        } else {
+          console.error(error)
+        }
         //window.alertify.alert(App.humanErrorMessage(message));
       }
     });

diff --git a/app/login_screen.js b/app/login_screen.js
@@ -28,7 +28,7 @@ class LoginScreen {
     if (this.connections.find('li:first').length) {
       this.connections.find('li:first').click();
     } else {
-      this.fillForm({user: process.env.USER});
+      this.fillForm({user: process.env.USER || 'user'});
     }
 
     this.initEvents(this.content);
@@ -262,7 +262,7 @@ class LoginScreen {
     if (autoConnect) {
       var connection = this.savedConnections[autoConnect];
       console.log("Connecting to auto-connect saved connection: " + autoConnect, connection);
-      App.startLoading("Connecting...", 50, {
+      App.startLoading("Connecting...", 500, {
         cancel() {
           App.stopRunningQuery();
           App.stopLoading();

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "@types/pg": "^7.14.5",
     "@types/semver": "~7.3.4",
     "electron": "10.1.3",
-    "electron-builder": "^22.8.1",
+    "electron-builder": "^22.9.1",
     "electron-mocha": "^9.2.0",
     "electron-rebuild": "2.2.0",
     "eslint": "^7.11.0",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "colors": "^1.4.0",
-    "connection-string": "4.2.0",
+    "connection-string": "4.2.1",
     "cross-env": "^7.0.2",
     "csv-stringify": "^5.5.1",
     "electron-window-state": "5.0.3",
@@ -48,7 +48,7 @@
     "moment": "^2.29.1",
     "needle": "2.5.2",
     "open-ssh-tunnel": "^0.3.1",
-    "pg": "8.3.3",
+    "pg": "8.4.1",
     "pg-escape": "^0.2.0",
     "pug": "3.0.0",
     "raven": "2.6.4",