From 18342265a1604c0760bf8de7236ba67de8d1b49e Mon Sep 17 00:00:00 2001 From: hieubt Date: Wed, 15 Nov 2023 17:26:47 +0700 Subject: [PATCH] TF-2304 Add sortOrder to simple_search_filter (cherry picked from commit 4ae06a452056c093a670ab53ff90b4427fedfbd9) --- .../presentation/model/simple_search_filter.dart | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/features/search/email/presentation/model/simple_search_filter.dart b/lib/features/search/email/presentation/model/simple_search_filter.dart index dd51c159a..d2e919baf 100644 --- a/lib/features/search/email/presentation/model/simple_search_filter.dart +++ b/lib/features/search/email/presentation/model/simple_search_filter.dart @@ -13,6 +13,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentat import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart'; import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; +import 'package:jmap_dart_client/jmap/core/sort/comparator.dart'; class SimpleSearchFilter with EquatableMixin { final Set from; @@ -24,6 +25,7 @@ class SimpleSearchFilter with EquatableMixin { final UTCDate? before; final UTCDate? startDate; final UTCDate? endDate; + final Set? sortOrder; SimpleSearchFilter({ Set? from, @@ -34,7 +36,8 @@ class SimpleSearchFilter with EquatableMixin { this.before, this.mailbox, this.startDate, - this.endDate + this.endDate, + this.sortOrder, }) : from = from ?? {}, to = to ?? {}, hasAttachment = hasAttachment ?? false, @@ -49,7 +52,8 @@ class SimpleSearchFilter with EquatableMixin { Option? hasAttachmentOption, Option? beforeOption, Option? startDateOption, - Option? endDateOption + Option? endDateOption, + Option>? sortOrderOption, }) { return SimpleSearchFilter( from: _getOptionParam(fromOption, from), @@ -60,7 +64,8 @@ class SimpleSearchFilter with EquatableMixin { hasAttachment: _getOptionParam(hasAttachmentOption, hasAttachment), before: _getOptionParam(beforeOption, before), startDate: _getOptionParam(startDateOption, startDate), - endDate: _getOptionParam(endDateOption, endDate) + endDate: _getOptionParam(endDateOption, endDate), + sortOrder: _getOptionParam(sortOrderOption, sortOrder) ); } @@ -111,7 +116,8 @@ class SimpleSearchFilter with EquatableMixin { hasAttachment, before, startDate, - endDate + endDate, + sortOrder ]; }