fix: 7 pre-ship fixes — force unwrap, toolbar collision, alert text, pagination, defer, localization

Author: datlechin

TableProMobile/TableProMobile/Views/ConnectedView.swift

@@ -23,7 +23,7 @@ struct ConnectedView: View {
     @State private var showFailureAlert = false
     @State private var selectedTab = ConnectedTab.tables
     @State private var queryHistory: [QueryHistoryItem] = []
-    private let historyStorage = QueryHistoryStorage()
+    @State private var historyStorage = QueryHistoryStorage()
     @State private var databases: [String] = []
     @State private var activeDatabase: String = ""
     @State private var schemas: [String] = []

TableProMobile/TableProMobile/Views/ConnectionFormView.swift

@@ -98,7 +98,7 @@ struct ConnectionFormView: View {
                 _sshAuthMethod = State(initialValue: ssh.authMethod)
                 _sshKeyPath = State(initialValue: ssh.privateKeyPath ?? "")
                 _sshKeyContent = State(initialValue: ssh.privateKeyData ?? "")
-                if ssh.privateKeyData != nil && !ssh.privateKeyData!.isEmpty {
+                if let keyData = ssh.privateKeyData, !keyData.isEmpty {
                     _sshKeyInputMode = State(initialValue: .paste)
                 }
             }
@@ -603,7 +603,7 @@ struct ConnectionFormView: View {
         }
 
         if storageFailed {
-            credentialError = "Some credentials could not be saved to the keychain. You may need to re-enter them later."
+            credentialError = String(localized: "Some credentials could not be saved to the keychain. You may need to re-enter them later.")
             showCredentialError = true
         }
 

TableProMobile/TableProMobile/Views/DataBrowserView.swift

@@ -385,6 +385,9 @@ struct DataBrowserView: View {
             let result = try await session.driver.execute(query: query)
             columns = result.columns
             rows = result.rows
+            if rows.count < pagination.pageSize, pagination.totalRows == nil {
+                pagination.totalRows = pagination.currentOffset + rows.count
+            }
             if columnDetails.isEmpty {
                 columnDetails = try await session.driver.fetchColumns(table: table.name, schema: nil)
             }

TableProMobile/TableProMobile/Views/GroupManagementView.swift

@@ -64,16 +64,14 @@ struct GroupManagementView: View {
             .navigationTitle("Groups")
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button("Done") { dismiss() }
-                }
                 ToolbarItemGroup(placement: .topBarTrailing) {
                     EditButton()
                     Button {
                         showingAddGroup = true
                     } label: {
                         Image(systemName: "plus")
                     }
+                    Button("Done") { dismiss() }
                 }
             }
             .sheet(isPresented: $showingAddGroup) {

TableProMobile/TableProMobile/Views/InsertRowView.swift

@@ -137,7 +137,7 @@ struct InsertRowView: View {
                 Button("OK", role: .cancel) {}
             } message: {
                 if let recovery = operationError?.recovery {
-                    Text("\(operationError?.message ?? "")\n\(recovery)")
+                    Text(verbatim: "\(operationError?.message ?? "") \(recovery)")
                 } else {
                     Text(operationError?.message ?? "")
                 }

TableProMobile/TableProMobile/Views/QueryEditorView.swift

@@ -344,6 +344,7 @@ struct QueryEditorView: View {
 
         editorFocused = false
         isExecuting = true
+        defer { isExecuting = false }
         appError = nil
         result = nil
 
@@ -359,7 +360,5 @@ struct QueryEditorView: View {
             let context = ErrorContext(operation: "executeQuery")
             self.appError = ErrorClassifier.classify(error, context: context)
         }
-
-        isExecuting = false
     }
 }

TableProMobile/TableProMobile/Views/RowDetailView.swift

@@ -205,7 +205,7 @@ struct RowDetailView: View {
             Button("OK", role: .cancel) {}
         } message: {
             if let recovery = operationError?.recovery {
-                Text("\(operationError?.message ?? "")\n\(recovery)")
+                Text(verbatim: "\(operationError?.message ?? "") \(recovery)")
             } else {
                 Text(operationError?.message ?? "")
             }