TF-2323 Implement from criterion with selection and follow search recommendation
(cherry picked from commit 23817c87d602c370fc9a0ea5fc86e660d61b7f07)
This commit is contained in:
+25
-2
@@ -40,6 +40,7 @@ import 'package:tmail_ui_user/features/composer/presentation/composer_bindings.d
|
||||
import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/compose_action_mode.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/save_to_draft_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/contact/presentation/model/contact_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
||||
@@ -1438,6 +1439,14 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
return searchController.selectQuickSearchFilter(filter, userProfile.value!);
|
||||
}
|
||||
|
||||
void selectQuickSearchFilterFrom(EmailAddress fromEmailFilter) {
|
||||
return searchController.selectQuickSearchFilter(
|
||||
QuickSearchFilter.fromMe,
|
||||
userProfile.value!,
|
||||
fromEmailFilter: fromEmailFilter
|
||||
);
|
||||
}
|
||||
|
||||
void addFilterToSuggestionForm(QuickSearchFilter filter) {
|
||||
searchController.addFilterToSuggestionForm(filter);
|
||||
}
|
||||
@@ -1518,9 +1527,23 @@ class MailboxDashBoardController extends ReloadableController {
|
||||
}
|
||||
}
|
||||
|
||||
void selectQuickSearchFilterAction(QuickSearchFilter filter) {
|
||||
void selectQuickSearchFilterAction(QuickSearchFilter filter) async {
|
||||
log('MailboxDashBoardController::selectQuickSearchFilterAction(): filter: $filter');
|
||||
selectQuickSearchFilter(filter);
|
||||
if (filter == QuickSearchFilter.fromMe &&
|
||||
accountId.value != null &&
|
||||
sessionCurrent != null
|
||||
) {
|
||||
final listContactSelected = searchController.searchEmailFilter.value.from;
|
||||
final arguments = ContactArguments(accountId.value!, sessionCurrent!, listContactSelected);
|
||||
|
||||
final newContact = await DialogRouter.pushGeneralDialog(routeName: AppRoutes.contact, arguments: arguments);
|
||||
|
||||
if (newContact is EmailAddress) {
|
||||
selectQuickSearchFilterFrom(newContact);
|
||||
}
|
||||
} else {
|
||||
selectQuickSearchFilter(filter);
|
||||
}
|
||||
dispatchAction(StartSearchEmailAction(filter: filter));
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/utc_date.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
|
||||
@@ -70,7 +71,11 @@ class SearchController extends BaseController with DateRangePickerMixin {
|
||||
searchEmailFilter.value = SearchEmailFilter.initial();
|
||||
}
|
||||
|
||||
void selectQuickSearchFilter(QuickSearchFilter quickSearchFilter, UserProfile userProfile) {
|
||||
void selectQuickSearchFilter(
|
||||
QuickSearchFilter quickSearchFilter,
|
||||
UserProfile userProfile,
|
||||
{EmailAddress? fromEmailFilter}
|
||||
) {
|
||||
final isFilterSelected = quickSearchFilter.isSelected(searchEmailFilter.value, userProfile);
|
||||
|
||||
switch (quickSearchFilter) {
|
||||
@@ -81,8 +86,12 @@ class SearchController extends BaseController with DateRangePickerMixin {
|
||||
updateFilterEmail(emailReceiveTimeType: EmailReceiveTimeType.allTime);
|
||||
return;
|
||||
case QuickSearchFilter.fromMe:
|
||||
final newListEmailAddress = isFilterSelected ? <String>{} : <String>{userProfile.email};
|
||||
updateFilterEmail(fromOption: Some(newListEmailAddress));
|
||||
if (fromEmailFilter != null) {
|
||||
final newListEmailAddress = (fromEmailFilter.email != null && fromEmailFilter.email!.isNotEmpty)
|
||||
? <String>{fromEmailFilter.email!}
|
||||
: <String>{};
|
||||
updateFilterEmail(fromOption: Some(newListEmailAddress));
|
||||
}
|
||||
return;
|
||||
case QuickSearchFilter.sortBy:
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user