Skip to content

fix(ui): tree errors, empty table state, scrollable toolbars #461

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 1 commit into from
Jul 27, 2026
Merged

fix(ui): tree errors, empty table state, scrollable toolbars #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 35 additions & 2 deletions lib/features/connections/connections_panel_mysql.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ class _MysqlDatabaseNode extends StatefulWidget {
class _MysqlDatabaseNodeState extends State<_MysqlDatabaseNode> {
bool _expanded = false;
bool _loading = false;
String? _error;
List<String> _tables = [];
List<String> _views = [];
List<String> _procedures = [];
Expand All @@ -388,7 +389,10 @@ class _MysqlDatabaseNodeState extends State<_MysqlDatabaseNode> {

Future<void> _loadTables() async {
if (!mounted) return;
setState(() => _loading = true);
setState(() {
_loading = true;
_error = null;
});
MysqlLease? lease;
try {
final c = widget.connection;
Expand All @@ -412,10 +416,14 @@ class _MysqlDatabaseNodeState extends State<_MysqlDatabaseNode> {
_procedures = procs;
_functions = funcs;
_loading = false;
_error = null;
});
} catch (e) {
if (!mounted) return;
setState(() => _loading = false);
setState(() {
_error = e.toString();
_loading = false;
});
} finally {
lease?.release();
}
Expand Down Expand Up @@ -480,6 +488,31 @@ class _MysqlDatabaseNodeState extends State<_MysqlDatabaseNode> {
const Text('Loading...').muted().xSmall(),
],
),
)
else if (_error != null)
material.Padding(
padding: const material.EdgeInsets.only(
left: 24,
top: 4,
bottom: 8,
),
child: material.Column(
crossAxisAlignment: material.CrossAxisAlignment.start,
children: [
material.SelectableText(
_error!,
style: material.TextStyle(
fontSize: 11,
color: theme.colorScheme.destructive,
),
),
const material.SizedBox(height: 6),
GhostButton(
onPressed: _loadTables,
child: const Text('Retry'),
),
],
),
),
if (_tables.isNotEmpty ||
_views.isNotEmpty ||
Expand Down
74 changes: 70 additions & 4 deletions lib/features/connections/connections_panel_pg_tree.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ class _PgDatabaseNode extends StatefulWidget {
class _PgDatabaseNodeState extends State<_PgDatabaseNode> {
bool _expanded = false;
bool _loading = false;
String? _error;
List<String> _schemas = [];

void _toggle() {
Expand All @@ -296,7 +297,10 @@ class _PgDatabaseNodeState extends State<_PgDatabaseNode> {

Future<void> _loadSchemas() async {
if (!mounted) return;
setState(() => _loading = true);
setState(() {
_loading = true;
_error = null;
});
PgLease? lease;
try {
final c = widget.connection;
Expand All @@ -310,10 +314,14 @@ class _PgDatabaseNodeState extends State<_PgDatabaseNode> {
setState(() {
_schemas = schemas;
_loading = false;
_error = null;
});
} catch (e) {
if (!mounted) return;
setState(() => _loading = false);
setState(() {
_error = e.toString();
_loading = false;
});
} finally {
lease?.release();
}
Expand Down Expand Up @@ -395,6 +403,31 @@ class _PgDatabaseNodeState extends State<_PgDatabaseNode> {
const Text('Loading...').muted().xSmall(),
],
),
)
else if (_error != null)
material.Padding(
padding: const material.EdgeInsets.only(
left: 24,
top: 4,
bottom: 8,
),
child: material.Column(
crossAxisAlignment: material.CrossAxisAlignment.start,
children: [
material.SelectableText(
_error!,
style: material.TextStyle(
fontSize: 11,
color: theme.colorScheme.destructive,
),
),
const material.SizedBox(height: 6),
GhostButton(
onPressed: _loadSchemas,
child: const Text('Retry'),
),
],
),
),
if (_schemas.isNotEmpty)
_PgSchemasNode(
Expand Down Expand Up @@ -597,6 +630,7 @@ class _PgSchemaNode extends StatefulWidget {
class _PgSchemaNodeState extends State<_PgSchemaNode> {
bool _expanded = false;
bool _loading = false;
String? _error;
List<String> _tables = [];
List<String> _views = [];
List<String> _matviews = [];
Expand All @@ -613,7 +647,10 @@ class _PgSchemaNodeState extends State<_PgSchemaNode> {

Future<void> _loadObjects() async {
if (!mounted) return;
setState(() => _loading = true);
setState(() {
_loading = true;
_error = null;
});
PgLease? lease;
try {
final c = widget.connection;
Expand Down Expand Up @@ -642,10 +679,14 @@ class _PgSchemaNodeState extends State<_PgSchemaNode> {
_sequences = sequences;
_loading = false;
_loaded = true;
_error = null;
});
} catch (e) {
if (!mounted) return;
setState(() => _loading = false);
setState(() {
_error = e.toString();
_loading = false;
});
} finally {
lease?.release();
}
Expand Down Expand Up @@ -706,6 +747,31 @@ class _PgSchemaNodeState extends State<_PgSchemaNode> {
const Text('Loading...').muted().xSmall(),
],
),
)
else if (_error != null)
material.Padding(
padding: const material.EdgeInsets.only(
left: 24,
top: 4,
bottom: 8,
),
child: material.Column(
crossAxisAlignment: material.CrossAxisAlignment.start,
children: [
material.SelectableText(
_error!,
style: material.TextStyle(
fontSize: 11,
color: theme.colorScheme.destructive,
),
),
const material.SizedBox(height: 6),
GhostButton(
onPressed: _loadObjects,
child: const Text('Retry'),
),
],
),
),
if (_loaded) ...[
_PgObjectGroup(
Expand Down
139 changes: 96 additions & 43 deletions lib/features/mysql/mysql_table_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,33 @@ class _MysqlTableViewState extends material.State<MysqlTableView> {
}

if (_columnNames.isEmpty) {
return material.Container(color: cs.background);
return material.Container(
color: cs.background,
child: material.Center(
child: material.Padding(
padding: const material.EdgeInsets.all(32),
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const Text('No columns returned').muted().small(),
const Gap(24),
OutlineButton(
onPressed: () {
if (_customSqlActive) {
unawaited(_fetchCustom());
} else {
unawaited(_fetch(refreshCount: true));
}
},
leading: const material.Icon(material.Icons.refresh_rounded,
size: 18),
child: const Text('Retry'),
),
],
),
),
),
);
}

const double rowHeight = 36;
Expand Down Expand Up @@ -444,56 +470,83 @@ class _MysqlTableViewState extends material.State<MysqlTableView> {
child: material.Text(
title,
overflow: material.TextOverflow.ellipsis,
maxLines: 1,
style: material.TextStyle(
fontSize: 13,
fontWeight: material.FontWeight.w600,
color: cs.foreground,
),
),
),
material.Text(
_paginationLabel(),
style: material.TextStyle(
fontSize: 11,
color: cs.mutedForeground,
),
),
const Gap(8),
OutlineButton(
onPressed: _loading
? null
: () {
if (_customSqlActive) {
unawaited(_fetchCustom());
} else {
unawaited(_fetch(refreshCount: true));
}
},
child: const Text('Refresh'),
),
const Gap(6),
OutlineButton(
onPressed: _openSqlEditor,
child: const Text('SQL'),
),
if (_customSqlActive) ...[
const Gap(6),
OutlineButton(
onPressed: _exitCustomMode,
child: const Text('Browse'),
material.Expanded(
flex: 2,
child: material.LayoutBuilder(
builder: (context, constraints) {
return material.SingleChildScrollView(
scrollDirection: material.Axis.horizontal,
child: material.ConstrainedBox(
constraints: material.BoxConstraints(
minWidth: constraints.maxWidth,
),
child: material.Row(
mainAxisAlignment: material.MainAxisAlignment.end,
mainAxisSize: material.MainAxisSize.min,
children: [
material.Text(
_paginationLabel(),
style: material.TextStyle(
fontSize: 11,
color: cs.mutedForeground,
),
),
const Gap(8),
OutlineButton(
onPressed: _loading
? null
: () {
if (_customSqlActive) {
unawaited(_fetchCustom());
} else {
unawaited(_fetch(refreshCount: true));
}
},
child: const Text('Refresh'),
),
const Gap(6),
OutlineButton(
onPressed: _openSqlEditor,
child: const Text('SQL'),
),
if (_customSqlActive) ...[
const Gap(6),
OutlineButton(
onPressed: _exitCustomMode,
child: const Text('Browse'),
),
],
const Gap(6),
GhostButton(
onPressed: (!_canGoPrevious || _loading)
? null
: _goToPreviousPage,
child: const Icon(
material.Icons.chevron_left_rounded,
size: 20),
),
GhostButton(
onPressed: (!_canGoNext || _loading)
? null
: _goToNextPage,
child: const Icon(
material.Icons.chevron_right_rounded,
size: 20),
),
],
),
),
);
},
),
],
const Gap(6),
GhostButton(
onPressed:
(!_canGoPrevious || _loading) ? null : _goToPreviousPage,
child:
const Icon(material.Icons.chevron_left_rounded, size: 20),
),
GhostButton(
onPressed: (!_canGoNext || _loading) ? null : _goToNextPage,
child: const Icon(material.Icons.chevron_right_rounded,
size: 20),
),
],
),
Expand Down
28 changes: 27 additions & 1 deletion lib/features/postgresql/postgres_table_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,33 @@ class _PostgresTableViewState extends material.State<PostgresTableView> {
}

if (_columnNames.isEmpty) {
return material.Container(color: cs.background);
return material.Container(
color: cs.background,
child: material.Center(
child: material.Padding(
padding: const material.EdgeInsets.all(32),
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const Text('No columns returned').muted().small(),
const Gap(24),
OutlineButton(
onPressed: () {
if (_customSqlActive) {
_fetchCustom();
} else {
_fetch(refreshCount: true);
}
},
leading: const material.Icon(material.Icons.refresh_rounded,
size: 18),
child: const Text('Retry'),
),
],
),
),
),
);
}

const double rowHeight = 36;
Expand Down
Loading
Loading