Skip to content

feat: show all 16 Redis databases in sidebar tree #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZhuchkaTriplesix merged 2 commits into from
Mar 8, 2026
Merged

feat: show all 16 Redis databases in sidebar tree #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb8dfa
feat: show all 16 Redis databases in sidebar tree
ZhuchkaTriplesix Mar 8, 2026
cb9928e
merge: resolve conflicts with dev branch
ZhuchkaTriplesix Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 49 additions & 64 deletions lib/features/connections/connections_panel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,27 +178,22 @@ class _ConnectionsPanelState extends State<ConnectionsPanel> {
});
},
connections: _connections
.where((c) =>
c.folderId == _folderIdByName[name])
.where((c) => c.folderId == _folderIdByName[name])
.toList(),
onRemove: () async {
await FoldersStorage.instance.remove(name);
await _loadData();
},
onNewConnection: (folderName) async {
final type =
await showNewConnectionDialog(context);
final type = await showNewConnectionDialog(context);
if (type == null || !mounted) return;
final folderId = await LocalDb.instance
.getFolderIdByName(folderName);
await _createConnection(type,
folderId: folderId);
final folderId = await LocalDb.instance.getFolderIdByName(folderName);
await _createConnection(type, folderId: folderId);
},
iconForType: _iconForType,
onRemoveConnection: _removeConnection,
onConnectionTap: widget.onConnectionSelected,
onRedisDatabaseTap:
widget.onRedisDatabaseSelected,
onRedisDatabaseTap: widget.onRedisDatabaseSelected,
),
// Root connections (no folder)
for (final conn in rootConnections)
Expand All @@ -208,19 +203,15 @@ class _ConnectionsPanelState extends State<ConnectionsPanel> {
icon: _iconForType(conn.type),
iconAsset: _iconAssetForType(conn.type),
onRemove: () => _removeConnection(conn.id!),
onTap: () => widget.onConnectionSelected
?.call(conn),
onDatabaseTap: (db) => widget
.onRedisDatabaseSelected
?.call(conn, db),
onTap: () => widget.onConnectionSelected?.call(conn),
onDatabaseTap: (db) => widget.onRedisDatabaseSelected?.call(conn, db),
)
: _ConnectionTile(
connection: conn,
icon: _iconForType(conn.type),
iconAsset: _iconAssetForType(conn.type),
onRemove: () => _removeConnection(conn.id!),
onTap: () => widget.onConnectionSelected
?.call(conn),
onTap: () => widget.onConnectionSelected?.call(conn),
),
// Empty state
if (_connections.isEmpty && _folders.isEmpty)
Expand Down Expand Up @@ -423,8 +414,7 @@ class _FolderTile extends StatelessWidget {
final material.IconData Function(String type) iconForType;
final Future<void> Function(int id) onRemoveConnection;
final void Function(ConnectionRow connection)? onConnectionTap;
final void Function(ConnectionRow connection, int database)?
onRedisDatabaseTap;
final void Function(ConnectionRow connection, int database)? onRedisDatabaseTap;

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -494,18 +484,15 @@ class _FolderTile extends StatelessWidget {
? _RedisConnectionTile(
connection: conn,
icon: iconForType(conn.type),
iconAsset: _ConnectionsPanelState
._iconAssetForType(conn.type),
iconAsset: _ConnectionsPanelState._iconAssetForType(conn.type),
onRemove: () => onRemoveConnection(conn.id!),
onTap: () => onConnectionTap?.call(conn),
onDatabaseTap: (db) =>
onRedisDatabaseTap?.call(conn, db),
onDatabaseTap: (db) => onRedisDatabaseTap?.call(conn, db),
)
: _ConnectionTile(
connection: conn,
icon: iconForType(conn.type),
iconAsset: _ConnectionsPanelState
._iconAssetForType(conn.type),
iconAsset: _ConnectionsPanelState._iconAssetForType(conn.type),
onRemove: () => onRemoveConnection(conn.id!),
onTap: () => onConnectionTap?.call(conn),
),
Expand Down Expand Up @@ -544,6 +531,7 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
bool _expanded = false;
bool _loading = false;
String? _error;
// All 16 databases (db0–db15) with key counts
List<({int index, int keys})> _databases = [];

void _toggle() {
Expand All @@ -560,8 +548,7 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
_error = null;
});
try {
// Use a temporary connection (not registered in RedisService) so we
// don't kill the main view's connection.
// Use a temporary connection so we don't kill the main view's connection.
final c = widget.connection;
final conn = RedisConnection(
id: -1,
Expand All @@ -578,21 +565,22 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
final info = parseRedisInfo(raw);
final keyspace = info['Keyspace'] ?? {};

// Build all 16 databases with their key counts
final dbs = <({int index, int keys})>[];
for (final entry in keyspace.entries) {
final match = RegExp(r'db(\d+)').firstMatch(entry.key);
if (match == null) continue;
final idx = int.parse(match.group(1)!);
for (var i = 0; i < 16; i++) {
final dbKey = 'db$i';
final dbInfo = keyspace[dbKey];
int keys = 0;
for (final part in entry.value.split(',')) {
final kv = part.split('=');
if (kv.length == 2 && kv[0].trim() == 'keys') {
keys = int.tryParse(kv[1].trim()) ?? 0;
if (dbInfo != null) {
for (final part in dbInfo.split(',')) {
final kv = part.split('=');
if (kv.length == 2 && kv[0].trim() == 'keys') {
keys = int.tryParse(kv[1].trim()) ?? 0;
}
}
}
dbs.add((index: idx, keys: keys));
dbs.add((index: i, keys: keys));
}
dbs.sort((a, b) => a.index.compareTo(b.index));

if (!mounted) return;
setState(() {
Expand Down Expand Up @@ -708,8 +696,7 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
maxLines: 1,
style: material.TextStyle(
fontSize: 11,
color:
theme.colorScheme.mutedForeground,
color: theme.colorScheme.mutedForeground,
),
),
],
Expand All @@ -723,19 +710,17 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
),
],
),
// Expanded database children
// Expanded database children — ALL 16 databases
if (_expanded) ...[
if (_loading)
material.Padding(
padding: const material.EdgeInsets.only(
left: 28, top: 4, bottom: 4),
padding: const material.EdgeInsets.only(left: 28, top: 4, bottom: 4),
child: material.Row(
children: [
const material.SizedBox(
width: 12,
height: 12,
child: material.CircularProgressIndicator(
strokeWidth: 1.5),
child: material.CircularProgressIndicator(strokeWidth: 1.5),
),
const Gap(8),
const Text('Loading...').muted().xSmall(),
Expand All @@ -744,8 +729,7 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
),
if (_error != null)
material.Padding(
padding: const material.EdgeInsets.only(
left: 28, top: 4, bottom: 4),
padding: const material.EdgeInsets.only(left: 28, top: 4, bottom: 4),
child: material.Text(
'Error',
overflow: material.TextOverflow.ellipsis,
Expand All @@ -754,12 +738,6 @@ class _RedisConnectionTileState extends State<_RedisConnectionTile> {
fontSize: 11, color: theme.colorScheme.destructive),
),
),
if (_databases.isEmpty && !_loading && _error == null)
material.Padding(
padding: const material.EdgeInsets.only(
left: 28, top: 4, bottom: 4),
child: const Text('No active databases').muted().xSmall(),
),
for (final db in _databases)
_RedisDatabaseNode(
index: db.index,
Expand Down Expand Up @@ -800,27 +778,34 @@ class _RedisDatabaseNode extends StatelessWidget {
horizontal: 8, vertical: 5),
child: material.Row(
children: [
material.Icon(material.Icons.dns_rounded,
size: 14,
color:
theme.colorScheme.primary.withValues(alpha: 0.7)),
material.Icon(
material.Icons.dns_rounded,
size: 14,
color: keys > 0
? theme.colorScheme.primary.withValues(alpha: 0.7)
: theme.colorScheme.mutedForeground.withValues(alpha: 0.5),
),
const Gap(8),
material.Expanded(
child: material.Text(
'db$index',
overflow: material.TextOverflow.ellipsis,
maxLines: 1,
style: material.TextStyle(
fontSize: 12,
color: theme.colorScheme.foreground),
fontSize: 12,
color: keys > 0
? theme.colorScheme.foreground
: theme.colorScheme.mutedForeground,
),
),
),
material.Text(
'$keys',
style: material.TextStyle(
fontSize: 10,
color: theme.colorScheme.mutedForeground),
),
if (keys > 0)
material.Text(
'$keys',
style: material.TextStyle(
fontSize: 10,
color: theme.colorScheme.mutedForeground),
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/features/main_screen/main_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class _MainScreenState extends State<MainScreen> {
void _onConnectionSelected(ConnectionRow connection) {
setState(() {
_activeConnection = connection;
_activeRedisDb = null;
_activeRedisDb = null; // Reset: connection click → stats
});
}

Expand Down