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

lib/features/edit_label/cubit/edit_label_cubit.dart

@@ -1,34 +1,44 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
 import 'package:paperless_api/paperless_api.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
-
+import 'package:paperless_mobile/features/labels/cubit/label_cubit_mixin.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
 part 'edit_label_state.dart';
+part 'edit_label_cubit.freezed.dart';
 
-class EditLabelCubit<T extends Label> extends Cubit<EditLabelState<T>> {
-  final LabelRepository<T> _repository;
+class EditLabelCubit extends Cubit<EditLabelState> with LabelCubitMixin {
+  @override
+  final LabelRepository labelRepository;
 
-  StreamSubscription? _subscription;
-
-  EditLabelCubit(LabelRepository<T> repository)
-      : _repository = repository,
-        super(EditLabelState<T>(labels: repository.current?.values ?? {})) {
-    _subscription = repository.values.listen(
-      (event) => emit(EditLabelState(labels: event?.values ?? {})),
+  EditLabelCubit(this.labelRepository) : super(const EditLabelState()) {
+    labelRepository.subscribe(
+      this,
+      onChanged: (labels) => state.copyWith(
+        correspondents: labels.correspondents,
+        documentTypes: labels.documentTypes,
+        tags: labels.tags,
+        storagePaths: labels.storagePaths,
+      ),
     );
   }
 
-  Future<T> create(T label) => _repository.create(label);
-
-  Future<T> update(T label) => _repository.update(label);
-
-  Future<void> delete(T label) => _repository.delete(label);
-
   @override
   Future<void> close() {
-    _subscription?.cancel();
+    labelRepository.unsubscribe(this);
     return super.close();
   }
+
+  @override
+  Map<int, Correspondent> get correspondents => state.correspondents;
+
+  @override
+  Map<int, DocumentType> get documentTypes => state.documentTypes;
+
+  @override
+  Map<int, StoragePath> get storagePaths => state.storagePaths;
+
+  @override
+  Map<int, Tag> get tags => state.tags;
 }

lib/features/edit_label/cubit/edit_label_cubit.freezed.dart

@@ -0,0 +1,237 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'edit_label_cubit.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
+
+/// @nodoc
+mixin _$EditLabelState {
+  Map<int, Correspondent> get correspondents =>
+      throw _privateConstructorUsedError;
+  Map<int, DocumentType> get documentTypes =>
+      throw _privateConstructorUsedError;
+  Map<int, Tag> get tags => throw _privateConstructorUsedError;
+  Map<int, StoragePath> get storagePaths => throw _privateConstructorUsedError;
+
+  @JsonKey(ignore: true)
+  $EditLabelStateCopyWith<EditLabelState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $EditLabelStateCopyWith<$Res> {
+  factory $EditLabelStateCopyWith(
+          EditLabelState value, $Res Function(EditLabelState) then) =
+      _$EditLabelStateCopyWithImpl<$Res, EditLabelState>;
+  @useResult
+  $Res call(
+      {Map<int, Correspondent> correspondents,
+      Map<int, DocumentType> documentTypes,
+      Map<int, Tag> tags,
+      Map<int, StoragePath> storagePaths});
+}
+
+/// @nodoc
+class _$EditLabelStateCopyWithImpl<$Res, $Val extends EditLabelState>
+    implements $EditLabelStateCopyWith<$Res> {
+  _$EditLabelStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? correspondents = null,
+    Object? documentTypes = null,
+    Object? tags = null,
+    Object? storagePaths = null,
+  }) {
+    return _then(_value.copyWith(
+      correspondents: null == correspondents
+          ? _value.correspondents
+          : correspondents // ignore: cast_nullable_to_non_nullable
+              as Map<int, Correspondent>,
+      documentTypes: null == documentTypes
+          ? _value.documentTypes
+          : documentTypes // ignore: cast_nullable_to_non_nullable
+              as Map<int, DocumentType>,
+      tags: null == tags
+          ? _value.tags
+          : tags // ignore: cast_nullable_to_non_nullable
+              as Map<int, Tag>,
+      storagePaths: null == storagePaths
+          ? _value.storagePaths
+          : storagePaths // ignore: cast_nullable_to_non_nullable
+              as Map<int, StoragePath>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$_EditLabelStateCopyWith<$Res>
+    implements $EditLabelStateCopyWith<$Res> {
+  factory _$$_EditLabelStateCopyWith(
+          _$_EditLabelState value, $Res Function(_$_EditLabelState) then) =
+      __$$_EditLabelStateCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {Map<int, Correspondent> correspondents,
+      Map<int, DocumentType> documentTypes,
+      Map<int, Tag> tags,
+      Map<int, StoragePath> storagePaths});
+}
+
+/// @nodoc
+class __$$_EditLabelStateCopyWithImpl<$Res>
+    extends _$EditLabelStateCopyWithImpl<$Res, _$_EditLabelState>
+    implements _$$_EditLabelStateCopyWith<$Res> {
+  __$$_EditLabelStateCopyWithImpl(
+      _$_EditLabelState _value, $Res Function(_$_EditLabelState) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? correspondents = null,
+    Object? documentTypes = null,
+    Object? tags = null,
+    Object? storagePaths = null,
+  }) {
+    return _then(_$_EditLabelState(
+      correspondents: null == correspondents
+          ? _value._correspondents
+          : correspondents // ignore: cast_nullable_to_non_nullable
+              as Map<int, Correspondent>,
+      documentTypes: null == documentTypes
+          ? _value._documentTypes
+          : documentTypes // ignore: cast_nullable_to_non_nullable
+              as Map<int, DocumentType>,
+      tags: null == tags
+          ? _value._tags
+          : tags // ignore: cast_nullable_to_non_nullable
+              as Map<int, Tag>,
+      storagePaths: null == storagePaths
+          ? _value._storagePaths
+          : storagePaths // ignore: cast_nullable_to_non_nullable
+              as Map<int, StoragePath>,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$_EditLabelState implements _EditLabelState {
+  const _$_EditLabelState(
+      {final Map<int, Correspondent> correspondents = const {},
+      final Map<int, DocumentType> documentTypes = const {},
+      final Map<int, Tag> tags = const {},
+      final Map<int, StoragePath> storagePaths = const {}})
+      : _correspondents = correspondents,
+        _documentTypes = documentTypes,
+        _tags = tags,
+        _storagePaths = storagePaths;
+
+  final Map<int, Correspondent> _correspondents;
+  @override
+  @JsonKey()
+  Map<int, Correspondent> get correspondents {
+    if (_correspondents is EqualUnmodifiableMapView) return _correspondents;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_correspondents);
+  }
+
+  final Map<int, DocumentType> _documentTypes;
+  @override
+  @JsonKey()
+  Map<int, DocumentType> get documentTypes {
+    if (_documentTypes is EqualUnmodifiableMapView) return _documentTypes;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_documentTypes);
+  }
+
+  final Map<int, Tag> _tags;
+  @override
+  @JsonKey()
+  Map<int, Tag> get tags {
+    if (_tags is EqualUnmodifiableMapView) return _tags;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_tags);
+  }
+
+  final Map<int, StoragePath> _storagePaths;
+  @override
+  @JsonKey()
+  Map<int, StoragePath> get storagePaths {
+    if (_storagePaths is EqualUnmodifiableMapView) return _storagePaths;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableMapView(_storagePaths);
+  }
+
+  @override
+  String toString() {
+    return 'EditLabelState(correspondents: $correspondents, documentTypes: $documentTypes, tags: $tags, storagePaths: $storagePaths)';
+  }
+
+  @override
+  bool operator ==(dynamic other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$_EditLabelState &&
+            const DeepCollectionEquality()
+                .equals(other._correspondents, _correspondents) &&
+            const DeepCollectionEquality()
+                .equals(other._documentTypes, _documentTypes) &&
+            const DeepCollectionEquality().equals(other._tags, _tags) &&
+            const DeepCollectionEquality()
+                .equals(other._storagePaths, _storagePaths));
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(_correspondents),
+      const DeepCollectionEquality().hash(_documentTypes),
+      const DeepCollectionEquality().hash(_tags),
+      const DeepCollectionEquality().hash(_storagePaths));
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$_EditLabelStateCopyWith<_$_EditLabelState> get copyWith =>
+      __$$_EditLabelStateCopyWithImpl<_$_EditLabelState>(this, _$identity);
+}
+
+abstract class _EditLabelState implements EditLabelState {
+  const factory _EditLabelState(
+      {final Map<int, Correspondent> correspondents,
+      final Map<int, DocumentType> documentTypes,
+      final Map<int, Tag> tags,
+      final Map<int, StoragePath> storagePaths}) = _$_EditLabelState;
+
+  @override
+  Map<int, Correspondent> get correspondents;
+  @override
+  Map<int, DocumentType> get documentTypes;
+  @override
+  Map<int, Tag> get tags;
+  @override
+  Map<int, StoragePath> get storagePaths;
+  @override
+  @JsonKey(ignore: true)
+  _$$_EditLabelStateCopyWith<_$_EditLabelState> get copyWith =>
+      throw _privateConstructorUsedError;
+}

lib/features/edit_label/cubit/edit_label_state.dart

@@ -1,10 +1,11 @@
 part of 'edit_label_cubit.dart';
 
-class EditLabelState<T> extends Equatable {
-  final Map<int, T> labels;
-
-  const EditLabelState({this.labels = const {}});
-
-  @override
-  List<Object> get props => [labels];
+@freezed
+class EditLabelState with _$EditLabelState {
+  const factory EditLabelState({
+    @Default({}) Map<int, Correspondent> correspondents,
+    @Default({}) Map<int, DocumentType> documentTypes,
+    @Default({}) Map<int, Tag> tags,
+    @Default({}) Map<int, StoragePath> storagePaths,
+  }) = _EditLabelState;
 }

lib/features/edit_label/view/add_label_page.dart

@@ -2,7 +2,6 @@ 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/core/repository/state/indexed_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/label_form.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
@@ -12,6 +11,7 @@ class AddLabelPage<T extends Label> extends StatelessWidget {
   final Widget pageTitle;
   final T Function(Map<String, dynamic> json) fromJsonT;
   final List<Widget> additionalFields;
+  final Future<T> Function(BuildContext context, T label) onSubmit;
 
   const AddLabelPage({
     super.key,
@@ -19,19 +19,21 @@ class AddLabelPage<T extends Label> extends StatelessWidget {
     required this.pageTitle,
     required this.fromJsonT,
     this.additionalFields = const [],
+    required this.onSubmit,
   });
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) => EditLabelCubit(
-        context.read<LabelRepository<T>>(),
+        context.read<LabelRepository>(),
       ),
       child: AddLabelFormWidget(
         pageTitle: pageTitle,
         label: initialName != null ? fromJsonT({'name': initialName}) : null,
         additionalFields: additionalFields,
         fromJsonT: fromJsonT,
+        onSubmit: onSubmit,
       ),
     );
   }
@@ -41,6 +43,7 @@ class AddLabelFormWidget<T extends Label> extends StatelessWidget {
   final T? label;
   final T Function(Map<String, dynamic> json) fromJsonT;
   final List<Widget> additionalFields;
+  final Future<T> Function(BuildContext context, T label) onSubmit;
 
   final Widget pageTitle;
   const AddLabelFormWidget({
@@ -49,6 +52,7 @@ class AddLabelFormWidget<T extends Label> extends StatelessWidget {
     required this.fromJsonT,
     required this.additionalFields,
     required this.pageTitle,
+    required this.onSubmit,
   });
 
   @override
@@ -63,7 +67,7 @@ class AddLabelFormWidget<T extends Label> extends StatelessWidget {
         submitButtonConfig: SubmitButtonConfig<T>(
           icon: const Icon(Icons.add),
           label: Text(S.of(context)!.create),
-          onSubmit: context.read<EditLabelCubit<T>>().create,
+          onSubmit: (label) => onSubmit(context, label),
         ),
         additionalFields: additionalFields,
       ),

lib/features/edit_label/view/edit_label_page.dart

@@ -1,40 +1,43 @@
 import 'dart:developer';
 
-import 'package:dio/dio.dart';
 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/core/repository/state/indexed_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/label_form.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
 
 import 'package:paperless_mobile/helpers/message_helpers.dart';
-import 'package:paperless_mobile/constants.dart';
 
 class EditLabelPage<T extends Label> extends StatelessWidget {
   final T label;
   final T Function(Map<String, dynamic> json) fromJsonT;
   final List<Widget> additionalFields;
+  final Future<T> Function(BuildContext context, T label) onSubmit;
+  final Future<void> Function(BuildContext context, T label) onDelete;
 
   const EditLabelPage({
     super.key,
     required this.label,
     required this.fromJsonT,
     this.additionalFields = const [],
+    required this.onSubmit,
+    required this.onDelete,
   });
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) => EditLabelCubit(
-        context.read<LabelRepository<T>>(),
+        context.read<LabelRepository>(),
       ),
       child: EditLabelForm(
         label: label,
         additionalFields: additionalFields,
         fromJsonT: fromJsonT,
+        onSubmit: onSubmit,
+        onDelete: onDelete,
       ),
     );
   }
@@ -44,12 +47,16 @@ class EditLabelForm<T extends Label> extends StatelessWidget {
   final T label;
   final T Function(Map<String, dynamic> json) fromJsonT;
   final List<Widget> additionalFields;
+  final Future<T> Function(BuildContext context, T label) onSubmit;
+  final Future<void> Function(BuildContext context, T label) onDelete;
 
   const EditLabelForm({
     super.key,
     required this.label,
     required this.fromJsonT,
     required this.additionalFields,
+    required this.onSubmit,
+    required this.onDelete,
   });
 
   @override
@@ -70,7 +77,7 @@ class EditLabelForm<T extends Label> extends StatelessWidget {
         submitButtonConfig: SubmitButtonConfig<T>(
           icon: const Icon(Icons.save),
           label: Text(S.of(context)!.saveChanges),
-          onSubmit: context.read<EditLabelCubit<T>>().update,
+          onSubmit: (label) => onSubmit(context, label),
         ),
         additionalFields: additionalFields,
       ),
@@ -107,7 +114,7 @@ class EditLabelForm<T extends Label> extends StatelessWidget {
           false;
       if (shouldDelete) {
         try {
-          context.read<EditLabelCubit<T>>().delete(label);
+          onDelete(context, label);
         } on PaperlessServerException catch (error) {
           showErrorMessage(context, error);
         } catch (error, stackTrace) {
@@ -116,7 +123,7 @@ class EditLabelForm<T extends Label> extends StatelessWidget {
         Navigator.pop(context);
       }
     } else {
-      context.read<EditLabelCubit<T>>().delete(label);
+      onDelete(context, label);
       Navigator.pop(context);
     }
   }

lib/features/edit_label/view/impl/add_correspondent_page.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/widgets.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/core/repository/state/impl/correspondent_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/add_label_page.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
@@ -14,13 +12,15 @@ class AddCorrespondentPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<Correspondent>(
-        context.read<LabelRepository<Correspondent>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: AddLabelPage<Correspondent>(
         pageTitle: Text(S.of(context)!.addCorrespondent),
         fromJsonT: Correspondent.fromJson,
         initialName: initialName,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addCorrespondent(label),
       ),
     );
   }

lib/features/edit_label/view/impl/add_document_type_page.dart

@@ -1,8 +1,6 @@
 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/core/repository/state/impl/document_type_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/add_label_page.dart';
 import 'package:paperless_mobile/generated/l10n/app_localizations.dart';
@@ -17,13 +15,15 @@ class AddDocumentTypePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<DocumentType>(
-        context.read<LabelRepository<DocumentType>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: AddLabelPage<DocumentType>(
         pageTitle: Text(S.of(context)!.addDocumentType),
         fromJsonT: DocumentType.fromJson,
         initialName: initialName,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addDocumentType(label),
       ),
     );
   }

lib/features/edit_label/view/impl/add_storage_path_page.dart

@@ -1,8 +1,6 @@
 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/core/repository/state/impl/storage_path_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/add_label_page.dart';
 import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
@@ -15,13 +13,15 @@ class AddStoragePathPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<StoragePath>(
-        context.read<LabelRepository<StoragePath>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: AddLabelPage<StoragePath>(
         pageTitle: Text(S.of(context)!.addStoragePath),
         fromJsonT: StoragePath.fromJson,
         initialName: initalName,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addStoragePath(label),
         additionalFields: const [
           StoragePathAutofillFormBuilderField(name: StoragePath.pathKey),
           SizedBox(height: 120.0),

lib/features/edit_label/view/impl/add_tag_page.dart

@@ -4,8 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/label_repository.dart';
-import 'package:paperless_mobile/core/repository/state/impl/tag_repository_state.dart';
 import 'package:paperless_mobile/core/widgets/form_builder_fields/form_builder_color_picker.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/add_label_page.dart';
@@ -18,13 +16,15 @@ class AddTagPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<Tag>(
-        context.read<LabelRepository<Tag>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: AddLabelPage<Tag>(
         pageTitle: Text(S.of(context)!.addTag),
         fromJsonT: Tag.fromJson,
         initialName: initialValue,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addTag(label),
         additionalFields: [
           FormBuilderColorPickerField(
             name: Tag.colorKey,

lib/features/edit_label/view/impl/edit_correspondent_page.dart

@@ -1,8 +1,6 @@
 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/core/repository/state/impl/correspondent_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
 
@@ -13,12 +11,16 @@ class EditCorrespondentPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<Correspondent>(
-        context.read<LabelRepository<Correspondent>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: EditLabelPage<Correspondent>(
         label: correspondent,
         fromJsonT: Correspondent.fromJson,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addCorrespondent(label),
+        onDelete: (context, label) =>
+            context.read<EditLabelCubit>().removeCorrespondent(label),
       ),
     );
   }

lib/features/edit_label/view/impl/edit_document_type_page.dart

@@ -2,7 +2,6 @@ import 'package:flutter/widgets.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/core/repository/state/impl/document_type_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
 
@@ -13,12 +12,16 @@ class EditDocumentTypePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<DocumentType>(
-        context.read<LabelRepository<DocumentType>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: EditLabelPage<DocumentType>(
         label: documentType,
         fromJsonT: DocumentType.fromJson,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addDocumentType(label),
+        onDelete: (context, label) =>
+            context.read<EditLabelCubit>().removeDocumentType(label),
       ),
     );
   }

lib/features/edit_label/view/impl/edit_storage_path_page.dart

@@ -1,8 +1,6 @@
 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/core/repository/state/impl/storage_path_repository_state.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
 import 'package:paperless_mobile/features/labels/storage_path/view/widgets/storage_path_autofill_form_builder_field.dart';
@@ -14,12 +12,16 @@ class EditStoragePathPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<StoragePath>(
-        context.read<LabelRepository<StoragePath>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: EditLabelPage<StoragePath>(
         label: storagePath,
         fromJsonT: StoragePath.fromJson,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addStoragePath(label),
+        onDelete: (context, label) =>
+            context.read<EditLabelCubit>().removeStoragePath(label),
         additionalFields: [
           StoragePathAutofillFormBuilderField(
             name: StoragePath.pathKey,

lib/features/edit_label/view/impl/edit_tag_page.dart

@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:paperless_api/paperless_api.dart';
-import 'package:paperless_mobile/core/repository/label_repository.dart';
-import 'package:paperless_mobile/core/repository/state/impl/tag_repository_state.dart';
 import 'package:paperless_mobile/core/widgets/form_builder_fields/form_builder_color_picker.dart';
 import 'package:paperless_mobile/features/edit_label/cubit/edit_label_cubit.dart';
 import 'package:paperless_mobile/features/edit_label/view/edit_label_page.dart';
@@ -17,12 +15,16 @@ class EditTagPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => EditLabelCubit<Tag>(
-        context.read<LabelRepository<Tag>>(),
+      create: (context) => EditLabelCubit(
+        context.read(),
       ),
       child: EditLabelPage<Tag>(
         label: tag,
         fromJsonT: Tag.fromJson,
+        onSubmit: (context, label) =>
+            context.read<EditLabelCubit>().addTag(label),
+        onDelete: (context, label) =>
+            context.read<EditLabelCubit>().removeTag(label),
         additionalFields: [
           FormBuilderColorPickerField(
             initialValue: tag.color,