Skip to content

A native macOS / windows / Linux database IDE built with Swift and AppKit. Connect to PostgreSQL, MySQL, SQLite, and Redis from a single app with a fast, keyboard-driven interface.

C++

fix(redis): scope tabs to connection context (#69)

Tobie6deb09350b3
diff --git a/macos/App/State/AppState.swift b/macos/App/State/AppState.swift
index a0a1020..99977e9 100644
--- a/macos/App/State/AppState.swift
+++ b/macos/App/State/AppState.swift
@@ -158,6 +158,11 @@ final class AppState: ObservableObject {
// MARK: - Tab Types
+ struct RedisTabContext: Hashable {
+ let connectionID: UUID
+ let databaseName: String
+ }
+
struct ContentTab: Identifiable {
let id: UUID
let type: TabState.TabType
@@ -166,6 +171,7 @@ final class AppState: ObservableObject {
let schema: String?
var databaseName: String?
var initialViewMode: String? // "data" or "structure"
+ var redisContext: RedisTabContext?
}
struct TabGroup: Identifiable {
@@ -509,22 +515,40 @@ final class AppState: ObservableObject {
// MARK: - Redis Tabs
+ private var currentRedisTabContext: RedisTabContext? {
+ guard let connectionID = activeConnectionId,
+ let databaseName = currentDatabaseName else { return nil }
+ return RedisTabContext(
+ connectionID: connectionID,
+ databaseName: databaseName
+ )
+ }
+
+ func activeRedisAdapter(for context: RedisTabContext) -> RedisAdapter? {
+ guard currentRedisTabContext == context else { return nil }
+ return activeAdapter as? RedisAdapter
+ }
+
var isRedisFlatKeyListOpen: Bool {
- tabs.contains {
+ let context = currentRedisTabContext
+ return tabs.contains {
$0.type == .dataGrid
&& $0.tableName == "Keys"
&& $0.schema == nil
&& $0.databaseName == currentDatabaseName
+ && $0.redisContext == context
}
}
func openRedisFlatKeyList() {
+ let context = currentRedisTabContext
let tabID: UUID
if let existing = tabs.first(where: {
$0.type == .dataGrid
&& $0.tableName == "Keys"
&& $0.schema == nil
&& $0.databaseName == currentDatabaseName
+ && $0.redisContext == context
}) {
tabID = existing.id
} else {
@@ -534,7 +558,8 @@ final class AppState: ObservableObject {
title: "Keys",
tableName: "Keys",
schema: nil,
- databaseName: currentDatabaseName
+ databaseName: currentDatabaseName,
+ redisContext: context
)
tabs.append(tab)
tabID = tab.id
@@ -547,15 +572,25 @@ final class AppState: ObservableObject {
}
func openRedisKeyDetail(key: String) {
+ let context = currentRedisTabContext
if let existing = tabs.first(where: {
$0.type == .redisKeyDetail
&& $0.tableName == key
&& $0.databaseName == currentDatabaseName
+ && $0.redisContext == context
}) {
activeTabId = existing.id
return
}
- let tab = ContentTab(id: UUID(), type: .redisKeyDetail, title: key, tableName: key, schema: nil, databaseName: currentDatabaseName)
+ let tab = ContentTab(
+ id: UUID(),
+ type: .redisKeyDetail,
+ title: key,
+ tableName: key,
+ schema: nil,
+ databaseName: currentDatabaseName,
+ redisContext: context
+ )
tabs.append(tab)
activeTabId = tab.id
if let db = currentDatabaseName { ensureTabGroup(for: db) }
diff --git a/macos/Presentation/Views/Main/MainView.swift b/macos/Presentation/Views/Main/MainView.swift
index b000188..385a611 100644
--- a/macos/Presentation/Views/Main/MainView.swift
+++ b/macos/Presentation/Views/Main/MainView.swift
@@ -1202,7 +1202,10 @@ struct WorkspaceView: View {
private func tabContent(for tab: AppState.ContentTab) -> some View {
switch tab.type {
case .dataGrid:
- if let tableName = tab.tableName {
+ if let context = tab.redisContext,
+ appState.activeRedisAdapter(for: context) == nil {
+ redisContextMismatchView
+ } else if let tableName = tab.tableName {
DataGridView(tableName: tableName, schema: tab.schema, tabId: tab.id, initialViewMode: tab.initialViewMode)
}
case .queryEditor:
@@ -1234,7 +1237,10 @@ struct WorkspaceView: View {
// Redis-specific tabs
case .redisKeyDetail:
if let keyName = tab.tableName {
- RedisKeyDetailView(keyName: keyName)
+ RedisKeyDetailView(
+ keyName: keyName,
+ redisContext: tab.redisContext
+ )
}
case .redisServerInfo:
RedisServerInfoView()
@@ -1242,6 +1248,19 @@ struct WorkspaceView: View {
RedisSlowLogView()
}
}
+
+ private var redisContextMismatchView: some View {
+ VStack(spacing: 8) {
+ Image(systemName: "exclamationmark.triangle")
+ .foregroundStyle(.orange)
+ Text("This Redis tab belongs to another connection or database.")
+ .font(.system(size: 12, weight: .medium))
+ Text("Reopen it from the current Redis key browser to continue.")
+ .font(.system(size: 11))
+ .foregroundStyle(.secondary)
+ }
+ .frame(maxWidth: .infinity, maxHeight: .infinity)
+ }
}
// MARK: - Connection picker popover
diff --git a/macos/Presentation/Views/Redis/RedisKeyDetailView.swift b/macos/Presentation/Views/Redis/RedisKeyDetailView.swift
index 74a0d4d..f909247 100644
--- a/macos/Presentation/Views/Redis/RedisKeyDetailView.swift
+++ b/macos/Presentation/Views/Redis/RedisKeyDetailView.swift
@@ -7,6 +7,7 @@ import SwiftUI
struct RedisKeyDetailView: View {
let keyName: String
+ let redisContext: AppState.RedisTabContext?
@EnvironmentObject private var appState: AppState
@State private var detail: RedisKeyDetail?
@State private var isLoading = true
@@ -26,7 +27,9 @@ struct RedisKeyDetailView: View {
headerBar
Divider()
- if isLoading {
+ if !isCapturedContextActive {
+ contextMismatchView
+ } else if isLoading {
ProgressView().frame(maxWidth: .infinity, maxHeight: .infinity)
} else if let err = errorMessage {
Text(err).foregroundStyle(.red).padding()
@@ -71,13 +74,17 @@ struct RedisKeyDetailView: View {
Button("Set TTL") { showTTLInput = true }
.font(.system(size: 11))
+ .disabled(!isCapturedContextActive)
Button("Rename") {
newKeyName = keyName
showRename = true
- }.font(.system(size: 11))
+ }
+ .font(.system(size: 11))
+ .disabled(!isCapturedContextActive)
Button { Task { await loadDetail() } } label: {
Image(systemName: "arrow.clockwise").font(.system(size: 11))
}
+ .disabled(!isCapturedContextActive)
}
.padding(.horizontal, 12)
.padding(.vertical, 8)
@@ -136,7 +143,7 @@ struct RedisKeyDetailView: View {
Button("Add") {
guard !newFieldName.isEmpty else { return }
Task {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
try? await redis.updateHashField(key: keyName, field: newFieldName, value: newFieldValue)
newFieldName = ""; newFieldValue = ""
await loadDetail()
@@ -150,7 +157,7 @@ struct RedisKeyDetailView: View {
if let field = row.first {
Button("Delete Field") {
Task {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
try? await redis.deleteHashField(key: keyName, field: field)
await loadDetail()
}
@@ -181,7 +188,7 @@ struct RedisKeyDetailView: View {
Button("Add") {
guard !newFieldName.isEmpty else { return }
Task {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
try? await redis.addSetMember(key: keyName, member: newFieldName)
newFieldName = ""
await loadDetail()
@@ -194,7 +201,7 @@ struct RedisKeyDetailView: View {
if let member = row.first {
Button("Remove") {
Task {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
try? await redis.removeSetMember(key: keyName, member: member)
await loadDetail()
}
@@ -215,7 +222,7 @@ struct RedisKeyDetailView: View {
Button("Add") {
guard !newFieldName.isEmpty else { return }
Task {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
try? await redis.addZSetMember(key: keyName, member: newFieldName, score: Double(newFieldValue) ?? 0)
newFieldName = ""; newFieldValue = ""
await loadDetail()
@@ -228,7 +235,7 @@ struct RedisKeyDetailView: View {
if let member = row.first {
Button("Remove") {
Task {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
try? await redis.removeZSetMember(key: keyName, member: member)
await loadDetail()
}
@@ -283,8 +290,33 @@ struct RedisKeyDetailView: View {
// MARK: - Actions
+ private var isCapturedContextActive: Bool {
+ capturedRedisAdapter() != nil
+ }
+
+ private var contextMismatchView: some View {
+ VStack(spacing: 8) {
+ Image(systemName: "exclamationmark.triangle")
+ .foregroundStyle(.orange)
+ Text("This key belongs to another Redis connection or database.")
+ .font(.system(size: 12, weight: .medium))
+ Text("Reopen it from the current Redis key browser to continue.")
+ .font(.system(size: 11))
+ .foregroundStyle(.secondary)
+ }
+ .frame(maxWidth: .infinity, maxHeight: .infinity)
+ }
+
+ private func capturedRedisAdapter() -> RedisAdapter? {
+ guard let redisContext else { return nil }
+ return appState.activeRedisAdapter(for: redisContext)
+ }
+
private func loadDetail() async {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else {
+ isLoading = false
+ return
+ }
isLoading = true
do {
detail = try await redis.fetchKeyDetail(key: keyName)
@@ -296,7 +328,7 @@ struct RedisKeyDetailView: View {
}
private func renameKey() async {
- guard let redis = appState.activeAdapter as? RedisAdapter, !newKeyName.isEmpty else { return }
+ guard let redis = capturedRedisAdapter(), !newKeyName.isEmpty else { return }
do {
try await redis.renameKey(oldName: keyName, newName: newKeyName)
NotificationCenter.default.post(name: .reloadData, object: nil)
@@ -304,7 +336,7 @@ struct RedisKeyDetailView: View {
}
private func setTTL() async {
- guard let redis = appState.activeAdapter as? RedisAdapter else { return }
+ guard let redis = capturedRedisAdapter() else { return }
let seconds = Int(ttlInput) ?? 0
do {
if seconds <= 0 {