TF-4400 Add collapseThreads for load more & refresh change when force email query = true

Author: dab246

lib/features/mailbox_dashboard/presentation/mixin/setup_preferences_setting_mixin.dart

@@ -27,6 +27,8 @@ mixin SetupPreferencesSettingMixin on EmitStateMixin {
   bool get forceEmailQuery =>
       PlatformInfo.isWeb && AppConfig.isForceEmailQueryEnabled;
 
+  bool get collapseThreads => isThreadDetailEnabled == true && forceEmailQuery;
+
   void _setPreferencesSetting(PreferencesSetting setting) =>
       _preferencesSetting = setting;
 
@@ -49,14 +51,14 @@ mixin SetupPreferencesSettingMixin on EmitStateMixin {
     final currentPreferencesSetting = _preferencesSetting;
     final newPreferencesSetting = success.preferencesSetting;
 
+    _setPreferencesSetting(newPreferencesSetting);
+
     if (currentPreferencesSetting != null) {
       _verifyThreadSettingStateChanged(
         currentSetting: currentPreferencesSetting,
         newSetting: newPreferencesSetting,
       );
     }
-
-    _setPreferencesSetting(newPreferencesSetting);
   }
 
   void scribeLoadPreferencesSettingFailure(GetLocalSettingsFailure failure) {

lib/features/thread/data/repository/thread_repository_impl.dart

@@ -247,6 +247,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
       MailboxId? mailboxId,
       Properties? propertiesCreated,
       Filter? filter,
+      bool? collapseThreads,
     }
   ) async {
       final networkEmailResponse = await mapDataSource[DataSourceType.network]!.getAllEmail(
@@ -257,6 +258,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
         sort: sort,
         filter: filter ?? EmailFilterCondition(inMailbox: mailboxId),
         properties: propertiesCreated,
+        collapseThreads: collapseThreads,
       );
       await _updateEmailCache(
         accountId,
@@ -367,6 +369,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
       EmailFilter? emailFilter,
       Properties? propertiesCreated,
       Properties? propertiesUpdated,
+      bool? collapseThreads,
     }
   ) async* {
     log('ThreadRepositoryImpl::refreshChanges(): $currentState');
@@ -402,9 +405,11 @@ class ThreadRepositoryImpl extends ThreadRepository {
         filter: emailFilter?.filter,
         mailboxId: emailFilter?.mailboxId,
         propertiesCreated: propertiesCreated,
+        collapseThreads: collapseThreads,
       );
       logTrace(
         'ThreadRepositoryImpl::refreshChanges():'
+        'collapseThreads = $collapseThreads, '
         'CountEmailCached = ${newEmailResponse.emailList?.length}, '
         'EmailStateCache = ${newEmailResponse.state?.value}, '
         'InMailboxId = ${emailFilter?.mailboxId?.asString}, '
@@ -417,6 +422,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
     } else {
       logTrace(
         'ThreadRepositoryImpl::refreshChanges():'
+        'collapseThreads = $collapseThreads, '
         'CountEmailCached = ${newEmailResponse.emailList?.length}, '
         'EmailStateCache = ${newEmailResponse.state?.value}, '
         'InMailboxId = ${emailFilter?.mailboxId?.asString}, '
@@ -456,9 +462,13 @@ class ThreadRepositoryImpl extends ThreadRepository {
           position: emailRequest.position,
           sort: emailRequest.sort,
           filter: emailRequest.filter,
-          properties: emailRequest.properties)
+          properties: emailRequest.properties,
+          collapseThreads: emailRequest.collapseThreads,
+        )
         .then((response) {
-          final listEmails = response.emailList;
+          final listEmails = emailRequest.collapseThreads == true
+              ? response.threadEmails
+              : response.emailList;
           if (emailRequest.lastEmailId != null && listEmails?.isNotEmpty == true) {
             listEmails?.removeWhere((email) => email.id == emailRequest.lastEmailId);
           }
@@ -627,6 +637,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
     Set<Comparator>? sort,
     EmailFilter? emailFilter,
     Properties? propertiesCreated,
+    bool? collapseThreads,
   }) async* {
     final networkDataSource = mapDataSource[DataSourceType.network]!;
     final emailResponse = await networkDataSource.getAllEmail(
@@ -637,6 +648,7 @@ class ThreadRepositoryImpl extends ThreadRepository {
       sort: sort,
       filter: emailFilter?.filter,
       properties: propertiesCreated,
+      collapseThreads: collapseThreads,
     );
     yield emailResponse;
   }

lib/features/thread/domain/model/get_email_request.dart

@@ -19,6 +19,7 @@ class GetEmailRequest with EquatableMixin {
   final Properties? properties;
   final EmailId? lastEmailId;
   final bool useCache;
+  final bool? collapseThreads;
 
   GetEmailRequest(
     this.session,
@@ -32,6 +33,7 @@ class GetEmailRequest with EquatableMixin {
       this.properties,
       this.lastEmailId,
       this.useCache = true,
+      this.collapseThreads,
     }
   );
 
@@ -47,5 +49,6 @@ class GetEmailRequest with EquatableMixin {
     lastEmailId,
     filterOption,
     useCache,
+    collapseThreads,
   ];
 }

lib/features/thread/domain/repository/thread_repository.dart

@@ -41,6 +41,7 @@ abstract class ThreadRepository {
     Set<Comparator>? sort,
     EmailFilter? emailFilter,
     Properties? propertiesCreated,
+    bool? collapseThreads,
   });
 
   Stream<EmailsResponse> forceQueryAllEmailsForWeb({
@@ -64,6 +65,7 @@ abstract class ThreadRepository {
       EmailFilter? emailFilter,
       Properties? propertiesCreated,
       Properties? propertiesUpdated,
+      bool? collapseThreads,
     }
   );
 

lib/features/thread/domain/usecases/get_emails_in_mailbox_interactor.dart

@@ -68,6 +68,7 @@ class GetEmailsInMailboxInteractor {
           sort: sort,
           emailFilter: emailFilter,
           propertiesCreated: propertiesCreated,
+          collapseThreads: collapseThreads,
         );
       }
 

lib/features/thread/domain/usecases/load_more_emails_in_mailbox_interactor.dart

@@ -4,6 +4,7 @@ import 'package:dartz/dartz.dart';
 import 'package:model/extensions/email_extension.dart';
 import 'package:tmail_ui_user/features/thread/domain/model/email_response.dart';
 import 'package:tmail_ui_user/features/thread/domain/model/get_email_request.dart';
+import 'package:tmail_ui_user/features/thread/domain/model/thread_email.dart';
 import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/load_more_emails_state.dart';
 
@@ -23,7 +24,15 @@ class LoadMoreEmailsInMailboxInteractor {
 
   Either<Failure, Success> _toGetEmailState(EmailsResponse emailResponse) {
     final presentationEmailList = emailResponse.emailList
-      ?.map((email) => email.toPresentationEmail()).toList() ?? List.empty();
+      ?.map((email) {
+        if (email is ThreadEmail) {
+          return email.toPresentationEmail(
+            emailIdsInThread: email.emailIdsInThread,
+          );
+        } else {
+          return email.toPresentationEmail();
+        }
+      }).toList() ?? List.empty();
 
     return Right<Failure, Success>(LoadMoreEmailsSuccess(presentationEmailList));
   }

lib/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor.dart

@@ -8,6 +8,7 @@ import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:tmail_ui_user/features/thread/domain/model/email_filter.dart';
 import 'package:tmail_ui_user/features/thread/domain/model/email_response.dart';
+import 'package:tmail_ui_user/features/thread/domain/model/thread_email.dart';
 import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart';
 import 'package:model/model.dart';
 import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
@@ -28,6 +29,7 @@ class RefreshChangesEmailsInMailboxInteractor {
       Properties? propertiesCreated,
       Properties? propertiesUpdated,
       EmailFilter? emailFilter,
+      bool? collapseThreads,
     }
   ) async* {
     yield Right<Failure, Success>(RefreshChangesAllEmailLoading());
@@ -42,7 +44,9 @@ class RefreshChangesEmailsInMailboxInteractor {
           limit: limit,
           propertiesCreated: propertiesCreated,
           propertiesUpdated: propertiesUpdated,
-          emailFilter: emailFilter)
+          emailFilter: emailFilter,
+          collapseThreads: collapseThreads,
+        )
         .map((emailResponse) => _toGetEmailState(
           emailResponse: emailResponse,
           currentMailboxId: emailFilter?.mailboxId
@@ -57,7 +61,15 @@ class RefreshChangesEmailsInMailboxInteractor {
     MailboxId? currentMailboxId
   }) {
     final presentationEmailList = emailResponse.emailList
-      ?.map((email) => email.toPresentationEmail()).toList() ?? List.empty();
+      ?.map((email) {
+        if (email is ThreadEmail) {
+          return email.toPresentationEmail(
+            emailIdsInThread: email.emailIdsInThread,
+          );
+        } else {
+          return email.toPresentationEmail();
+        }
+      }).toList() ?? List.empty();
 
     return Right<Failure, Success>(RefreshChangesAllEmailSuccess(
       emailList: presentationEmailList,

lib/features/thread/presentation/thread_controller.dart

@@ -359,8 +359,6 @@ class ThreadController extends BaseController with EmailActionController {
         refreshAllEmail(shouldClearCache: PlatformInfo.isWeb);
         mailboxDashBoardController.clearEmailUIAction();
       } else if (action is RefreshEmailListViewOnForceEmailQueryAction) {
-        consumeState(Stream.value(Right(GetAllEmailLoading())));
-        resetToOriginalValue();
         getAllEmailAction(forceEmailQuery: forceEmailQuery);
         mailboxDashBoardController.clearEmailUIAction();
       }
@@ -671,7 +669,11 @@ class ThreadController extends BaseController with EmailActionController {
     bool getLatestChanges = true,
     bool forceEmailQuery = false,
   }) {
-    log('ThreadController::_getAllEmailAction:getLatestChanges = $getLatestChanges');
+    log(
+      'ThreadController::_getAllEmailAction:'
+      'getLatestChanges = $getLatestChanges, '
+      'forceEmailQuery = $forceEmailQuery ',
+    );
     if (_session != null &&_accountId != null) {
       consumeState(_getEmailsInMailboxInteractor.execute(
         _session!,
@@ -687,7 +689,7 @@ class ThreadController extends BaseController with EmailActionController {
         getLatestChanges: getLatestChanges,
         useCache: selectedMailbox?.isCacheable ?? false,
         forceEmailQuery: forceEmailQuery,
-        collapseThreads: mailboxDashBoardController.isThreadDetailEnabled,
+        collapseThreads: mailboxDashBoardController.collapseThreads,
       ));
     } else {
       consumeState(Stream.value(Left(GetAllEmailFailure(NotFoundSessionException()))));
@@ -823,6 +825,7 @@ class ThreadController extends BaseController with EmailActionController {
         _accountId!,
       ),
       emailFilter: getEmailFilterForLoadMailbox(),
+      collapseThreads: mailboxDashBoardController.collapseThreads,
     ).last;
 
     refreshState.fold(
@@ -874,6 +877,7 @@ class ThreadController extends BaseController with EmailActionController {
             _accountId!,
           ),
           useCache: false,
+          collapseThreads: mailboxDashBoardController.collapseThreads,
         )
         .last;
 
@@ -900,9 +904,11 @@ class ThreadController extends BaseController with EmailActionController {
           currentListEmail.isNotEmpty ? currentListEmail.last : null;
       final useCache = selectedMailbox?.isCacheable ?? false;
       final filterOption = mailboxDashBoardController.filterMessageOption.value;
+      final collapseThreads = mailboxDashBoardController.collapseThreads;
 
       logTrace(
         'ThreadController::_loadMoreEmails: '
+        'collapseThreads = $collapseThreads, '
         'OldestEmailID = ${oldestEmail?.id?.asString}, '
         'useCache = $useCache, '
         'filterOption = ${filterOption.name}',
@@ -914,11 +920,12 @@ class ThreadController extends BaseController with EmailActionController {
           _accountId!,
           limit: ThreadConstants.defaultLimit,
           sort: EmailSortOrderType.mostRecent.getSortOrder().toNullable(),
-          filterOption: mailboxDashBoardController.filterMessageOption.value,
+          filterOption: filterOption,
           filter: getFilterConditionForLoadMailbox(oldestEmail: oldestEmail),
           properties: EmailUtils.getPropertiesForEmailGetMethod(_session!, _accountId!),
           lastEmailId: oldestEmail?.id,
           useCache: useCache,
+          collapseThreads: collapseThreads,
         )
       ));
     } else {