Skip to content

refactor(ui): migrate views to Querya UI Kit and add architectural guard tests (#1039) #1074

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
Oct 5, 2026
Merged

refactor(ui): migrate views to Querya UI Kit and add architectural guard tests (#1039) #1074

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
9 changes: 3 additions & 6 deletions lib/core/sdui/sdui_tree_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,12 +263,9 @@ class SduiTreeBuilderState extends material.State<SduiTreeBuilder> {
expandable: node.expandable,
),
iconWidget: isLoading
? const material.SizedBox(
width: QueryaTreeTokens.spinnerNested,
height: QueryaTreeTokens.spinnerNested,
child: material.CircularProgressIndicator(
strokeWidth: QueryaTreeTokens.spinnerStroke,
),
? const QueryaSpinner(
customDimension: QueryaTreeTokens.spinnerNested,
strokeWidth: QueryaTreeTokens.spinnerStroke,
)
: null,
iconSize: iconSize,
Expand Down
10 changes: 3 additions & 7 deletions lib/features/connections/extension_connection_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class _ExtensionConnectionFormContentState
const material.Padding(
padding: material.EdgeInsets.all(24),
child: material.Center(
child: material.CircularProgressIndicator(),
child: QueryaSpinner(size: QueryaSpinnerSize.md),
),
)
else if (_loadError != null)
Expand Down Expand Up @@ -287,12 +287,8 @@ class _ExtensionConnectionFormContentState
onPressed:
_schema == null || _testing ? null : _testConnection,
leading: _testing
? const material.SizedBox(
width: 14,
height: 14,
child: material.CircularProgressIndicator(
strokeWidth: 2,
),
? const QueryaSpinner(
size: QueryaSpinnerSize.sm,
)
: const material.Icon(
material.Icons.bolt_rounded,
Expand Down
11 changes: 4 additions & 7 deletions lib/features/connections/sqlite_connection_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,10 @@ class _SqliteConnectionFormContentState
onPressed:
formValid && !_isTesting ? _testConnection : null,
leading: _isTesting
? material.SizedBox(
width: 18,
height: 18,
child: material.CircularProgressIndicator(
strokeWidth: 2,
color: theme.primary,
),
? QueryaSpinner(
customDimension: 18,
strokeWidth: 2,
color: theme.primary,
)
: material.Icon(
material.Icons.link_rounded,
Expand Down
10 changes: 3 additions & 7 deletions lib/features/extensions/extension_driver_recovery_banner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart' as material;
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';

/// Banner displayed when an extension driver process crashes, deadlocks,
/// or disconnects unexpectedly, allowing the user to restart the driver process
Expand Down Expand Up @@ -65,12 +65,8 @@ class ExtensionDriverRecoveryBanner extends material.StatelessWidget {
size: ButtonSize.small,
onPressed: isRestarting ? null : onRestart,
leading: isRestarting
? const material.SizedBox(
width: 14,
height: 14,
child: material.CircularProgressIndicator(
strokeWidth: 2,
),
? const QueryaSpinner(
size: QueryaSpinnerSize.sm,
)
: const material.Icon(
material.Icons.restart_alt_rounded,
Expand Down
20 changes: 6 additions & 14 deletions lib/features/extensions/extension_sql_workspace.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,13 +707,9 @@ class _ExtensionSqlToolbar extends material.StatelessWidget {
IconButton.ghost(
onPressed: running || isRestarting ? null : onRestartDriver,
icon: isRestarting
? material.SizedBox(
width: 14,
height: 14,
child: material.CircularProgressIndicator(
strokeWidth: 2,
color: accent,
),
? QueryaSpinner(
size: QueryaSpinnerSize.sm,
color: accent,
)
: material.Icon(
material.Icons.restart_alt_rounded,
Expand Down Expand Up @@ -755,13 +751,9 @@ class _ExtensionSqlToolbar extends material.StatelessWidget {
OutlineButton(
onPressed: onExecute,
leading: running
? material.SizedBox(
width: 16,
height: 16,
child: material.CircularProgressIndicator(
strokeWidth: 2,
color: accent,
),
? QueryaSpinner(
size: QueryaSpinnerSize.sm,
color: accent,
)
: material.Icon(
material.Icons.play_arrow_rounded,
Expand Down
16 changes: 4 additions & 12 deletions lib/features/extensions/extension_stats_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,10 @@ class _ExtensionStatsViewState extends material.State<ExtensionStatsView> {
final cs = Theme.of(context).colorScheme;

if (_loading) {
return material.Center(
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const material.SizedBox(
width: 32,
height: 32,
child: material.CircularProgressIndicator(strokeWidth: 2),
),
const Gap(16),
const Text('Loading server statistics...').muted().small(),
],
return const material.Center(
child: QueryaSpinner(
size: QueryaSpinnerSize.lg,
label: 'Loading server statistics...',
),
);
}
Expand Down
8 changes: 1 addition & 7 deletions lib/features/extensions/extension_table_toolbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,7 @@ class ExtensionTableToolbar extends material.StatelessWidget {
size: ButtonSize.small,
onPressed: loading || isRestarting ? null : onRestartDriver,
leading: isRestarting
? const material.SizedBox(
width: 14,
height: 14,
child: material.CircularProgressIndicator(
strokeWidth: 2,
),
)
? const QueryaSpinner(size: QueryaSpinnerSize.sm)
: const material.Icon(
material.Icons.restart_alt_rounded,
size: 15,
Expand Down
2 changes: 1 addition & 1 deletion lib/features/extensions/extension_table_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ class _ExtensionTableViewState extends material.State<ExtensionTableView> {
context: context,
barrierDismissible: false,
builder: (ctx) => const material.Center(
child: material.CircularProgressIndicator(),
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
),
));

Expand Down
6 changes: 3 additions & 3 deletions lib/features/extensions/presentation/pages/extension_manager_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class _ExtensionManagerContentState
material.Widget _buildInstalledTab() {
if (_loading) {
return const material.Center(
child: material.CircularProgressIndicator(),
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
);
}
return material.Column(
Expand Down Expand Up @@ -342,7 +342,7 @@ class _ExtensionManagerContentState
material.Widget _buildMarketplaceTab() {
if (_loading) {
return const material.Center(
child: material.CircularProgressIndicator(),
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
);
}
final theme = Theme.of(context).colorScheme;
Expand Down Expand Up @@ -431,7 +431,7 @@ class _ExtensionManagerContentState
material.Widget _buildUpdatesTab() {
if (_loading) {
return const material.Center(
child: material.CircularProgressIndicator(),
child: QueryaSpinner(size: QueryaSpinnerSize.lg),
);
}
final theme = Theme.of(context).colorScheme;
Expand Down
2 changes: 1 addition & 1 deletion lib/features/extensions/presentation/widgets/extension_sideload_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class _ExtensionSideloadDialogState
final cs = Theme.of(context).colorScheme;
final fileName = p.basename(widget.archivePath);

return material.AlertDialog(
return QueryaModalDialog(
title: const material.Text('Install local extension'),
content: material.SizedBox(
width: 440,
Expand Down
2 changes: 1 addition & 1 deletion lib/features/extensions/presentation/widgets/unsandboxed_driver_consent_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Future<bool> showUnsandboxedDriverConsentDialog(
) async {
final approved = await showAppDialog<bool>(
context: context,
builder: (dialogContext) => material.AlertDialog(
builder: (dialogContext) => QueryaModalDialog(
title: const material.Text('Run driver without OS sandbox?'),
content: material.SizedBox(
width: 440,
Expand Down
11 changes: 4 additions & 7 deletions lib/features/main_screen/querya_status_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,10 @@ class QueryaStatusBar extends material.StatelessWidget {

if (isBusy) ...[
const Gap(10),
material.SizedBox(
width: 10,
height: 10,
child: material.CircularProgressIndicator(
strokeWidth: 1.5,
color: wb.accent,
),
QueryaSpinner(
customDimension: 10,
strokeWidth: 1.5,
color: wb.accent,
),
],
if (statusMessage != null && statusMessage!.isNotEmpty) ...[
Expand Down
16 changes: 4 additions & 12 deletions lib/features/mongodb/mongo_collections_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,18 +213,10 @@ class _MongoCollectionsViewState extends material.State<MongoCollectionsView> {
final cs = Theme.of(context).colorScheme;

if (_loading) {
return material.Center(
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const material.SizedBox(
width: 32,
height: 32,
child: material.CircularProgressIndicator(strokeWidth: 2),
),
const Gap(16),
const Text('Loading collections...').muted().small(),
],
return const material.Center(
child: QueryaSpinner(
size: QueryaSpinnerSize.lg,
label: 'Loading collections...',
),
);
}
Expand Down
16 changes: 4 additions & 12 deletions lib/features/mongodb/mongo_databases_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,18 +221,10 @@ class _MongoDatabasesViewState extends State<MongoDatabasesView> {
final cs = Theme.of(context).colorScheme;

if (_isLoading) {
return material.Center(
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const material.SizedBox(
width: 32,
height: 32,
child: material.CircularProgressIndicator(strokeWidth: 2),
),
const Gap(16),
const Text('Loading databases...').muted().small(),
],
return const material.Center(
child: QueryaSpinner(
size: QueryaSpinnerSize.lg,
label: 'Loading databases...',
),
);
}
Expand Down
7 changes: 1 addition & 6 deletions lib/features/mongodb/mongo_document_editor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,7 @@ class _MongoDocumentEditorState extends material.State<MongoDocumentEditor> {
onPressed: _saving ? null : _save,
size: ButtonSize.small,
leading: _saving
? const material.SizedBox(
width: 14,
height: 14,
child:
material.CircularProgressIndicator(strokeWidth: 2),
)
? const QueryaSpinner(size: QueryaSpinnerSize.sm)
: const material.Icon(material.Icons.save_rounded,
size: 14),
child: Text(_saving ? 'Saving...' : 'Save'),
Expand Down
29 changes: 10 additions & 19 deletions lib/features/mongodb/mongo_documents_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,18 +363,10 @@ class _MongoDocumentsViewState extends material.State<MongoDocumentsView> {
final cs = Theme.of(context).colorScheme;

if (_loading && _documents.isEmpty) {
return material.Center(
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const material.SizedBox(
width: 32,
height: 32,
child: material.CircularProgressIndicator(strokeWidth: 2),
),
const Gap(16),
const Text('Loading documents...').muted().small(),
],
return const material.Center(
child: QueryaSpinner(
size: QueryaSpinnerSize.lg,
label: 'Loading documents...',
),
);
}
Expand Down Expand Up @@ -456,16 +448,15 @@ class _MongoDocumentsViewState extends material.State<MongoDocumentsView> {
),
child: Row(
children: [
material.Icon(material.Icons.filter_list_rounded,
size: 18, color: shadcnCs.mutedForeground),
const Gap(10),
material.Expanded(
child: TextField(
child: QueryaSearchField(
controller: _filterController,
placeholder: const Text(
r'Filter (JSON / EJSON) e.g. {"_id": {"$oid": "…"}}',
),
placeholder:
r'Filter (JSON / EJSON) e.g. {"_id": {"$oid": "…"}}',
onSubmitted: (_) => _applyFilter(),
onChanged: (val) {
if (val.isEmpty) _clearFilter();
},
),
),
const Gap(8),
Expand Down
16 changes: 4 additions & 12 deletions lib/features/mongodb/mongo_explorer_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,18 +245,10 @@ class _MongoExplorerViewState extends material.State<MongoExplorerView> {

// Loading state
if (_connecting) {
return material.Center(
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const material.SizedBox(
width: 32,
height: 32,
child: material.CircularProgressIndicator(strokeWidth: 2),
),
const Gap(16),
const Text('Connecting...').muted().small(),
],
return const material.Center(
child: QueryaSpinner(
size: QueryaSpinnerSize.lg,
label: 'Connecting...',
),
);
}
Expand Down
22 changes: 5 additions & 17 deletions lib/features/mongodb/mongo_stats_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,18 +209,10 @@ class _MongoStatsViewState extends material.State<MongoStatsView> {
final cs = Theme.of(context).colorScheme;

if (_loading) {
return material.Center(
child: material.Column(
mainAxisSize: material.MainAxisSize.min,
children: [
const material.SizedBox(
width: 32,
height: 32,
child: material.CircularProgressIndicator(strokeWidth: 2),
),
const Gap(16),
const Text('Connecting...').muted().small(),
],
return const material.Center(
child: QueryaSpinner(
size: QueryaSpinnerSize.lg,
label: 'Connecting...',
),
);
}
Expand Down Expand Up @@ -422,11 +414,7 @@ class _MongoStatsViewState extends material.State<MongoStatsView> {
OutlineButton(
onPressed: _manualRefreshing ? null : _refreshNow,
leading: _manualRefreshing
? const material.SizedBox(
width: 16,
height: 16,
child: material.CircularProgressIndicator(strokeWidth: 2),
)
? const QueryaSpinner(size: QueryaSpinnerSize.sm)
: const material.Icon(material.Icons.refresh_rounded,
size: 18),
child: const Text('Refresh now'),
Expand Down
Loading
Loading