TF-1231 When remove Subject in AdvancedSearch, filter is not update because it is empty

This commit is contained in:
Dat PHAM HOANG
2022-12-08 16:34:52 +07:00
committed by Dat H. Pham
parent 077eeed38b
commit d9c0ded54d
3 changed files with 20 additions and 14 deletions
@@ -1,3 +1,4 @@
import 'package:dartz/dartz.dart';
import 'package:equatable/equatable.dart';
import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
import 'package:jmap_dart_client/jmap/core/filter/filter_operator.dart';
@@ -46,7 +47,7 @@ class SearchEmailFilter with EquatableMixin {
Set<String>? from,
Set<String>? to,
SearchQuery? text,
String? subject,
Option<String>? subjectOption,
Set<String>? notKeyword,
PresentationMailbox? mailbox,
EmailReceiveTimeType? emailReceiveTimeType,
@@ -59,7 +60,7 @@ class SearchEmailFilter with EquatableMixin {
from: from ?? this.from,
to: to ?? this.to,
text: text ?? this.text,
subject: subject ?? this.subject,
subject: _getOptionParam(subjectOption, subject),
notKeyword: notKeyword ?? this.notKeyword,
mailbox: mailbox ?? this.mailbox,
emailReceiveTimeType: emailReceiveTimeType ?? this.emailReceiveTimeType,
@@ -70,6 +71,14 @@ class SearchEmailFilter with EquatableMixin {
);
}
T? _getOptionParam<T>(Option<T?>? option, T? defaultValue) {
if (option != null) {
return option.toNullable();
} else {
return defaultValue;
}
}
Filter? mappingToEmailFilterCondition({EmailFilterCondition? moreFilterCondition}) {
final emailEmailFilterConditionShared = EmailFilterCondition(
text: text?.value.trim().isNotEmpty == true