eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

TF-933 Replace hasKeyword with text in advanced search

Browse Source
This commit is contained in:
dab246
2022-09-16 13:10:01 +07:00
committed by Dat H. Pham
parent 1ce3352a8f
commit b04ccc6ec0
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
+5 -3
View File
@@ -16,6 +16,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart';
import 'package:tmail_ui_user/features/thread/domain/model/search_query.dart';
import 'package:tmail_ui_user/main/routes/app_routes.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -76,9 +77,10 @@ class AdvancedFilterController extends GetxController {
void _updateFilterEmailFromAdvancedSearchView() {
if (hasKeyWordFilterInputController.text.isNotEmpty) {
searchController.updateFilterEmail(hasKeyword: hasKeyWordFilterInputController.text.split(',').toSet());
searchController.updateFilterEmail(text: SearchQuery(hasKeyWordFilterInputController.text));
searchController.searchInputController.text = hasKeyWordFilterInputController.text;
} else {
searchController.updateFilterEmail(hasKeyword: {});
searchController.updateFilterEmail(text: SearchQuery(searchController.searchInputController.text));
}
if (notKeyWordFilterInputController.text.isNotEmpty) {
@@ -194,7 +196,7 @@ class AdvancedFilterController extends GetxController {
subjectFilterInputController.text =
StringConvert.writeNullToEmpty(searchEmailFilter.subject);
hasKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(
searchEmailFilter.hasKeyword.firstOrNull);
searchEmailFilter.text?.value);
notKeyWordFilterInputController.text = StringConvert.writeNullToEmpty(
searchEmailFilter.notKeyword.firstOrNull);
dateFilterInputController.text = StringConvert.writeNullToEmpty(
lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
-2
View File
@@ -124,7 +124,6 @@ class SearchController extends BaseController {
Set<String>? to,
SearchQuery? text,
String? subject,
Set<String>? hasKeyword,
Set<String>? notKeyword,
PresentationMailbox? mailbox,
EmailReceiveTimeType? emailReceiveTimeType,
@@ -136,7 +135,6 @@ class SearchController extends BaseController {
to: to,
text: text,
subject: subject,
hasKeyword: hasKeyword,
notKeyword: notKeyword,
mailbox: mailbox,
emailReceiveTimeType: emailReceiveTimeType,