Resetting filter doesn't reset sorting, some bugfixes and UI updates

lib/features/documents/view/pages/documents_page.dart

@@ -151,22 +151,28 @@ class _DocumentsPageState extends State<DocumentsPage> {
             switch (settings.preferredViewType) {
               case ViewType.list:
                 child = DocumentListView(
-                  onTap: _openDetails,
                   state: state,
+                  onTap: _openDetails,
                   onSelected: _onSelected,
                   pagingController: _pagingController,
                   hasInternetConnection: isConnected,
                   onTagSelected: _addTagToFilter,
+                  onCorrespondentSelected: _addCorrespondentToFilter,
+                  onDocumentTypeSelected: _addDocumentTypeToFilter,
+                  onStoragePathSelected: _addStoragePathToFilter,
                 );
                 break;
               case ViewType.grid:
                 child = DocumentGridView(
-                  onTap: _openDetails,
                   state: state,
+                  onTap: _openDetails,
                   onSelected: _onSelected,
                   pagingController: _pagingController,
                   hasInternetConnection: isConnected,
                   onTagSelected: _addTagToFilter,
+                  onCorrespondentSelected: _addCorrespondentToFilter,
+                  onDocumentTypeSelected: _addDocumentTypeToFilter,
+                  onStoragePathSelected: _addStoragePathToFilter,
                 );
                 break;
             }
@@ -176,7 +182,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
                 child: DocumentsEmptyState(
                   state: state,
                   onReset: () {
-                    _documentsCubit.updateFilter();
+                    _documentsCubit.resetFilter();
                     _savedViewCubit.resetSelection();
                   },
                 ),
@@ -195,7 +201,7 @@ class _DocumentsPageState extends State<DocumentsPage> {
                     listener: (context, state) {
                       try {
                         if (state.selectedSavedViewId == null) {
-                          _documentsCubit.updateFilter();
+                          _documentsCubit.resetFilter();
                         } else {
                           final newFilter = state
                               .value[state.selectedSavedViewId]
@@ -280,6 +286,63 @@ class _DocumentsPageState extends State<DocumentsPage> {
     }
   }
 
+  void _addCorrespondentToFilter(int? correspondentId) {
+    final cubit = BlocProvider.of<DocumentsCubit>(context);
+    try {
+      if (cubit.state.filter.correspondent.id == correspondentId) {
+        cubit.updateCurrentFilter(
+          (filter) =>
+              filter.copyWith(correspondent: const CorrespondentQuery.unset()),
+        );
+      } else {
+        cubit.updateCurrentFilter(
+          (filter) => filter.copyWith(
+              correspondent: CorrespondentQuery.fromId(correspondentId)),
+        );
+      }
+    } on PaperlessServerException catch (error, stackTrace) {
+      showErrorMessage(context, error, stackTrace);
+    }
+  }
+
+  void _addDocumentTypeToFilter(int? documentTypeId) {
+    final cubit = BlocProvider.of<DocumentsCubit>(context);
+    try {
+      if (cubit.state.filter.documentType.id == documentTypeId) {
+        cubit.updateCurrentFilter(
+          (filter) =>
+              filter.copyWith(documentType: const DocumentTypeQuery.unset()),
+        );
+      } else {
+        cubit.updateCurrentFilter(
+          (filter) => filter.copyWith(
+              documentType: DocumentTypeQuery.fromId(documentTypeId)),
+        );
+      }
+    } on PaperlessServerException catch (error, stackTrace) {
+      showErrorMessage(context, error, stackTrace);
+    }
+  }
+
+  void _addStoragePathToFilter(int? pathId) {
+    final cubit = BlocProvider.of<DocumentsCubit>(context);
+    try {
+      if (cubit.state.filter.correspondent.id == pathId) {
+        cubit.updateCurrentFilter(
+          (filter) =>
+              filter.copyWith(storagePath: const StoragePathQuery.unset()),
+        );
+      } else {
+        cubit.updateCurrentFilter(
+          (filter) =>
+              filter.copyWith(storagePath: StoragePathQuery.fromId(pathId)),
+        );
+      }
+    } on PaperlessServerException catch (error, stackTrace) {
+      showErrorMessage(context, error, stackTrace);
+    }
+  }
+
   Future<void> _loadNewPage(int pageKey) async {
     final pageCount = _documentsCubit.state
         .inferPageCount(pageSize: _documentsCubit.state.filter.pageSize);
@@ -299,9 +362,10 @@ class _DocumentsPageState extends State<DocumentsPage> {
 
   Future<void> _onRefresh() async {
     try {
-      await _documentsCubit.updateCurrentFilter(
+      _documentsCubit.updateCurrentFilter(
         (filter) => filter.copyWith(page: 1),
       );
+      _savedViewCubit.reload();
     } on PaperlessServerException catch (error, stackTrace) {
       showErrorMessage(context, error, stackTrace);
     }

lib/features/documents/view/widgets/grid/document_grid.dart

@@ -12,6 +12,9 @@ class DocumentGridView extends StatelessWidget {
   final DocumentsState state;
   final bool hasInternetConnection;
   final void Function(int tagId) onTagSelected;
+  final void Function(int correspondentId) onCorrespondentSelected;
+  final void Function(int correspondentId) onDocumentTypeSelected;
+  final void Function(int? id)? onStoragePathSelected;
 
   const DocumentGridView({
     super.key,
@@ -21,6 +24,9 @@ class DocumentGridView extends StatelessWidget {
     required this.onSelected,
     required this.hasInternetConnection,
     required this.onTagSelected,
+    required this.onCorrespondentSelected,
+    required this.onDocumentTypeSelected,
+    this.onStoragePathSelected,
   });
   @override
   Widget build(BuildContext context) {

lib/features/documents/view/widgets/list/document_list.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/provider/label_repositories_provider.dart';
 import 'package:paperless_mobile/core/widgets/documents_list_loading_widget.dart';
@@ -16,7 +15,10 @@ class DocumentListView extends StatelessWidget {
   final DocumentsState state;
   final bool hasInternetConnection;
   final bool isLabelClickable;
-  final void Function(int tagId) onTagSelected;
+  final void Function(int id)? onTagSelected;
+  final void Function(int? id)? onCorrespondentSelected;
+  final void Function(int? id)? onDocumentTypeSelected;
+  final void Function(int? id)? onStoragePathSelected;
 
   const DocumentListView({
     super.key,
@@ -26,7 +28,10 @@ class DocumentListView extends StatelessWidget {
     required this.onSelected,
     required this.hasInternetConnection,
     this.isLabelClickable = true,
-    required this.onTagSelected,
+    this.onTagSelected,
+    this.onCorrespondentSelected,
+    this.onDocumentTypeSelected,
+    this.onStoragePathSelected,
   });
 
   @override
@@ -52,6 +57,9 @@ class DocumentListView extends StatelessWidget {
                     : false;
               },
               onTagSelected: onTagSelected,
+              onCorrespondentSelected: onCorrespondentSelected,
+              onDocumentTypeSelected: onDocumentTypeSelected,
+              onStoragePathSelected: onStoragePathSelected,
             ),
           );
         },

lib/features/documents/view/widgets/list/document_list_item.dart

@@ -14,7 +14,10 @@ class DocumentListItem extends StatelessWidget {
   final bool isLabelClickable;
   final bool Function(int tagId) isTagSelectedPredicate;
 
-  final void Function(int tagId) onTagSelected;
+  final void Function(int tagId)? onTagSelected;
+  final void Function(int? correspondentId)? onCorrespondentSelected;
+  final void Function(int? documentTypeId)? onDocumentTypeSelected;
+  final void Function(int? id)? onStoragePathSelected;
 
   const DocumentListItem({
     Key? key,
@@ -25,7 +28,10 @@ class DocumentListItem extends StatelessWidget {
     required this.isAtLeastOneSelected,
     this.isLabelClickable = true,
     required this.isTagSelectedPredicate,
-    required this.onTagSelected,
+    this.onTagSelected,
+    this.onCorrespondentSelected,
+    this.onDocumentTypeSelected,
+    this.onStoragePathSelected,
   }) : super(key: key);
 
   @override
@@ -48,6 +54,7 @@ class DocumentListItem extends StatelessWidget {
                   child: CorrespondentWidget(
                     isClickable: isLabelClickable,
                     correspondentId: document.correspondent,
+                    onSelected: onCorrespondentSelected,
                   ),
                 ),
               ],
@@ -68,7 +75,7 @@ class DocumentListItem extends StatelessWidget {
               tagIds: document.tags,
               isMultiLine: false,
               isSelectedPredicate: isTagSelectedPredicate,
-              onTagSelected: onTagSelected,
+              onTagSelected: (id) => onTagSelected?.call(id),
             ),
           ),
         ),

lib/features/documents/view/widgets/search/document_filter_panel.dart

@@ -123,7 +123,12 @@ class _DocumentFilterPanelState extends State<DocumentFilterPanel> {
 
   void _resetFilter() async {
     FocusScope.of(context).unfocus();
-    Navigator.pop(context, DocumentFilter.initial);
+    Navigator.pop(
+        context,
+        DocumentFilter.initial.copyWith(
+          sortField: widget.initialFilter.sortField,
+          sortOrder: widget.initialFilter.sortOrder,
+        ));
   }
 
   Widget _buildDocumentTypeFormField() {