Merge branch 'connection-form-fixes' into 'enterprise'

fix(connection-form): validation on file fields, clear db fields

See merge request dkinternal/testgen/dataops-testgen!326

Author: ci bot

testgen/ui/components/frontend/js/components/connection_form.js

@@ -22,6 +22,7 @@
  * @property {string} connection_name
  * @property {string} sql_flavor
  * @property {string} sql_flavor_code
+ * @property {string} project_code
  * @property {string} project_host
  * @property {string} project_port
  * @property {string} project_db
@@ -1005,7 +1006,7 @@ const SnowflakeForm = (
                                 isValid.val = Object.values(validityPerField).every(v => v);
                             },
                             validators: [
-                                required,
+                                requiredIf(() => !originalConnection?.connection_id || !originalConnection?.private_key),
                                 sizeLimit(200 * 1024 * 1024),
                             ],
                         }),
@@ -1057,7 +1058,7 @@ const BigqueryForm = (
     });
 
     van.derive(() => {
-        onChange({ service_account_key: serviceAccountKey.val }, serviceAccountKeyFileRaw.val, isValid.val);
+        onChange({ service_account_key: serviceAccountKey.val, project_db: projectId.val }, serviceAccountKeyFileRaw.val, isValid.val);
     });
 
     return div(
@@ -1087,24 +1088,20 @@ const BigqueryForm = (
                                 isFieldValid = false;
                             }
                             serviceAccountKeyFileRaw.val = value;
+                            validityPerField['service_account_key'] = isFieldValid;
+                            isValid.val = Object.values(validityPerField).every(v => v);
                         },
                         validators: [
+                            requiredIf(() => !originalConnection?.connection_id || !originalConnection?.service_account_key),
                             sizeLimit(20 * 1024),
                         ],
                     }),
                 );
             },
 
             div(
-                { class: 'flex-row fx-gap-3 fx-flex' },
-                Input({
-                    name: 'project_id',
-                    label: 'Project ID',
-                    value: projectId,
-                    height: 38,
-                    class: 'fx-flex',
-                    disabled: true,
-                }),
+                { class: 'text-caption text-right' },
+                `Project ID: ${projectId.val}`,
             ),
         ),
     );

testgen/ui/components/frontend/js/pages/project_dashboard.js

@@ -164,7 +164,7 @@ const TableGroupLatestProfile = (/** @type TableGroupSummary */ tableGroup) => {
     const daysAgo = Math.round((new Date() - new Date(tableGroup.latest_profile_start * 1000)) / (1000 * 60 * 60 * 24));
 
     return div(
-        { class: 'flex-row tg-overview--row', style: 'width: calc(100% - 115px);' },
+        { class: 'flex-row tg-overview--row' },
         div(
             { class: 'flex-row fx-gap-2', style: 'flex: 1 1 50%;' },
             span('Latest profile:'),
@@ -186,6 +186,7 @@ const TableGroupLatestProfile = (/** @type TableGroupSummary */ tableGroup) => {
                     run_id: tableGroup.latest_profile_id,
                 },
                 width: 150,
+                style: 'flex: 0 0 auto;',
             }),
             tableGroup.latest_anomalies_ct
             ? SummaryCounts({
@@ -198,6 +199,7 @@ const TableGroupLatestProfile = (/** @type TableGroupSummary */ tableGroup) => {
             })
             : '',
         ),
+        div({ style: 'flex: 1 1 120px;' })
     );
 };
 

testgen/ui/views/connections.py

@@ -51,6 +51,12 @@ class ConnectionsPage(Page):
         "url",
         "http_path",
     ]
+    encrypted_fields: typing.ClassVar[list[str]] = [
+        "project_pw_encrypted",
+        "private_key",
+        "private_key_passphrase",
+        "service_account_key",
+    ]
 
     def render(self, project_code: str, **_kwargs) -> None:
         testgen.page_header(
@@ -95,25 +101,23 @@ def on_save_connection_clicked(updated_connection):
 
             if updated_connection.get("connect_by_key"):
                 updated_connection["project_pw_encrypted"] = ""
-                if is_pristine(updated_connection["private_key_passphrase"]):
+                if is_pristine(updated_connection.get("private_key_passphrase")):
                     del updated_connection["private_key_passphrase"]
+                elif updated_connection.get("private_key_passphrase") == CLEAR_SENTINEL:
+                    updated_connection["private_key_passphrase"] = ""
+
+                if is_pristine(updated_connection.get("private_key")):
+                    del updated_connection["private_key"]
+                else:
+                    updated_connection["private_key"] = base64.b64decode(updated_connection["private_key"]).decode()
             else:
                 updated_connection["private_key"] = ""
                 updated_connection["private_key_passphrase"] = ""
 
-            if updated_connection.get("private_key_passphrase") == CLEAR_SENTINEL:
-                updated_connection["private_key_passphrase"] = ""
-
-            if is_pristine(updated_connection.get("private_key")):
-                del updated_connection["private_key"]
-            else:
-                updated_connection["private_key"] = base64.b64decode(updated_connection["private_key"]).decode()
-
-            if is_pristine(updated_connection.get("project_pw_encrypted")):
-                del updated_connection["project_pw_encrypted"]
-
-            if updated_connection.get("project_pw_encrypted") == CLEAR_SENTINEL:
-                updated_connection["project_pw_encrypted"] = ""
+                if is_pristine(updated_connection.get("project_pw_encrypted")):
+                    del updated_connection["project_pw_encrypted"]
+                elif updated_connection.get("project_pw_encrypted") == CLEAR_SENTINEL:
+                    updated_connection["project_pw_encrypted"] = ""
 
             updated_connection["sql_flavor"] = self._get_sql_flavor_from_value(updated_connection["sql_flavor_code"]).flavor
 
@@ -204,6 +208,8 @@ def _sanitize_connection_input(self, connection: dict) -> dict:
             sanitized_value = value
             if isinstance(value, str) and key in self.trim_fields:
                 sanitized_value = value.strip()
+            if isinstance(value, str) and key in self.encrypted_fields:
+                sanitized_value = value if value != "" else None
             sanitized_connection_input[key] = sanitized_value
         return sanitized_connection_input