fix: polish SQL favorites — accessibility, delete confirmation, localization, edge cases

Author: datlechin

TablePro/Views/Main/Extensions/MainContentCoordinator+Favorites.swift

@@ -6,10 +6,15 @@
 import Foundation
 
 extension MainContentCoordinator {
-    /// Insert a favorite's query into the current editor tab
+    /// Insert a favorite's query into the current editor tab.
+    /// If the current tab is not a query tab, opens a new query tab instead.
     func insertFavorite(_ favorite: SQLFavorite) {
-        guard let tabIndex = tabManager.selectedTabIndex else { return }
-        tabManager.tabs[tabIndex].query = favorite.query
+        if let tabIndex = tabManager.selectedTabIndex,
+           tabManager.tabs[tabIndex].tabType == .query {
+            tabManager.tabs[tabIndex].query = favorite.query
+        } else {
+            runFavoriteInNewTab(favorite)
+        }
     }
 
     /// Open a favorite's query in a new tab

TablePro/Views/Sidebar/FavoriteEditDialog.swift

@@ -20,6 +20,7 @@ struct FavoriteEditDialog: View {
     @State private var keyword: String = ""
     @State private var isGlobal: Bool = true
     @State private var keywordError: String?
+    @State private var isKeywordWarning = false
     @State private var isSaving = false
 
     private var isEditing: Bool { favorite != nil }
@@ -57,7 +58,7 @@ struct FavoriteEditDialog: View {
                 if let error = keywordError {
                     LabeledContent {} label: {
                         Text(error)
-                            .foregroundStyle(error.hasPrefix("Warning") ? .orange : .red)
+                            .foregroundStyle(isKeywordWarning ? .orange : .red)
                             .font(.callout)
                     }
                 }
@@ -78,6 +79,7 @@ struct FavoriteEditDialog: View {
 
                 if !forceGlobal {
                     Toggle("Global:", isOn: $isGlobal)
+                        .help(String(localized: "When enabled, this favorite is visible in all connections"))
                 }
             }
             .formStyle(.columns)
@@ -105,7 +107,7 @@ struct FavoriteEditDialog: View {
                 keyword = fav.keyword ?? ""
                 isGlobal = forceGlobal || fav.connectionId == nil
             } else {
-                isGlobal = forceGlobal || true
+                isGlobal = true
                 if let q = initialQuery {
                     query = q
                 }
@@ -122,6 +124,7 @@ struct FavoriteEditDialog: View {
             return
         }
         if trimmed.contains(" ") {
+            isKeywordWarning = false
             keywordError = String(localized: "Keyword cannot contain spaces")
             return
         }
@@ -133,6 +136,7 @@ struct FavoriteEditDialog: View {
                 excludingFavoriteId: favorite?.id
             )
             if !available {
+                isKeywordWarning = false
                 keywordError = String(localized: "This keyword is already in use")
             } else {
                 let sqlKeywords: Set<String> = [
@@ -143,10 +147,12 @@ struct FavoriteEditDialog: View {
                     "true", "false", "case", "when", "then", "else", "end"
                 ]
                 if sqlKeywords.contains(trimmed.lowercased()) {
+                    isKeywordWarning = true
                     keywordError = String(
-                        localized: "Warning: this shadows the SQL keyword '\(trimmed.uppercased())'"
+                        localized: "Shadows the SQL keyword '\(trimmed.uppercased())'"
                     )
                 } else {
+                    isKeywordWarning = false
                     keywordError = nil
                 }
             }

TablePro/Views/Sidebar/FavoriteRowView.swift

@@ -14,6 +14,7 @@ struct FavoriteRowView: View {
             Image(systemName: "star.fill")
                 .font(.system(size: 10))
                 .foregroundStyle(.yellow)
+                .accessibilityHidden(true)
 
             Text(favorite.name)
                 .lineLimit(1)
@@ -30,7 +31,17 @@ struct FavoriteRowView: View {
                         Capsule()
                             .fill(Color(nsColor: .quaternaryLabelColor))
                     )
+                    .accessibilityHidden(true)
             }
         }
+        .accessibilityElement(children: .combine)
+        .accessibilityLabel(accessibilityDescription)
+    }
+
+    private var accessibilityDescription: String {
+        if let keyword = favorite.keyword, !keyword.isEmpty {
+            return "\(favorite.name), \(String(localized: "keyword: \(keyword)"))"
+        }
+        return favorite.name
     }
 }

TablePro/Views/Sidebar/FavoritesTabView.swift

@@ -10,6 +10,8 @@ import SwiftUI
 /// Full-tab favorites view with folder hierarchy and bottom toolbar
 struct FavoritesTabView: View {
     @State private var viewModel: FavoritesSidebarViewModel
+    @State private var folderToDelete: SQLFavoriteFolder?
+    @State private var showDeleteFolderAlert = false
     let searchText: String
     private weak var coordinator: MainContentCoordinator?
 
@@ -48,6 +50,18 @@ struct FavoritesTabView: View {
                 folderId: viewModel.editingFolderId
             )
         }
+        .alert(
+            String(localized: "Delete Folder?"),
+            isPresented: $showDeleteFolderAlert,
+            presenting: folderToDelete
+        ) { folder in
+            Button(String(localized: "Cancel"), role: .cancel) {}
+            Button(String(localized: "Delete"), role: .destructive) {
+                viewModel.deleteFolder(folder)
+            }
+        } message: { folder in
+            Text("The folder \"\(folder.name)\" will be deleted. Items inside will be moved to the parent level.")
+        }
     }
 
     // MARK: - List
@@ -58,7 +72,11 @@ struct FavoritesTabView: View {
                 FavoriteTreeItemRow(
                     item: item,
                     viewModel: viewModel,
-                    coordinator: coordinator
+                    coordinator: coordinator,
+                    onDeleteFolder: { folder in
+                        folderToDelete = folder
+                        showDeleteFolderAlert = true
+                    }
                 )
             }
         }
@@ -82,6 +100,15 @@ struct FavoritesTabView: View {
                 .font(.system(size: 11))
                 .foregroundStyle(Color(nsColor: .tertiaryLabelColor))
                 .multilineTextAlignment(.center)
+
+            Button {
+                viewModel.createFavorite()
+            } label: {
+                Label(String(localized: "New Favorite"), systemImage: "plus")
+                    .font(.system(size: 12))
+            }
+            .buttonStyle(.borderless)
+            .padding(.top, 4)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
@@ -134,6 +161,7 @@ struct FavoriteTreeItemRow: View {
     let item: FavoriteTreeItem
     let viewModel: FavoritesSidebarViewModel
     weak var coordinator: MainContentCoordinator?
+    var onDeleteFolder: ((SQLFavoriteFolder) -> Void)?
     @FocusState private var isRenameFocused: Bool
 
     var body: some View {
@@ -167,7 +195,8 @@ struct FavoriteTreeItemRow: View {
                     FavoriteTreeItemRow(
                         item: child,
                         viewModel: viewModel,
-                        coordinator: coordinator
+                        coordinator: coordinator,
+                        onDeleteFolder: onDeleteFolder
                     )
                 }
             } label: {
@@ -198,7 +227,8 @@ struct FavoriteTreeItemRow: View {
                         .contextMenu {
                             FolderContextMenu(
                                 folder: folder,
-                                viewModel: viewModel
+                                viewModel: viewModel,
+                                onDelete: onDeleteFolder ?? { _ in }
                             )
                         }
                 }
@@ -215,7 +245,7 @@ private struct FavoriteItemContextMenu: View {
     weak var coordinator: MainContentCoordinator?
 
     var body: some View {
-        Button("Edit...") {
+        Button(String(localized: "Edit...")) {
             viewModel.editFavorite(favorite)
         }
 
@@ -251,24 +281,25 @@ private struct FavoriteItemContextMenu: View {
 private struct FolderContextMenu: View {
     let folder: SQLFavoriteFolder
     let viewModel: FavoritesSidebarViewModel
+    var onDelete: (SQLFavoriteFolder) -> Void
 
     var body: some View {
-        Button("Rename") {
+        Button(String(localized: "Rename")) {
             viewModel.startRenameFolder(folder)
         }
 
-        Button("New Favorite...") {
+        Button(String(localized: "New Favorite...")) {
             viewModel.createFavorite(folderId: folder.id)
         }
 
-        Button("New Subfolder") {
+        Button(String(localized: "New Subfolder")) {
             viewModel.createFolder(parentId: folder.id)
         }
 
         Divider()
 
         Button(role: .destructive) {
-            viewModel.deleteFolder(folder)
+            onDelete(folder)
         } label: {
             Label(String(localized: "Delete Folder"), systemImage: "trash")
         }