TF-3358 Sort list local email draft by time

Signed-off-by: dab246 <[email protected]>

Author: dab246

lib/features/composer/presentation/composer_controller.dart

@@ -86,8 +86,6 @@ import 'package:tmail_ui_user/features/email/domain/usecases/transform_html_emai
 import 'package:tmail_ui_user/features/email/presentation/extensions/presentation_email_extension.dart';
 import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
 import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_composer_cache_by_id_on_web_interactor.dart';
-import 'package:tmail_ui_user/features/home/data/exceptions/session_exceptions.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/remove_local_email_draft_extension.dart';
@@ -223,17 +221,14 @@ class ComposerController extends BaseController
   ButtonState _saveToDraftButtonState = ButtonState.enabled;
   ButtonState _sendButtonState = ButtonState.enabled;
   ButtonState printDraftButtonState = ButtonState.enabled;
-  int? _savedEmailDraftHash;
+  int? savedEmailDraftHash;
   bool restoringSignatureButton = false;
   bool synchronizeInitDraftHash = false;
   GlobalKey? responsiveContainerKey;
   EmailActionType? currentEmailActionType;
   EmailActionType? savedActionType;
   int minInputLengthAutocomplete = AppConfig.defaultMinInputLengthAutocomplete;
 
-  @visibleForTesting
-  int? get savedEmailDraftHash => _savedEmailDraftHash;
-
   GetEmailContentInteractor get getEmailContentInteractor => _getEmailContentInteractor;
 
   GetServerSettingInteractor get getServerSettingInteractor => _getServerSettingInteractor;
@@ -300,7 +295,7 @@ class ComposerController extends BaseController
   void onClose() {
     _textEditorWeb = null;
     savedActionType = null;
-    _savedEmailDraftHash = null;
+    savedEmailDraftHash = null;
     currentEmailActionType = null;
     emailIdEditing = null;
     maxWithEditor = null;
@@ -447,19 +442,7 @@ class ComposerController extends BaseController
     });
   }
 
-  Future<void> _saveLocalEmailDraftAction() async {
-    autoCreateEmailTag();
-
-    final createEmailRequest = await _generateCreateEmailRequestToSaveAsCache();
-    if (createEmailRequest == null) return;
-
-    await _saveLocalEmailDraftInteractor.execute(
-      createEmailRequest,
-      mailboxDashBoardController.accountId.value!,
-      mailboxDashBoardController.sessionCurrent!.username);
-  }
-
-  Uri? _getUploadUriFromSession(Session session, AccountId accountId) {
+  Uri? getUploadUriFromSession(Session session, AccountId accountId) {
     try {
       return session.getUploadUri(accountId, jmapUrl: dynamicUrlInterceptors.jmapUrl);
     } catch (e) {
@@ -468,63 +451,6 @@ class ComposerController extends BaseController
     }
   }
 
-  Future<CreateEmailRequest?> _generateCreateEmailRequestToSaveAsCache() async {
-    final arguments = composerArguments.value;
-    final session = mailboxDashBoardController.sessionCurrent;
-    final accountId = mailboxDashBoardController.accountId.value;
-
-    if (arguments == null || session == null || accountId == null) {
-      log('ComposerController::_generateCreateEmailRequest: SESSION or ACCOUNT_ID or ARGUMENTS is NULL');
-      return null;
-    }
-
-    String emailContent = await getContentInEditor();
-    if (currentEmailActionType == EmailActionType.compose) {
-      emailContent = await _composerRepository.removeCollapsedExpandedSignatureEffect(
-        emailContent: emailContent,
-      );
-    }
-    final uploadUri = _getUploadUriFromSession(session, accountId);
-
-    final composerIndex = composerId != null
-      ? mailboxDashBoardController.composerManager.getComposerIndex(composerId!)
-      : null;
-
-    return CreateEmailRequest(
-      session: session,
-      accountId: accountId,
-      emailActionType: arguments.emailActionType,
-      subject: subjectEmail.value ?? '',
-      emailContent: emailContent,
-      fromSender: arguments.presentationEmail?.from ?? {},
-      toRecipients: listToEmailAddress.toSet(),
-      ccRecipients: listCcEmailAddress.toSet(),
-      bccRecipients: listBccEmailAddress.toSet(),
-      replyToRecipients: listReplyToEmailAddress.toSet(),
-      hasRequestReadReceipt: hasRequestReadReceipt.value,
-      isMarkAsImportant: isMarkAsImportant.value,
-      identity: identitySelected.value,
-      attachments: uploadController.attachmentsUploaded,
-      inlineAttachments: uploadController.mapInlineAttachments,
-      outboxMailboxId: getOutboxMailboxIdForComposer(),
-      sentMailboxId: getSentMailboxIdForComposer(),
-      draftsMailboxId: getDraftMailboxIdForComposer(),
-      draftsEmailId: getDraftEmailId(),
-      answerForwardEmailId: arguments.presentationEmail?.id,
-      unsubscribeEmailId: arguments.previousEmailId,
-      messageId: arguments.messageId,
-      references: arguments.references,
-      emailSendingQueue: arguments.sendingEmail,
-      displayMode: screenDisplayMode.value,
-      uploadUri: uploadUri,
-      composerIndex: composerIndex,
-      composerId: composerId,
-      savedDraftHash: arguments.savedDraftHash ?? _savedEmailDraftHash,
-      savedActionType: savedActionType ?? currentEmailActionType,
-      savedEmailDraftId: emailIdEditing,
-    );
-  }
-
   void _scrollControllerEmailAddressListener() {
     if (toEmailAddressController.text.isNotEmpty) {
       keyToEmailTagEditor.currentState?.closeSuggestionBox();
@@ -1101,8 +1027,8 @@ class ComposerController extends BaseController
 
   Future<bool> _validateEmailChange() async {
     final newDraftHash = await _hashDraftEmail();
-    log('ComposerController::_validateEmailChange:newDraftHash = $newDraftHash | _savedEmailDraftHash = $_savedEmailDraftHash');
-    return _savedEmailDraftHash != newDraftHash;
+    log('ComposerController::_validateEmailChange:newDraftHash = $newDraftHash | savedEmailDraftHash = $savedEmailDraftHash');
+    return savedEmailDraftHash != newDraftHash;
   }
 
   Future<int> _hashDraftEmail() async {
@@ -1113,7 +1039,7 @@ class ComposerController extends BaseController
     );
     if (emailIdEditing != null &&
         savedActionType == EmailActionType.compose &&
-        currentEmailActionType == EmailActionType.reopenComposerBrowser) {
+        currentEmailActionType == EmailActionType.composeFromLocalEmailDraft) {
       emailContent = await _composerRepository.removeStyleLazyLoadDisplayInlineImages(
         emailContent: emailContent,
       );
@@ -1138,7 +1064,7 @@ class ComposerController extends BaseController
   }
 
   Future<void> _updateSavedEmailDraftHash() async {
-    _savedEmailDraftHash = await _hashDraftEmail();
+    savedEmailDraftHash = await _hashDraftEmail();
   }
 
   Future<void> initEmailDraftHash() async {
@@ -1148,13 +1074,13 @@ class ComposerController extends BaseController
 
     if (currentEmailActionType == EmailActionType.compose ||
         currentEmailActionType == EmailActionType.editDraft) {
-      _savedEmailDraftHash = currentDraftHash;
-    } else if (currentEmailActionType == EmailActionType.reopenComposerBrowser) {
-      _savedEmailDraftHash = oldSavedDraftHash;
+      savedEmailDraftHash = currentDraftHash;
+    } else if (currentEmailActionType == EmailActionType.composeFromLocalEmailDraft) {
+      savedEmailDraftHash = oldSavedDraftHash;
     }
-    log('ComposerController::initEmailDraftHash:oldSavedDraftHash = $oldSavedDraftHash | currentDraftHash = $currentDraftHash | _savedEmailDraftHash = $_savedEmailDraftHash');
+    log('ComposerController::initEmailDraftHash:oldSavedDraftHash = $oldSavedDraftHash | currentDraftHash = $currentDraftHash | savedEmailDraftHash = $savedEmailDraftHash');
 
-    isEmailChanged.value = currentDraftHash != _savedEmailDraftHash;
+    isEmailChanged.value = currentDraftHash != savedEmailDraftHash;
   }
 
   void handleClickSaveAsDraftsButton(BuildContext context) async {

lib/features/composer/presentation/extensions/create_email_request_extension.dart

@@ -14,6 +14,7 @@ import 'package:model/email/mail_priority_header.dart';
 import 'package:model/extensions/account_id_extensions.dart';
 import 'package:model/extensions/email_address_extension.dart';
 import 'package:model/extensions/email_extension.dart';
+import 'package:model/extensions/email_id_extensions.dart';
 import 'package:model/extensions/session_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
 import 'package:tmail_ui_user/features/caching/utils/cache_utils.dart';
@@ -223,6 +224,9 @@ extension CreateEmailRequestExtension on CreateEmailRequest {
       isMarkAsImportant: isMarkAsImportant,
       displayMode: displayMode.name,
       composerIndex: composerIndex,
+      draftHash: savedDraftHash,
+      actionType: savedActionType?.name,
+      draftEmailId: savedEmailDraftId?.asString,
     );
   }
 }

lib/features/composer/presentation/extensions/handle_local_email_draft_extension.dart

@@ -51,6 +51,9 @@ extension HandleLocalEmailDraftExtension on ComposerController {
       uploadUri: uploadUri,
       composerIndex: composerIndex,
       composerId: composerId,
+      savedDraftHash: arguments.savedDraftHash ?? savedEmailDraftHash,
+      savedActionType: savedActionType ?? currentEmailActionType,
+      savedEmailDraftId: emailIdEditing,
     );
   }
 

lib/features/composer/presentation/extensions/setup_email_attachments_extension.dart

@@ -35,7 +35,7 @@ extension SetupEmailAttachmentsExtension on ComposerController {
         attachments = arguments.attachments;
         inlineImages = arguments.inlineImages;
         break;
-      case EmailActionType.reopenComposerBrowser:
+      case EmailActionType.composeFromLocalEmailDraft:
         attachments = arguments.attachments;
         inlineImages = arguments.inlineImages;
         break;

lib/features/composer/presentation/extensions/setup_email_content_extension.dart

@@ -162,7 +162,7 @@ extension SetupEmailContentExtension on ComposerController {
           }
         }
         break;
-      case EmailActionType.reopenComposerBrowser:
+      case EmailActionType.composeFromLocalEmailDraft:
         final inlineImages = arguments.inlineImages ?? [];
         final content = arguments.emailContents ?? '';
         final displayMode = arguments.displayMode;

lib/features/composer/presentation/extensions/setup_email_important_flag_extension.dart

@@ -11,7 +11,7 @@ extension SetupEmailImportantFlagExtension on ComposerController {
       case EmailActionType.editDraft:
         isMarkAsImportant.value = arguments.presentationEmail?.isMarkAsImportant ?? false;
         break;
-      case EmailActionType.reopenComposerBrowser:
+      case EmailActionType.composeFromLocalEmailDraft:
         isMarkAsImportant.value = arguments.isMarkAsImportant ?? false;
         break;
       default:

lib/features/composer/presentation/extensions/setup_email_other_components_extension.dart

@@ -13,7 +13,7 @@ extension SetupEmailOtherComponentsExtension on ComposerController {
       case EmailActionType.editSendingEmail:
         emailIdEditing = arguments.sendingEmail?.presentationEmail.id;
         break;
-      case EmailActionType.reopenComposerBrowser:
+      case EmailActionType.composeFromLocalEmailDraft:
         screenDisplayMode.value = arguments.displayMode;
         break;
       default:

lib/features/composer/presentation/extensions/setup_email_recipients_extension.dart

@@ -11,7 +11,7 @@ extension SetupEmailRecipientsExtension on ComposerController {
     switch(currentEmailActionType) {
       case EmailActionType.editAsNewEmail:
       case EmailActionType.editDraft:
-      case EmailActionType.reopenComposerBrowser:
+      case EmailActionType.composeFromLocalEmailDraft:
         initEmailAddress(
           presentationEmail: arguments.presentationEmail!,
           actionType: currentEmailActionType!,

lib/features/composer/presentation/extensions/setup_email_request_read_receipt_flag_extension.dart

@@ -8,7 +8,7 @@ import 'package:tmail_ui_user/features/server_settings/domain/state/get_server_s
 extension SetupEmailRequestReadReceiptFlagExtension on ComposerController {
 
   void setupEmailRequestReadReceiptFlag(ComposerArguments arguments) {
-    if (currentEmailActionType == EmailActionType.reopenComposerBrowser) {
+    if (currentEmailActionType == EmailActionType.composeFromLocalEmailDraft) {
       hasRequestReadReceipt.value = arguments.hasRequestReadReceipt ?? false;
     } else if (currentEmailActionType != EmailActionType.editDraft) {
       getServerSetting();

lib/features/composer/presentation/extensions/setup_email_subject_extension.dart

@@ -17,7 +17,7 @@ extension SetupEmailSubjectExtension on ComposerController {
       case EmailActionType.replyToList:
       case EmailActionType.replyAll:
       case EmailActionType.forward:
-      case EmailActionType.reopenComposerBrowser:
+      case EmailActionType.composeFromLocalEmailDraft:
         subject = arguments.presentationEmail!.getEmailTitle().trim();
         break;
       case EmailActionType.editSendingEmail:

lib/features/composer/presentation/extensions/setup_selected_identity_extension.dart

@@ -30,7 +30,7 @@ extension SetupSelectedIdentityExtension on ComposerController {
       ) ?? listFromIdentities.first;
 
       if (currentEmailActionType == EmailActionType.editDraft ||
-          currentEmailActionType == EmailActionType.reopenComposerBrowser &&
+          currentEmailActionType == EmailActionType.composeFromLocalEmailDraft &&
               savedActionType == EmailActionType.editDraft) {
         identitySelected.value = currentIdentity;
       } else if (currentEmailActionType == EmailActionType.editAsNewEmail) {

lib/features/composer/presentation/manager/composer_manager.dart

@@ -23,39 +23,30 @@ class ComposerManager extends GetxController {
 
   ComposerTimer? _composerTimer;
 
-  void addComposer(ComposerArguments composerArguments) {
-    final id = DateTime.now().millisecondsSinceEpoch.toString();
+  void addComposer(ComposerArguments composerArguments, {bool isSynchronous = true}) {
+    final id = composerArguments.composerId
+        ?? DateTime.now().millisecondsSinceEpoch.toString();
     log('ComposerManager::addComposer:Id = $id');
-    ComposerBindings(composerId: id, composerArguments: composerArguments).dependencies();
+    ComposerBindings(
+      composerId: id,
+      composerArguments: composerArguments,
+    ).dependencies();
 
     composers[id] = ComposerView(key: Key(id), composerId: id);
     composerIdsQueue.add(id);
 
-    _arrangeComposerIfNeeded();
-
-    _initializeTimerIfNeeded();
+    if (isSynchronous) {
+      _arrangeComposerIfNeeded();
+      _initializeTimerIfNeeded();
+    }
   }
 
   void addListComposer(List<ComposerArguments> listArguments) {
     for (var argument in listArguments) {
-      final composerId = argument.composerId;
-
-      if (composerId == null) continue;
-
-      ComposerBindings(
-        composerId: composerId,
-        composerArguments: argument,
-      ).dependencies();
-
-      composers[composerId] = ComposerView(
-        key: Key(composerId),
-        composerId: composerId,
-      );
-      composerIdsQueue.add(composerId);
+      addComposer(argument, isSynchronous: false);
     }
 
     _arrangeComposerIfNeeded();
-
     _initializeTimerIfNeeded();
   }
 

lib/features/email/presentation/model/composer_arguments.dart

@@ -4,9 +4,7 @@ import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/model.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
-
 import 'package:tmail_ui_user/features/composer/presentation/model/screen_display_mode.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/local_email_draft.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/presentation_local_email_draft.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
 import 'package:tmail_ui_user/features/sending_queue/presentation/model/sending_email_action_type.dart';

lib/features/mailbox_dashboard/data/model/local_email_draft.dart

@@ -1,11 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:hive/hive.dart';
 import 'package:tmail_ui_user/features/caching/utils/caching_constants.dart';
-import 'package:jmap_dart_client/http/converter/email_id_nullable_converter.dart';
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:json_annotation/json_annotation.dart';
-import 'package:model/email/email_action_type.dart';
-import 'package:tmail_ui_user/features/composer/presentation/model/screen_display_mode.dart';
 
 part 'local_email_draft.g.dart';
 

lib/features/mailbox_dashboard/presentation/extensions/local_email_draft_extension.dart

@@ -2,7 +2,9 @@
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
+import 'package:jmap_dart_client/jmap/core/id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:model/email/email_action_type.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/screen_display_mode.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/local_email_draft.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/presentation_local_email_draft.dart';
@@ -20,6 +22,11 @@ extension LocalEmailDraftExtension on LocalEmailDraft {
         (type) => type.name == displayMode,
       ) ?? ScreenDisplayMode.normal,
       composerIndex: composerIndex,
+      draftHash: draftHash,
+      actionType: EmailActionType.values.firstWhereOrNull(
+        (type) => type.name == actionType,
+      ),
+      draftEmailId: draftEmailId != null ? EmailId(Id(draftEmailId!)) : null,
     );
   }
 }

lib/features/mailbox_dashboard/presentation/extensions/restore_local_email_draft_extension.dart

@@ -33,10 +33,11 @@ extension RestoreLocalEmailDraftExtension on MailboxDashBoardController {
     final listPresentationLocalEmailDraft = localEmailDrafts
       .map((localEmailDraft) => localEmailDraft.toPresentation())
       .toList();
-    final listLocalEmailDraftSortByIndex = listPresentationLocalEmailDraft
-      ..sort((a, b) => (a.composerIndex ?? 0).compareTo(b.composerIndex ?? 0));
 
-    showLocalEmailDraftListDialog(listLocalEmailDraftSortByIndex);
+    final listLocalEmailDraftSortByTime = listPresentationLocalEmailDraft
+      ..sort((a, b) => b.savedTime.compareTo(a.savedTime));
+
+    showLocalEmailDraftListDialog(listLocalEmailDraftSortByTime);
   }
 
   void showLocalEmailDraftListDialog(List<PresentationLocalEmailDraft> presentationLocalEmailDrafts) {
@@ -64,7 +65,11 @@ extension RestoreLocalEmailDraftExtension on MailboxDashBoardController {
   void _restoreAllLocalEmailDrafts(List<PresentationLocalEmailDraft> localDrafts) {
     popBack();
 
-    final listComposerArguments = localDrafts
+
+    final listLocalEmailDraftSortByIndex = localDrafts
+      ..sort((a, b) => (a.composerIndex ?? 0).compareTo(b.composerIndex ?? 0));
+
+    final listComposerArguments = listLocalEmailDraftSortByIndex
       .map(ComposerArguments.fromLocalEmailDraft)
       .toList();