TF-1043 Fix advanced search not working correctly
This commit is contained in:
@@ -24,8 +24,6 @@ class ResponsiveWidget extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
log('ResponsiveWidget::build(): WIDTH_SIZE: ${responsiveUtils.getDeviceWidth(context)}');
|
|
||||||
|
|
||||||
if (BuildUtils.isWeb) {
|
if (BuildUtils.isWeb) {
|
||||||
if (responsiveUtils.isMobile(context)) {
|
if (responsiveUtils.isMobile(context)) {
|
||||||
return mobile;
|
return mobile;
|
||||||
|
|||||||
+7
-3
@@ -151,7 +151,11 @@ class AdvancedFilterController extends BaseController {
|
|||||||
|
|
||||||
void applyAdvancedSearchFilter(BuildContext context) {
|
void applyAdvancedSearchFilter(BuildContext context) {
|
||||||
_updateFilterEmailFromAdvancedSearchView();
|
_updateFilterEmailFromAdvancedSearchView();
|
||||||
searchController.isAdvancedSearchHasApply.value = _checkAdvancedSearchHasApply();
|
searchController.isAdvancedSearchHasApply.value = isAdvancedSearchHasApplied;
|
||||||
|
if (!isAdvancedSearchHasApplied) {
|
||||||
|
final newSearchEmailFilter = searchController.searchEmailFilter.value.clearBeforeDate();
|
||||||
|
searchController.searchEmailFilter.value = newSearchEmailFilter;
|
||||||
|
}
|
||||||
searchController.isAdvancedSearchViewOpen.toggle();
|
searchController.isAdvancedSearchViewOpen.toggle();
|
||||||
_mailboxDashBoardController.searchEmail(
|
_mailboxDashBoardController.searchEmail(
|
||||||
context, StringConvert.writeNullToEmpty(searchEmailFilter.text?.value));
|
context, StringConvert.writeNullToEmpty(searchEmailFilter.text?.value));
|
||||||
@@ -220,14 +224,14 @@ class AdvancedFilterController extends BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool _checkAdvancedSearchHasApply() {
|
bool get isAdvancedSearchHasApplied {
|
||||||
return searchEmailFilter.from.isNotEmpty ||
|
return searchEmailFilter.from.isNotEmpty ||
|
||||||
searchEmailFilter.to.isNotEmpty ||
|
searchEmailFilter.to.isNotEmpty ||
|
||||||
subjectFilterInputController.text.isNotEmpty ||
|
subjectFilterInputController.text.isNotEmpty ||
|
||||||
hasKeyWordFilterInputController.text.isNotEmpty ||
|
hasKeyWordFilterInputController.text.isNotEmpty ||
|
||||||
notKeyWordFilterInputController.text.isNotEmpty ||
|
notKeyWordFilterInputController.text.isNotEmpty ||
|
||||||
searchEmailFilter.emailReceiveTimeType != EmailReceiveTimeType.allTime ||
|
searchEmailFilter.emailReceiveTimeType != EmailReceiveTimeType.allTime ||
|
||||||
searchEmailFilter.mailbox != _mailboxDashBoardController.selectedMailbox.value ||
|
searchEmailFilter.mailbox != PresentationMailbox.unifiedMailbox ||
|
||||||
hasAttachment.isTrue;
|
hasAttachment.isTrue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ class SearchEmailFilter {
|
|||||||
|
|
||||||
extension SearchEmailFilterExtension on SearchEmailFilter {
|
extension SearchEmailFilterExtension on SearchEmailFilter {
|
||||||
|
|
||||||
SearchEmailFilter toSearchEmailFilter({UTCDate? newBefore}) {
|
SearchEmailFilter clearBeforeDate() {
|
||||||
return SearchEmailFilter(
|
return SearchEmailFilter(
|
||||||
from: from,
|
from: from,
|
||||||
to: to,
|
to: to,
|
||||||
@@ -122,7 +122,9 @@ extension SearchEmailFilterExtension on SearchEmailFilter {
|
|||||||
mailbox: mailbox,
|
mailbox: mailbox,
|
||||||
emailReceiveTimeType: emailReceiveTimeType,
|
emailReceiveTimeType: emailReceiveTimeType,
|
||||||
hasAttachment: hasAttachment,
|
hasAttachment: hasAttachment,
|
||||||
before: newBefore,
|
before: null,
|
||||||
|
startDate: startDate,
|
||||||
|
endDate: endDate,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -431,7 +431,7 @@ class ThreadController extends BaseController {
|
|||||||
final limit = emailList.isNotEmpty
|
final limit = emailList.isNotEmpty
|
||||||
? UnsignedInt(emailList.length)
|
? UnsignedInt(emailList.length)
|
||||||
: ThreadConstants.defaultLimit;
|
: ThreadConstants.defaultLimit;
|
||||||
searchController.searchEmailFilter.value = _searchEmailFilter.toSearchEmailFilter(newBefore: null);
|
searchController.searchEmailFilter.value = _searchEmailFilter.clearBeforeDate();
|
||||||
_searchEmail(limit: limit);
|
_searchEmail(limit: limit);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -456,7 +456,6 @@ class ThreadController extends BaseController {
|
|||||||
void loadMoreEmails() {
|
void loadMoreEmails() {
|
||||||
log('ThreadController::loadMoreEmails()');
|
log('ThreadController::loadMoreEmails()');
|
||||||
if (canLoadMore && _accountId != null) {
|
if (canLoadMore && _accountId != null) {
|
||||||
startFpsMeter();
|
|
||||||
consumeState(_loadMoreEmailsInMailboxInteractor.execute(
|
consumeState(_loadMoreEmailsInMailboxInteractor.execute(
|
||||||
GetEmailRequest(
|
GetEmailRequest(
|
||||||
_accountId!,
|
_accountId!,
|
||||||
|
|||||||
+3
-3
@@ -802,7 +802,7 @@ packages:
|
|||||||
name: logging
|
name: logging
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.0.2"
|
version: "1.1.0"
|
||||||
matcher:
|
matcher:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -1104,7 +1104,7 @@ packages:
|
|||||||
description:
|
description:
|
||||||
path: "."
|
path: "."
|
||||||
ref: master
|
ref: master
|
||||||
resolved-ref: "45ed9a973331ac4209917e365792967d7ca7b5bb"
|
resolved-ref: "3dc2e65ee12bf6df9c341ccc229a5dfc9d16405f"
|
||||||
url: "https://github.com/linagora/rich-text-composer.git"
|
url: "https://github.com/linagora/rich-text-composer.git"
|
||||||
source: git
|
source: git
|
||||||
version: "0.0.1"
|
version: "0.0.1"
|
||||||
@@ -1252,7 +1252,7 @@ packages:
|
|||||||
name: stream_transform
|
name: stream_transform
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.0"
|
version: "2.0.1"
|
||||||
string_scanner:
|
string_scanner:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
Reference in New Issue
Block a user