fix: Add custom fields, translations, add app logs to login routes

2025-12-08 22:07:57 -06:00 · 2023-12-10 12:48:32 +01:00
parent 5e5e5d2df3
commit 9f6b95f506
102 changed files with 2399 additions and 1088 deletions
--- a/lib/features/document_bulk_action/cubit/document_bulk_action_cubit.dart
+++ b/lib/features/document_bulk_action/cubit/document_bulk_action_cubit.dart
@@ -3,30 +3,23 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:collection/collection.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/bloc/transient_error.dart';
 import 'package:paperless_mobile/core/notifier/document_changed_notifier.dart';
 import 'package:paperless_mobile/core/repository/label_repository.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';

 part 'document_bulk_action_state.dart';
-part 'document_bulk_action_cubit.freezed.dart';

 class DocumentBulkActionCubit extends Cubit<DocumentBulkActionState> {
  final PaperlessDocumentsApi _documentsApi;
-  final LabelRepository _labelRepository;
  final DocumentChangedNotifier _notifier;

  DocumentBulkActionCubit(
    this._documentsApi,
-    this._labelRepository,
    this._notifier, {
    required List<DocumentModel> selection,
  }) : super(
          DocumentBulkActionState(
            selection: selection,
-            correspondents: _labelRepository.state.correspondents,
-            documentTypes: _labelRepository.state.documentTypes,
-            storagePaths: _labelRepository.state.storagePaths,
-            tags: _labelRepository.state.tags,
          ),
        ) {
    _notifier.addListener(
@@ -42,19 +35,6 @@ class DocumentBulkActionCubit extends Cubit<DocumentBulkActionState> {
        );
      },
    );
-    _labelRepository.addListener(
-      this,
-      onChanged: (labels) {
-        emit(
-          state.copyWith(
-            correspondents: labels.correspondents,
-            documentTypes: labels.documentTypes,
-            storagePaths: labels.storagePaths,
-            tags: labels.tags,
-          ),
-        );
-      },
-    );
  }

  Future<void> bulkDelete() async {
@@ -69,47 +49,74 @@ class DocumentBulkActionCubit extends Cubit<DocumentBulkActionState> {
  }

  Future<void> bulkModifyCorrespondent(int? correspondentId) async {
-    final modifiedDocumentIds = await _documentsApi.bulkAction(
-      BulkModifyLabelAction.correspondent(
-        state.selectedIds,
-        labelId: correspondentId,
-      ),
-    );
-    final updatedDocuments = state.selection
-        .where((element) => modifiedDocumentIds.contains(element.id))
-        .map((doc) => doc.copyWith(correspondent: () => correspondentId));
-    for (final doc in updatedDocuments) {
-      _notifier.notifyUpdated(doc);
+    try {
+      final modifiedDocumentIds = await _documentsApi.bulkAction(
+        BulkModifyLabelAction.correspondent(
+          state.selectedIds,
+          labelId: correspondentId,
+        ),
+      );
+      final updatedDocuments = state.selection
+          .where((element) => modifiedDocumentIds.contains(element.id))
+          .map((doc) => doc.copyWith(correspondent: () => correspondentId));
+      for (final doc in updatedDocuments) {
+        _notifier.notifyUpdated(doc);
+      }
+    } on PaperlessApiException catch (e) {
+      addError(
+        TransientPaperlessApiError(
+          code: e.code,
+          details: e.details,
+        ),
+      );
    }
  }

  Future<void> bulkModifyDocumentType(int? documentTypeId) async {
-    final modifiedDocumentIds = await _documentsApi.bulkAction(
-      BulkModifyLabelAction.documentType(
-        state.selectedIds,
-        labelId: documentTypeId,
-      ),
-    );
-    final updatedDocuments = state.selection
-        .where((element) => modifiedDocumentIds.contains(element.id))
-        .map((doc) => doc.copyWith(documentType: () => documentTypeId));
-    for (final doc in updatedDocuments) {
-      _notifier.notifyUpdated(doc);
+    try {
+      final modifiedDocumentIds = await _documentsApi.bulkAction(
+        BulkModifyLabelAction.documentType(
+          state.selectedIds,
+          labelId: documentTypeId,
+        ),
+      );
+      final updatedDocuments = state.selection
+          .where((element) => modifiedDocumentIds.contains(element.id))
+          .map((doc) => doc.copyWith(documentType: () => documentTypeId));
+      for (final doc in updatedDocuments) {
+        _notifier.notifyUpdated(doc);
+      }
+    } on PaperlessApiException catch (e) {
+      addError(
+        TransientPaperlessApiError(
+          code: e.code,
+          details: e.details,
+        ),
+      );
    }
  }

  Future<void> bulkModifyStoragePath(int? storagePathId) async {
-    final modifiedDocumentIds = await _documentsApi.bulkAction(
-      BulkModifyLabelAction.storagePath(
-        state.selectedIds,
-        labelId: storagePathId,
-      ),
-    );
-    final updatedDocuments = state.selection
-        .where((element) => modifiedDocumentIds.contains(element.id))
-        .map((doc) => doc.copyWith(storagePath: () => storagePathId));
-    for (final doc in updatedDocuments) {
-      _notifier.notifyUpdated(doc);
+    try {
+      final modifiedDocumentIds = await _documentsApi.bulkAction(
+        BulkModifyLabelAction.storagePath(
+          state.selectedIds,
+          labelId: storagePathId,
+        ),
+      );
+      final updatedDocuments = state.selection
+          .where((element) => modifiedDocumentIds.contains(element.id))
+          .map((doc) => doc.copyWith(storagePath: () => storagePathId));
+      for (final doc in updatedDocuments) {
+        _notifier.notifyUpdated(doc);
+      }
+    } on PaperlessApiException catch (e) {
+      addError(
+        TransientPaperlessApiError(
+          code: e.code,
+          details: e.details,
+        ),
+      );
    }
  }

@@ -117,28 +124,36 @@ class DocumentBulkActionCubit extends Cubit<DocumentBulkActionState> {
    Iterable<int> addTagIds = const [],
    Iterable<int> removeTagIds = const [],
  }) async {
-    final modifiedDocumentIds = await _documentsApi.bulkAction(
-      BulkModifyTagsAction(
-        state.selectedIds,
-        addTags: addTagIds,
-        removeTags: removeTagIds,
-      ),
-    );
-    final updatedDocuments = state.selection
-        .where((element) => modifiedDocumentIds.contains(element.id))
-        .map((doc) => doc.copyWith(tags: [
-              ...doc.tags.toSet().difference(removeTagIds.toSet()),
-              ...addTagIds
-            ]));
-    for (final doc in updatedDocuments) {
-      _notifier.notifyUpdated(doc);
+    try {
+      final modifiedDocumentIds = await _documentsApi.bulkAction(
+        BulkModifyTagsAction(
+          state.selectedIds,
+          addTags: addTagIds,
+          removeTags: removeTagIds,
+        ),
+      );
+      final updatedDocuments = state.selection
+          .where((element) => modifiedDocumentIds.contains(element.id))
+          .map((doc) => doc.copyWith(tags: [
+                ...doc.tags.toSet().difference(removeTagIds.toSet()),
+                ...addTagIds
+              ]));
+      for (final doc in updatedDocuments) {
+        _notifier.notifyUpdated(doc);
+      }
+    } on PaperlessApiException catch (e) {
+      addError(
+        TransientPaperlessApiError(
+          code: e.code,
+          details: e.details,
+        ),
+      );
    }
  }

  @override
  Future<void> close() {
    _notifier.removeListener(this);
-    _labelRepository.removeListener(this);
    return super.close();
  }
 }
--- a/lib/features/document_bulk_action/cubit/document_bulk_action_state.dart
+++ b/lib/features/document_bulk_action/cubit/document_bulk_action_state.dart
@@ -1,15 +1,18 @@
 part of 'document_bulk_action_cubit.dart';

-@freezed
-class DocumentBulkActionState with _$DocumentBulkActionState {
-  const DocumentBulkActionState._();
-  const factory DocumentBulkActionState({
-    required List<DocumentModel> selection,
-    required Map<int, Correspondent> correspondents,
-    required Map<int, DocumentType> documentTypes,
-    required Map<int, Tag> tags,
-    required Map<int, StoragePath> storagePaths,
-  }) = _DocumentBulkActionState;
+class DocumentBulkActionState {
+  final List<DocumentModel> selection;
+
+  DocumentBulkActionState({
+    required this.selection,
+  });

  Iterable<int> get selectedIds => selection.map((d) => d.id);
+  DocumentBulkActionState copyWith({
+    List<DocumentModel>? selection,
+  }) {
+    return DocumentBulkActionState(
+      selection: selection ?? this.selection,
+    );
+  }
 }
--- a/lib/features/document_bulk_action/view/widgets/fullscreen_bulk_edit_tags_widget.dart
+++ b/lib/features/document_bulk_action/view/widgets/fullscreen_bulk_edit_tags_widget.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:paperless_api/paperless_api.dart';
+import 'package:paperless_mobile/core/repository/label_repository.dart';
 import 'package:paperless_mobile/core/widgets/form_fields/fullscreen_selection_form.dart';
 import 'package:paperless_mobile/core/extensions/dart_extensions.dart';
 import 'package:paperless_mobile/features/document_bulk_action/cubit/document_bulk_action_cubit.dart';
@@ -35,11 +36,12 @@ class _FullscreenBulkEditTagsWidgetState
  void initState() {
    super.initState();
    final state = context.read<DocumentBulkActionCubit>().state;
+    final labels = context.read<LabelRepository>();
    _sharedTags = state.selection
        .map((e) => e.tags)
        .map((e) => e.toSet())
        .fold(
-          state.tags.values.map((e) => e.id!).toSet(),
+          labels.tags.values.map((e) => e.id!).toSet(),
          (previousValue, element) => previousValue.intersection(element),
        )
        .toList();
@@ -49,14 +51,10 @@ class _FullscreenBulkEditTagsWidgetState
        .toSet()
        .difference(_sharedTags.toSet())
        .toList();
-    _filteredTags = state.tags.keys.toList();
+    _filteredTags = labels.tags.keys.toList();
    _controller.addListener(() {
      setState(() {
-        _filteredTags = context
-            .read<DocumentBulkActionCubit>()
-            .state
-            .tags
-            .values
+        _filteredTags = labels.tags.values
            .where((e) =>
                e.name.normalized().contains(_controller.text.normalized()))
            .map((e) => e.id!)
@@ -69,6 +67,7 @@ class _FullscreenBulkEditTagsWidgetState

  @override
  Widget build(BuildContext context) {
+    final labelRepository = context.watch<LabelRepository>();
    return BlocBuilder<DocumentBulkActionCubit, DocumentBulkActionState>(
      builder: (context, state) {
        return FullscreenSelectionForm(
@@ -86,7 +85,7 @@ class _FullscreenBulkEditTagsWidgetState
          selectionBuilder: (context, index) {
            return _buildTagOption(
              _filteredTags[index],
-              state.tags,
+              labelRepository.tags,
            );
          },
          selectionCount: _filteredTags.length,
@@ -155,11 +154,12 @@ class _FullscreenBulkEditTagsWidgetState
  void _submit() async {
    if (_addTags.isNotEmpty || _removeTags.isNotEmpty) {
      final bloc = context.read<DocumentBulkActionCubit>();
+      final labelRepository = context.read<LabelRepository>();
      final addNames = _addTags
-          .map((value) => "\"${bloc.state.tags[value]!.name}\"")
+          .map((value) => "\"${labelRepository.tags[value]!.name}\"")
          .toList();
      final removeNames = _removeTags
-          .map((value) => "\"${bloc.state.tags[value]!.name}\"")
+          .map((value) => "\"${labelRepository.tags[value]!.name}\"")
          .toList();
      final shouldPerformAction = await showDialog<bool>(
            context: context,