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

lib/features/labels/storage_path/view/widgets/storage_path_widget.dart

@@ -2,23 +2,21 @@ 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/label_repository.dart';
-import 'package:paperless_mobile/features/documents/bloc/documents_cubit.dart';
 import 'package:paperless_mobile/features/labels/bloc/label_cubit.dart';
 import 'package:paperless_mobile/features/labels/bloc/label_state.dart';
-import 'package:paperless_mobile/util.dart';
 
 class StoragePathWidget extends StatelessWidget {
   final int? pathId;
-  final void Function()? afterSelected;
   final Color? textColor;
   final bool isClickable;
+  final void Function(int? id)? onSelected;
 
   const StoragePathWidget({
     Key? key,
     this.pathId,
-    this.afterSelected,
     this.textColor,
     this.isClickable = true,
+    this.onSelected,
   }) : super(key: key);
 
   @override
@@ -32,7 +30,7 @@ class StoragePathWidget extends StatelessWidget {
         child: BlocBuilder<LabelCubit<StoragePath>, LabelState<StoragePath>>(
           builder: (context, state) {
             return GestureDetector(
-              onTap: () => _addStoragePathToFilter(context),
+              onTap: () => onSelected?.call(pathId),
               child: Text(
                 state.getLabel(pathId)?.name ?? "-",
                 maxLines: 1,
@@ -47,24 +45,4 @@ class StoragePathWidget extends StatelessWidget {
       ),
     );
   }
-
-  void _addStoragePathToFilter(BuildContext context) {
-    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)),
-        );
-      }
-      afterSelected?.call();
-    } on PaperlessServerException catch (error, stackTrace) {
-      showErrorMessage(context, error, stackTrace);
-    }
-  }
 }