fix: Add labels to each cubit using repositories and state properties, remove label cubits

lib/features/saved_view/cubit/saved_view_cubit.dart

@@ -2,42 +2,72 @@ import 'dart:async';
 
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/repository/saved_view_repository.dart';
 
 part 'saved_view_state.dart';
+part 'saved_view_cubit.freezed.dart';
 
 class SavedViewCubit extends Cubit<SavedViewState> {
-  final SavedViewRepository _repository;
-  StreamSubscription? _subscription;
+  final SavedViewRepository _savedViewRepository;
+  final LabelRepository _labelRepository;
 
-  SavedViewCubit(this._repository) : super(const SavedViewState()) {
-    _subscription = _repository.values.listen(
-      (savedViews) {
-        if (savedViews?.hasLoaded ?? false) {
-          emit(state.copyWith(value: savedViews?.values, hasLoaded: true));
-        } else {
-          emit(state.copyWith(hasLoaded: false));
-        }
+  SavedViewCubit(this._savedViewRepository, this._labelRepository)
+      : super(SavedViewState.initial(
+          correspondents: _labelRepository.state.correspondents,
+          documentTypes: _labelRepository.state.documentTypes,
+          storagePaths: _labelRepository.state.storagePaths,
+          tags: _labelRepository.state.tags,
+        )) {
+    _labelRepository.subscribe(
+      this,
+      onChanged: (labels) {
+        emit(
+          state.copyWith(
+            correspondents: labels.correspondents,
+            documentTypes: labels.documentTypes,
+            tags: labels.tags,
+            storagePaths: labels.storagePaths,
+          ),
+        );
       },
     );
+
+    _savedViewRepository.subscribe(this, (views) {
+      emit(
+        state.maybeWhen(
+          loaded:
+              (savedViews, correspondents, documentTypes, tags, storagePaths) =>
+                  (state as _SavedViewLoadedState).copyWith(
+            savedViews: views,
+          ),
+          orElse: () => state,
+        ),
+      );
+    });
   }
 
   Future<SavedView> add(SavedView view) async {
-    final savedView = await _repository.create(view);
-    emit(state.copyWith(value: {...state.value, savedView.id!: savedView}));
-    return savedView;
+    return _savedViewRepository.create(view);
   }
 
   Future<int> remove(SavedView view) {
-    return _repository.delete(view);
+    return _savedViewRepository.delete(view);
   }
 
   Future<void> initialize() async {
-    final views = await _repository.findAll();
+    final views = await _savedViewRepository.findAll();
     final values = {for (var element in views) element.id!: element};
     if (!isClosed) {
-      emit(SavedViewState(value: values, hasLoaded: true));
+      emit(SavedViewState.loaded(
+        savedViews: values,
+        correspondents: state.correspondents,
+        documentTypes: state.documentTypes,
+        storagePaths: state.storagePaths,
+        tags: state.tags,
+      ));
     }
   }
 
@@ -45,7 +75,8 @@ class SavedViewCubit extends Cubit<SavedViewState> {
 
   @override
   Future<void> close() {
-    _subscription?.cancel();
+    _savedViewRepository.unsubscribe(this);
+    _labelRepository.unsubscribe(this);
     return super.close();
   }
 }

lib/features/saved_view/cubit/saved_view_state.dart

@@ -1,29 +1,33 @@
 part of 'saved_view_cubit.dart';
 
-class SavedViewState extends Equatable {
-  final bool hasLoaded;
-  final Map<int, SavedView> value;
+@freezed
+class SavedViewState with _$SavedViewState {
+  const factory SavedViewState.initial({
+    required Map<int, Correspondent> correspondents,
+    required Map<int, DocumentType> documentTypes,
+    required Map<int, Tag> tags,
+    required Map<int, StoragePath> storagePaths,
+  }) = _SavedViewIntialState;
 
-  const SavedViewState({
-    this.value = const {},
-    this.hasLoaded = false,
-  });
+  const factory SavedViewState.loading({
+    required Map<int, Correspondent> correspondents,
+    required Map<int, DocumentType> documentTypes,
+    required Map<int, Tag> tags,
+    required Map<int, StoragePath> storagePaths,
+  }) = _SavedViewLoadingState;
 
-  @override
-  List<Object?> get props => [
-        hasLoaded,
-        value,
-      ];
+  const factory SavedViewState.loaded({
+    required Map<int, SavedView> savedViews,
+    required Map<int, Correspondent> correspondents,
+    required Map<int, DocumentType> documentTypes,
+    required Map<int, Tag> tags,
+    required Map<int, StoragePath> storagePaths,
+  }) = _SavedViewLoadedState;
 
-  SavedViewState copyWith({
-    Map<int, SavedView>? value,
-    int? selectedSavedViewId,
-    bool overwriteSelectedSavedViewId = false,
-    bool? hasLoaded,
-  }) {
-    return SavedViewState(
-      value: value ?? this.value,
-      hasLoaded: hasLoaded ?? this.hasLoaded,
-    );
-  }
+  const factory SavedViewState.error({
+    required Map<int, Correspondent> correspondents,
+    required Map<int, DocumentType> documentTypes,
+    required Map<int, Tag> tags,
+    required Map<int, StoragePath> storagePaths,
+  }) = _SavedViewErrorState;
 }

lib/features/saved_view/view/add_saved_view_page.dart

@@ -62,7 +62,7 @@ class _AddSavedViewPageState extends State<AddSavedViewPage> {
                 ],
               ),
             ),
-            Divider(),
+            const Divider(),
             Text(
               "Review filter",
               style: Theme.of(context).textTheme.bodyLarge,
@@ -80,42 +80,6 @@ class _AddSavedViewPageState extends State<AddSavedViewPage> {
     );
   }
 
-  Padding _buildOld(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(8.0),
-      child: Column(
-        children: [
-          FormBuilder(
-            key: _savedViewFormKey,
-            child: Expanded(
-              child: ListView(
-                children: [
-                  FormBuilderTextField(
-                    name: fkName,
-                    validator: FormBuilderValidators.required(),
-                    decoration: InputDecoration(
-                      label: Text(S.of(context)!.name),
-                    ),
-                  ),
-                  FormBuilderCheckbox(
-                    name: fkShowOnDashboard,
-                    initialValue: false,
-                    title: Text(S.of(context)!.showOnDashboard),
-                  ),
-                  FormBuilderCheckbox(
-                    name: fkShowInSidebar,
-                    initialValue: false,
-                    title: Text(S.of(context)!.showInSidebar),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   void _onCreate(BuildContext context) {
     if (_savedViewFormKey.currentState?.saveAndValidate() ?? false) {
       Navigator.pop(

lib/features/saved_view/view/saved_view_list.dart

@@ -12,52 +12,70 @@ class SavedViewList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final savedViewCubit = context.read<SavedViewCubit>();
     return BlocBuilder<ConnectivityCubit, ConnectivityState>(
       builder: (context, connectivity) {
         return BlocBuilder<SavedViewCubit, SavedViewState>(
           builder: (context, state) {
-            if (state.value.isEmpty) {
-              return SliverToBoxAdapter(
-                child: HintCard(
-                  hintText:
-                      S.of(context)!.createViewsToQuicklyFilterYourDocuments,
-                ),
-              );
-            }
-            return SliverList(
-              delegate: SliverChildBuilderDelegate(
-                (context, index) {
-                  final view = state.value.values.elementAt(index);
-                  return ListTile(
-                    enabled: connectivity.isConnected,
-                    title: Text(view.name),
-                    subtitle: Text(
-                      S.of(context)!.nFiltersSet(view.filterRules.length),
+            return state.when(
+              initial: (correspondents, documentTypes, tags, storagePaths) =>
+                  Container(),
+              loading: (correspondents, documentTypes, tags, storagePaths) =>
+                  Center(
+                child: Text("Saved views loading..."),
+              ),
+              loaded: (savedViews, correspondents, documentTypes, tags,
+                  storagePaths) {
+                if (savedViews.isEmpty) {
+                  return SliverToBoxAdapter(
+                    child: HintCard(
+                      hintText: S
+                          .of(context)!
+                          .createViewsToQuicklyFilterYourDocuments,
                     ),
-                    onTap: () {
-                      Navigator.of(context).push(
-                        MaterialPageRoute(
-                          builder: (context) => MultiBlocProvider(
-                            providers: [
-                              BlocProvider(
-                                create: (context) => SavedViewDetailsCubit(
-                                  context.read(),
-                                  context.read(),
-                                  savedView: view,
+                  );
+                }
+                return SliverList(
+                  delegate: SliverChildBuilderDelegate(
+                    (context, index) {
+                      final view = savedViews.values.elementAt(index);
+                      return ListTile(
+                        enabled: connectivity.isConnected,
+                        title: Text(view.name),
+                        subtitle: Text(
+                          S.of(context)!.nFiltersSet(view.filterRules.length),
+                        ),
+                        onTap: () {
+                          Navigator.of(context).push(
+                            MaterialPageRoute(
+                              builder: (context) => MultiBlocProvider(
+                                providers: [
+                                  BlocProvider(
+                                    create: (context) => SavedViewDetailsCubit(
+                                      context.read(),
+                                      context.read(),
+                                      savedView: view,
+                                    ),
+                                  ),
+                                ],
+                                child: SavedViewDetailsPage(
+                                  onDelete:
+                                      context.read<SavedViewCubit>().remove,
                                 ),
                               ),
-                            ],
-                            child: SavedViewDetailsPage(
-                              onDelete: savedViewCubit.remove,
                             ),
-                          ),
-                        ),
+                          );
+                        },
                       );
                     },
-                  );
-                },
-                childCount: state.value.length,
+                    childCount: savedViews.length,
+                  ),
+                );
+              },
+              error: (correspondents, documentTypes, tags, storagePaths) =>
+                  Center(
+                child: Text(
+                  "An error occurred while trying to load the saved views.",
+                ),
               ),
             );
           },