Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions lib/features/mongodb/mongo_aggregation_workspace.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/database/mongodb_service.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
Expand Down Expand Up @@ -206,7 +207,7 @@ class _MongoAggregationWorkspaceState

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

return material.Container(
color: cs.background,
Expand Down Expand Up @@ -260,7 +261,7 @@ class _MongoAggregationWorkspaceState
);
}

material.Widget _buildActionBar(ColorScheme cs) {
material.Widget _buildActionBar(QueryaUiColors cs) {
final enabledCount = _stages.where((s) => s.isEnabled).length;

return material.Container(
Expand Down Expand Up @@ -329,7 +330,7 @@ class _MongoAggregationWorkspaceState
);
}

material.Widget _buildStagesPane(ColorScheme cs) {
material.Widget _buildStagesPane(QueryaUiColors cs) {
return material.Container(
color: cs.card.withValues(alpha: 0.35),
child: material.Column(
Expand Down Expand Up @@ -386,7 +387,7 @@ class _MongoAggregationWorkspaceState
);
}

material.Widget _buildResultsPane(ColorScheme cs) {
material.Widget _buildResultsPane(QueryaUiColors cs) {
final title = _executedUpToStageIndex == null
? 'Pipeline Results'
: 'Results after Stage #${_executedUpToStageIndex! + 1} (${_stages[_executedUpToStageIndex!].operator})';
Expand Down Expand Up @@ -564,7 +565,7 @@ class _StageCardState extends material.State<_StageCard> {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
final stage = widget.stage;
final syntaxError = validateStage(stage);

Expand Down Expand Up @@ -761,7 +762,7 @@ class _ExportDialogState extends material.State<_ExportDialog> {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;
final code = _generateCode();

return QueryaModalDialog(
Expand Down
17 changes: 8 additions & 9 deletions lib/features/mongodb/mongo_collections_view.dart
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import 'dart:math' show min;

import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
import 'package:querya_desktop/core/actions/querya_schema_object.dart';
import 'package:querya_desktop/core/actions/querya_schema_object_cache.dart';
import 'package:querya_desktop/core/database/destructive_sql_detector.dart';
import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/database/mongodb_service.dart';
import 'package:querya_desktop/features/workspace/destructive_query_dialog.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn
hide TextExtension;
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

/// Displays the list of collections in a MongoDB database.
Expand Down Expand Up @@ -214,7 +213,7 @@ class _MongoCollectionsViewState extends material.State<MongoCollectionsView> {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

if (_loading) {
return const material.Center(
Expand Down Expand Up @@ -259,8 +258,8 @@ class _MongoCollectionsViewState extends material.State<MongoCollectionsView> {
);
}

Widget _buildCard(ColorScheme cs) {
final shadcnCs = shadcn.Theme.of(context).colorScheme;
Widget _buildCard(QueryaUiColors cs) {
final shadcnCs = context.colors;
return material.Container(
decoration: material.BoxDecoration(
color: cs.card,
Expand Down Expand Up @@ -369,7 +368,7 @@ class _MongoCollectionsViewState extends material.State<MongoCollectionsView> {
itemBuilder: (context, i) {
return _CollectionRow(
collection: _collections[i],
colorScheme: cs,
colors: cs,
onView: () =>
widget.onCollectionTap?.call(_collections[i].name),
onDrop: () => _dropCollection(_collections[i].name),
Expand All @@ -388,19 +387,19 @@ class _MongoCollectionsViewState extends material.State<MongoCollectionsView> {
class _CollectionRow extends StatelessWidget {
const _CollectionRow({
required this.collection,
required this.colorScheme,
required this.colors,
required this.onView,
required this.onDrop,
});

final _CollectionInfo collection;
final ColorScheme colorScheme;
final QueryaUiColors colors;
final VoidCallback onView;
final VoidCallback onDrop;

@override
Widget build(BuildContext context) {
final cs = colorScheme;
final cs = colors;
return material.Material(
color: Colors.transparent,
child: material.InkWell(
Expand Down
2 changes: 1 addition & 1 deletion lib/features/mongodb/mongo_create_index_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class _MongoCreateIndexDialogState

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

return QueryaModalDialog(
title: const Text('Create Index'),
Expand Down
17 changes: 8 additions & 9 deletions lib/features/mongodb/mongo_databases_view.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import 'package:flutter/material.dart' as material;
import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
import 'package:querya_desktop/core/database/destructive_sql_detector.dart';
import 'package:querya_desktop/core/database/mongodb_connection.dart';
import 'package:querya_desktop/core/database/mongodb_service.dart';
import 'package:querya_desktop/core/storage/local_db.dart';
import 'package:querya_desktop/features/workspace/destructive_query_dialog.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn
hide TextExtension;
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

/// View that displays MongoDB databases list and server status.
Expand Down Expand Up @@ -220,7 +219,7 @@ class _MongoDatabasesViewState extends State<MongoDatabasesView> {

@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

if (_isLoading) {
return const material.Center(
Expand Down Expand Up @@ -272,8 +271,8 @@ class _MongoDatabasesViewState extends State<MongoDatabasesView> {
);
}

Widget _buildDatabasesCard(ColorScheme cs) {
final shadcnCs = shadcn.Theme.of(context).colorScheme;
Widget _buildDatabasesCard(QueryaUiColors cs) {
final shadcnCs = context.colors;
return material.Container(
decoration: material.BoxDecoration(
color: cs.card,
Expand Down Expand Up @@ -344,7 +343,7 @@ class _MongoDatabasesViewState extends State<MongoDatabasesView> {
QueryaDivider(height: 1, color: cs.border.withValues(alpha: 0.15)),
_DatabaseRow(
database: _databases[i],
colorScheme: cs,
colors: cs,
onView: () => widget.onDatabaseTap?.call(_databases[i].name),
onDrop: () => _dropDatabase(_databases[i].name),
),
Expand All @@ -367,19 +366,19 @@ class _MongoDatabasesViewState extends State<MongoDatabasesView> {
class _DatabaseRow extends StatelessWidget {
const _DatabaseRow({
required this.database,
required this.colorScheme,
required this.colors,
required this.onView,
required this.onDrop,
});

final _DatabaseInfo database;
final ColorScheme colorScheme;
final QueryaUiColors colors;
final VoidCallback onView;
final VoidCallback onDrop;

@override
Widget build(BuildContext context) {
final cs = colorScheme;
final cs = colors;
return material.Material(
color: Colors.transparent,
child: material.InkWell(
Expand Down
6 changes: 2 additions & 4 deletions lib/features/mongodb/mongo_document_editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import 'package:querya_desktop/core/unsaved_work_registry.dart';
import 'package:querya_desktop/features/mongodb/mongo_ejson.dart';
import 'package:querya_desktop/features/workspace/destructive_query_dialog.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' as shadcn
hide TextExtension;
import 'package:querya_desktop/core/ui/querya_control_tokens.dart';

/// Full-screen JSON editor for a single MongoDB document.
Expand Down Expand Up @@ -247,8 +245,8 @@ class _MongoDocumentEditorState extends material.State<MongoDocumentEditor> {

@override
material.Widget build(material.BuildContext context) {
final cs = Theme.of(context).colorScheme;
final shadcnCs = shadcn.Theme.of(context).colorScheme;
final cs = context.colors;
final shadcnCs = context.colors;
final workbench = context.workbench;
final editorTheme = context.editorTheme;
final success = workbench.success;
Expand Down
13 changes: 7 additions & 6 deletions lib/features/mongodb/mongo_document_tree_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:convert';
import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:mongo_dart/mongo_dart.dart' show ObjectId;
import 'package:querya_desktop/core/theme/querya_ui_colors.dart';
import 'package:querya_desktop/core/theme/querya_semantic_palette.dart';
import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
import 'package:querya_desktop/core/theme/querya_typography.dart';
Expand Down Expand Up @@ -170,7 +171,7 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {

@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

if (widget.documents.isEmpty) {
return material.Center(
Expand Down Expand Up @@ -256,7 +257,7 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
Widget _buildDocumentNode(
int docIndex,
Map<String, dynamic> doc,
ColorScheme cs,
QueryaUiColors cs,
) {
final docNodeId = 'doc_$docIndex';
final isExpanded = _expandedNodeIds.contains(docNodeId);
Expand Down Expand Up @@ -404,7 +405,7 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
required Object keyOrIndex,
required Object? value,
required int depth,
required ColorScheme cs,
required QueryaUiColors cs,
}) {
final currentPath = appendJsonPath(parentPath, keyOrIndex);
final nodeId = 'doc_${docIndex}_$currentPath';
Expand Down Expand Up @@ -519,7 +520,7 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
required bool isExpanded,
required String jsonPath,
required Object rawSubtree,
required ColorScheme cs,
required QueryaUiColors cs,
required VoidCallback onToggle,
required bool matchesSearch,
}) {
Expand Down Expand Up @@ -598,7 +599,7 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {
required Object? value,
required String jsonPath,
required Map<String, dynamic> rootDoc,
required ColorScheme cs,
required QueryaUiColors cs,
}) {
final keyLabel = keyOrIndex is int ? '[$keyOrIndex]' : keyOrIndex.toString();
final valueDisplay = _formatLeafDisplay(value);
Expand Down Expand Up @@ -711,7 +712,7 @@ class _MongoDocumentTreeViewState extends State<MongoDocumentTreeView> {

Color _leafValueColor(
Object? value,
ColorScheme cs,
QueryaUiColors cs,
QueryaSemanticPalette palette,
) {
if (value == null) return palette.muted;
Expand Down
3 changes: 2 additions & 1 deletion lib/features/mongodb/mongo_documents_json_view.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
import 'package:querya_desktop/core/editor/querya_code_editor.dart';
import 'package:querya_desktop/core/editor/querya_code_language.dart';
import 'package:querya_desktop/core/editor/syntax_highlight_service.dart';
Expand Down Expand Up @@ -63,7 +64,7 @@ class _MongoDocumentsJsonViewState extends State<MongoDocumentsJsonView> {

@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

if (widget.documents.isEmpty) {
return material.Center(
Expand Down
3 changes: 2 additions & 1 deletion lib/features/mongodb/mongo_documents_table_view.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart' as material;
import 'package:flutter/services.dart';
import 'package:mongo_dart/mongo_dart.dart' show ObjectId;
import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
import 'package:querya_desktop/features/mongodb/mongo_ejson.dart';
import 'package:querya_desktop/features/workspace/result_grid_view.dart';
import 'package:querya_desktop/shared/widgets/app_toast.dart';
Expand Down Expand Up @@ -160,7 +161,7 @@ class _MongoDocumentsTableViewState extends State<MongoDocumentsTableView> {

@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
final cs = context.colors;

if (widget.documents.isEmpty || _gridData.columns.isEmpty) {
return material.Center(
Expand Down
Loading
Loading