fix: address PR review - profile validation, secret cleanup, edit vs prefill

Author: datlechin

TablePro/Views/Connection/ConnectionFormView.swift

@@ -1050,12 +1050,6 @@ struct ConnectionFormView: View { // swiftlint:disable:this type_body_length
             sshProfileId = existing.sshProfileId
             sshEnabled = existing.sshConfig.enabled
 
-            // When using a profile, also set sshEnabled based on profile existence
-            if let profileId = existing.sshProfileId,
-               SSHProfileStorage.shared.profile(for: profileId) != nil {
-                sshEnabled = true
-            }
-
             sshHost = existing.sshConfig.host
             sshPort = String(existing.sshConfig.port)
             sshUsername = existing.sshConfig.username
@@ -1199,6 +1193,11 @@ struct ConnectionFormView: View { // swiftlint:disable:this type_body_length
             } else {
                 storage.deleteTOTPSecret(for: connectionToSave.id)
             }
+        } else {
+            // Clean up stale per-connection SSH secrets when using a profile or SSH disabled
+            storage.deleteSSHPassword(for: connectionToSave.id)
+            storage.deleteKeyPassphrase(for: connectionToSave.id)
+            storage.deleteTOTPSecret(for: connectionToSave.id)
         }
 
         // Save to storage

TablePro/Views/Connection/SSHProfileEditorView.swift

@@ -49,11 +49,19 @@ struct SSHProfileEditorView: View {
     @State private var showingDeleteConfirmation = false
     @State private var connectionsUsingProfile = 0
 
-    private var isEditing: Bool { existingProfile != nil }
+    private var isStoredProfile: Bool {
+        guard let profile = existingProfile else { return false }
+        return SSHProfileStorage.shared.profile(for: profile.id) != nil
+    }
 
     private var isValid: Bool {
-        !profileName.trimmingCharacters(in: .whitespaces).isEmpty
-            && !host.trimmingCharacters(in: .whitespaces).isEmpty
+        let nameValid = !profileName.trimmingCharacters(in: .whitespaces).isEmpty
+        let hostValid = !host.trimmingCharacters(in: .whitespaces).isEmpty
+        let portValid = port.isEmpty || (Int(port).map { (1...65_535).contains($0) } ?? false)
+        let authValid = authMethod == .password || authMethod == .sshAgent
+            || authMethod == .keyboardInteractive || !privateKeyPath.isEmpty
+        let jumpValid = jumpHosts.allSatisfy(\.isValid)
+        return nameValid && hostValid && portValid && authValid && jumpValid
     }
 
     private var resolvedAgentSocketPath: String {
@@ -266,7 +274,7 @@ struct SSHProfileEditorView: View {
 
     private var bottomBar: some View {
         HStack {
-            if isEditing {
+            if isStoredProfile {
                 Button(role: .destructive) {
                     connectionsUsingProfile = ConnectionStorage.shared.loadConnections()
                         .filter { $0.sshProfileId == existingProfile?.id }.count
@@ -294,7 +302,7 @@ struct SSHProfileEditorView: View {
             Button("Cancel") { dismiss() }
                 .keyboardShortcut(.cancelAction)
 
-            Button(isEditing ? "Save" : "Create") { saveProfile() }
+            Button(isStoredProfile ? "Save" : "Create") { saveProfile() }
                 .keyboardShortcut(.defaultAction)
                 .disabled(!isValid)
         }
@@ -349,7 +357,7 @@ struct SSHProfileEditorView: View {
             totpPeriod: totpPeriod
         )
 
-        if isEditing {
+        if isStoredProfile {
             SSHProfileStorage.shared.updateProfile(profile)
         } else {
             SSHProfileStorage.shared.addProfile(profile)