chore: improve styles, fix unit tests

Author: Helias

apps/keira/src/assets/i18n/en.json

@@ -54,7 +54,7 @@
     "SSH_HOST": "SSH Host",
     "SSH_PORT": "SSH Port",
     "SSH_USER": "SSH User",
-    "SSH_PASSWORD": "SSH Password / Passphrase",
+    "SSH_PASSWORD": "SSH Password",
     "SSH_PRIVATE_KEY": "Private Key",
     "SSH_KEY_PLACEHOLDER": "Optional - browse to select key file",
     "SAVE_PASSWORD": "Save password",

libs/main/connection-window/src/connection-window.component.scss

@@ -157,7 +157,7 @@ $secondary-color-green: #b7e2ad;
           border: 0 !important;
 
           i {
-            margin-right: 10px;
+            margin-right: 5px;
             margin-bottom: 2px;
           }
         }
@@ -173,6 +173,14 @@ $secondary-color-green: #b7e2ad;
         border-left: 2px solid rgba(255, 255, 255, 0.3);
         padding-left: 10px;
         margin-bottom: 4px;
+
+        .input-group-prepend {
+          width: 145px;
+
+          .input-group-text {
+            width: 145px;
+          }
+        }
       }
 
       .connect-button {

libs/main/connection-window/src/connection-window.component.spec.ts

@@ -143,6 +143,12 @@ describe('ConnectionWindowComponent', () => {
       password: 'root',
       database: 'acore_world',
       sslEnabled: true,
+      sshEnabled: false,
+      sshHost: '',
+      sshPort: 22,
+      sshUser: '',
+      sshPassword: '',
+      sshPrivateKey: '',
       ssl: { rejectUnauthorized: false },
     });
     expect(component.error).toBeUndefined();
@@ -165,6 +171,12 @@ describe('ConnectionWindowComponent', () => {
       password: 'helias123',
       database: 'helias_world',
       sslEnabled: false,
+      sshEnabled: false,
+      sshHost: '',
+      sshPort: 22,
+      sshUser: '',
+      sshPassword: '',
+      sshPrivateKey: '',
     });
 
     expect(component.error).toBeUndefined();
@@ -188,7 +200,20 @@ describe('ConnectionWindowComponent', () => {
     page.clickElement(page.connectBtn);
 
     expect(connectSpy).toHaveBeenCalledTimes(1);
-    expect(connectSpy).toHaveBeenCalledWith({ host, port, user, password, database, sslEnabled: false });
+    expect(connectSpy).toHaveBeenCalledWith({
+      host,
+      port,
+      user,
+      password,
+      database,
+      sslEnabled: false,
+      sshEnabled: false,
+      sshHost: '',
+      sshPort: 22,
+      sshUser: '',
+      sshPassword: '',
+      sshPrivateKey: '',
+    });
     expect(component.error).toBeUndefined();
     expect(page.errorElement.innerHTML).not.toContain('error-box');
   });
@@ -266,6 +291,12 @@ describe('ConnectionWindowComponent', () => {
         password,
         database: 'helias_world',
         sslEnabled: false,
+        sshEnabled: false,
+        sshHost: '',
+        sshPort: 22,
+        sshUser: '',
+        sshPassword: '',
+        sshPrivateKey: '',
       });
       expect(connectSpy).toHaveBeenCalledTimes(1);
       expect(connectSpy).toHaveBeenCalledWith({
@@ -275,6 +306,12 @@ describe('ConnectionWindowComponent', () => {
         password,
         database: 'helias_world',
         sslEnabled: false,
+        sshEnabled: false,
+        sshHost: '',
+        sshPort: 22,
+        sshUser: '',
+        sshPassword: '',
+        sshPrivateKey: '',
       });
     });
 
@@ -295,6 +332,12 @@ describe('ConnectionWindowComponent', () => {
         password: '',
         database: 'helias_world',
         sslEnabled: false,
+        sshEnabled: false,
+        sshHost: '',
+        sshPort: 22,
+        sshUser: '',
+        sshPassword: '',
+        sshPrivateKey: '',
       });
       expect(connectSpy).toHaveBeenCalledTimes(1);
       expect(connectSpy).toHaveBeenCalledWith({
@@ -304,6 +347,12 @@ describe('ConnectionWindowComponent', () => {
         password: 'helias123',
         database: 'helias_world',
         sslEnabled: false,
+        sshEnabled: false,
+        sshHost: '',
+        sshPort: 22,
+        sshUser: '',
+        sshPassword: '',
+        sshPrivateKey: '',
       });
     });
   });

libs/main/connection-window/src/connection-window.component.ts

@@ -71,7 +71,7 @@ export class ConnectionWindowComponent extends SubscriptionHandler implements On
     if (this.configs?.length > 0) {
       // get last saved config
       const lastConfig = this.configs[this.configs.length - 1];
-      this.form.setValue(lastConfig);
+      this.form.patchValue(lastConfig);
 
       if (!this.form.getRawValue().password) {
         this.savePassword = false;
@@ -84,7 +84,7 @@ export class ConnectionWindowComponent extends SubscriptionHandler implements On
   }
 
   loadConfig(config: Partial<KeiraConnectionOptions>): void {
-    this.form.setValue(config);
+    this.form.patchValue(config);
   }
 
   removeAllConfigs(): void {

libs/shared/db-layer/src/mysql.service.ts

@@ -166,7 +166,7 @@ export class MysqlService {
     console.info(`DB connection lost. Reconnecting in ${RECONNECTION_TIME_MS} ms...`);
 
     setTimeout(() => {
-      if (this.config.sshEnabled) {
+      if (this.config?.sshEnabled) {
         this.connectViaSshTunnel(this.config).subscribe({
           next: () => this.reconnectCallback(null),
           error: () => this.reconnect(),