From 235bdbee14b0c8aa51558579d67146772386e616 Mon Sep 17 00:00:00 2001
From: Saurabh Singh <saurabh500@gmail.com>
Date: Wed, 20 May 2026 18:02:00 -0700
Subject: [PATCH 1/2] feat(sqlserver): add Encrypt dropdown to connection
 dialog

Adds an Encrypt selector (Yes/No/Strict) to the New Connection
modal when driver is SQL Server. Frontend-only wiring; backend
already supports the encrypt field on ConnectionParams.

Note (draft): the new field still needs to be threaded through
connection save/load (Config mapping) before this can ship.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/components/modals/NewConnectionModal.tsx | 25 ++++++++++++++++++++
 src/i18n/locales/en.json                     |  6 +++++
 2 files changed, 31 insertions(+)

diff --git a/src/components/modals/NewConnectionModal.tsx b/src/components/modals/NewConnectionModal.tsx
index d22d2866..c03b670f 100644
--- a/src/components/modals/NewConnectionModal.tsx
+++ b/src/components/modals/NewConnectionModal.tsx
@@ -45,6 +45,9 @@ interface ConnectionParams {
   ssl_ca?: string;
   ssl_cert?: string;
   ssl_key?: string;
+  // SQL Server
+  encrypt?: string;
+  trust_server_certificate?: boolean;
   // SSH
   ssh_enabled?: boolean;
   ssh_connection_id?: string;
@@ -126,6 +129,7 @@ export const NewConnectionModal = ({
     username: "",
     database: "",
     ssl_mode: "",
+    encrypt: "",
     ssh_enabled: false,
     ssh_port: 22,
   });
@@ -365,6 +369,7 @@ export const NewConnectionModal = ({
       password: "",
       database: "",
       ssl_mode: "",
+      encrypt: "",
       ssh_enabled: false,
       ssh_connection_id: undefined,
       ssh_host: undefined,
@@ -694,6 +699,26 @@ export const NewConnectionModal = ({
             />
           </div>
 
+          {/* Encrypt (SQL Server only) */}
+          {driver === "sqlserver" && (
+            <div className="flex flex-col gap-1">
+              <label className="text-[10px] uppercase font-semibold tracking-wider text-muted">
+                {t("newConnection.encrypt", { defaultValue: "Encrypt" })}
+              </label>
+              <Select
+                value={formData.encrypt || "yes"}
+                options={["yes", "no", "strict"]}
+                labels={{
+                  yes: t("newConnection.encryptModes.yes", { defaultValue: "Yes" }),
+                  no: t("newConnection.encryptModes.no", { defaultValue: "No" }),
+                  strict: t("newConnection.encryptModes.strict", { defaultValue: "Strict" }),
+                }}
+                onChange={(v) => updateField("encrypt", v)}
+                searchable={false}
+              />
+            </div>
+          )}
+
           {/* User + Password */}
           <div className="grid grid-cols-2 gap-3">
             <FieldInput
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index a0097101..98315dfd 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -617,6 +617,12 @@
       "allow": "Allow",
       "prefer": "Prefer",
       "require": "Require"
+    },
+    "encrypt": "Encrypt",
+    "encryptModes": {
+      "yes": "Yes",
+      "no": "No",
+      "strict": "Strict"
     }
   },
   "sshConnections": {

From 6c80dc0079e6d44add66d40a9f1311bcab761483 Mon Sep 17 00:00:00 2001
From: Saurabh Singh <saurabh500@gmail.com>
Date: Wed, 20 May 2026 23:03:02 -0700
Subject: [PATCH 2/2] fix: normalize encrypt field default and add to canonical
 TS types

- Change encrypt default from empty string to undefined; backend already
  defaults to EncryptionLevel::On when None, matching 'yes' behavior
- Normalize empty encrypt string on save to avoid stale '' values from
  old connections
- Add encrypt, trust_server_certificate, auth_mode to canonical
  ConnectionParams in connections.ts and credentials.ts

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/components/modals/NewConnectionModal.tsx | 5 +++--
 src/utils/connections.ts                     | 5 +++++
 src/utils/credentials.ts                     | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/modals/NewConnectionModal.tsx b/src/components/modals/NewConnectionModal.tsx
index c03b670f..fac6e3ac 100644
--- a/src/components/modals/NewConnectionModal.tsx
+++ b/src/components/modals/NewConnectionModal.tsx
@@ -129,7 +129,7 @@ export const NewConnectionModal = ({
     username: "",
     database: "",
     ssl_mode: "",
-    encrypt: "",
+    encrypt: undefined,
     ssh_enabled: false,
     ssh_port: 22,
   });
@@ -369,7 +369,7 @@ export const NewConnectionModal = ({
       password: "",
       database: "",
       ssl_mode: "",
-      encrypt: "",
+      encrypt: undefined,
       ssh_enabled: false,
       ssh_connection_id: undefined,
       ssh_host: undefined,
@@ -485,6 +485,7 @@ export const NewConnectionModal = ({
       if (initialConnection) {
         if (!params.password?.trim()) delete params.password;
         if (!params.ssh_password?.trim()) delete params.ssh_password;
+        if (!params.encrypt?.trim()) delete params.encrypt;
         await invoke("update_connection", {
           id: initialConnection.id,
           name,
diff --git a/src/utils/connections.ts b/src/utils/connections.ts
index ece0aca2..03e14f21 100644
--- a/src/utils/connections.ts
+++ b/src/utils/connections.ts
@@ -19,6 +19,11 @@ export interface ConnectionParams {
   port?: number;
   username?: string;
   password?: string;
+  ssl_mode?: string;
+  // SQL Server
+  encrypt?: string;
+  trust_server_certificate?: boolean;
+  auth_mode?: string;
   ssh_enabled?: boolean;
   ssh_connection_id?: string;
   // Legacy fields (for backward compatibility)
diff --git a/src/utils/credentials.ts b/src/utils/credentials.ts
index 96359984..75899171 100644
--- a/src/utils/credentials.ts
+++ b/src/utils/credentials.ts
@@ -8,6 +8,10 @@ interface ConnectionParams {
   password?: string;
   database: string | string[];
   ssl_mode?: string;
+  // SQL Server
+  encrypt?: string;
+  trust_server_certificate?: boolean;
+  auth_mode?: string;
   ssh_enabled?: boolean;
   ssh_connection_id?: string;
   ssh_host?: string;