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

remove searchQuery unnecessary paramter

Browse Source
This commit is contained in:
ManhNT
2022-06-24 22:41:54 +07:00
committed by Dat H. Pham
parent 203f93ae7f
commit 48da016654
8 changed files with 139 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+27 -7
View File
@@ -39,7 +39,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.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/quick_search_filter.dart';
import 'package:tmail_ui_user/features/manage_account/domain/usecases/log_out_oidc_interactor.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/model/manage_account_arguments.dart';
import 'package:tmail_ui_user/features/thread/domain/model/filter_message_option.dart';
@@ -76,7 +76,6 @@ class MailboxDashBoardController extends ReloadableController {
final currentSelectMode = SelectMode.INACTIVE.obs;
final filterMessageOption = FilterMessageOption.all.obs;
final listEmailSelected = <PresentationEmail>[].obs;
final emailReceiveTimeType = Rxn<EmailReceiveTimeType>();
final composerOverlayState = ComposerOverlayState.inActive.obs;
Session? sessionCurrent;
@@ -265,12 +264,17 @@ class MailboxDashBoardController extends ReloadableController {
bool isSelectionEnabled() => currentSelectMode.value == SelectMode.ACTIVE;
void searchEmail(BuildContext context) {
void searchEmail(BuildContext context, String value) {
searchController.updateFilterEmail(text: SearchQuery(value));
dispatchState(Right(SearchEmailNewQuery(searchController.searchEmailFilter.value.text ?? SearchQuery.initial())));
FocusScope.of(context).unfocus();
if (_searchInsideEmailDetailedViewIsActive(context)) {
_closeEmailDetailedView();
}
if (value.isEmpty){
searchController.disableSearch();
searchController.setEmailReceiveTimeType(null);
}
}
bool _searchInsideEmailDetailedViewIsActive(BuildContext context) {
@@ -392,10 +396,6 @@ class MailboxDashBoardController extends ReloadableController {
return null;
}
void setEmailReceiveTimeType(EmailReceiveTimeType? receiveTimeType) {
emailReceiveTimeType.value = receiveTimeType;
}
bool filterMessageWithAttachmentIsActive () {
return filterMessageOption.value == FilterMessageOption.attachments;
}
@@ -455,6 +455,26 @@ class MailboxDashBoardController extends ReloadableController {
arguments: ManageAccountArguments(sessionCurrent));
}
void selectQuickSearchFilter({
required QuickSearchFilter quickSearchFilter,
bool fromSuggestionBox = false,
}) => searchController.selectQuickSearchFilter(
quickSearchFilter: quickSearchFilter,
userProfile: userProfile.value!,
fromSuggestionBox: fromSuggestionBox,
);
bool checkQuickSearchFilterSelected({
required QuickSearchFilter quickSearchFilter,
bool fromSuggestionBox = false,
}) => searchController.checkQuickSearchFilterSelected(
quickSearchFilter: quickSearchFilter,
userProfile: userProfile.value!,
fromSuggestionBox: fromSuggestionBox,
);
Future<List<PresentationEmail>> quickSearchEmails() => searchController.quickSearchEmails(accountId: accountId.value!);
@override
void onClose() {
_emailReceiveManager.closeEmailReceiveManagerStream();
lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
+34 -23
View File
@@ -3,6 +3,7 @@ import 'dart:async';
import 'package:core/core.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/account_id.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/mail/email/email_comparator.dart';
@@ -15,7 +16,6 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/quick_sear
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_all_recent_search_latest_interactor.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/quick_search_email_interactor.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_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/quick_search_filter.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart';
@@ -29,8 +29,6 @@ class SearchController extends BaseController {
final SaveRecentSearchInteractor _saveRecentSearchInteractor;
final GetAllRecentSearchLatestInteractor _getAllRecentSearchLatestInteractor;
final _mailboxDashBoardController = Get.find<MailboxDashBoardController>();
final searchInputController = TextEditingController();
final searchEmailFilter = SearchEmailFilter().obs;
final searchState = SearchState.initial().obs;
@@ -38,15 +36,11 @@ class SearchController extends BaseController {
final dateFilterSelectedFormAdvancedSearch = EmailReceiveTimeType.allTime.obs;
final mailboxFilterSelectedFormAdvancedSearch = Rxn<PresentationMailbox>();
final hasAttachment = false.obs;
get _accountId => _mailboxDashBoardController.accountId;
get _userProfile => _mailboxDashBoardController.userProfile;
final emailReceiveTimeType = Rxn<EmailReceiveTimeType>();
get searchEmailFilterValue => searchEmailFilter.value;
FocusNode searchFocus = FocusNode();
SearchQuery? searchQuery;
SearchController(
this._quickSearchEmailInteractor,
@@ -70,32 +64,40 @@ class SearchController extends BaseController {
void selectQuickSearchFilter({
required QuickSearchFilter quickSearchFilter,
required UserProfile userProfile,
bool fromSuggestionBox = false,
}) {
final quickSearchFilterSelected = checkQuickSearchFilterSelected(quickSearchFilter: quickSearchFilter, fromSuggestionBox: fromSuggestionBox);
final quickSearchFilterSelected = checkQuickSearchFilterSelected(
userProfile: userProfile,
quickSearchFilter: quickSearchFilter,
fromSuggestionBox: fromSuggestionBox,
);
switch (quickSearchFilter) {
case QuickSearchFilter.hasAttachment:
updateFilterEmail(hasAttachment: !quickSearchFilterSelected);
return;
case QuickSearchFilter.last7Days:
final EmailReceiveTimeType? emailReceiveTimeType = quickSearchFilterSelected
? EmailReceiveTimeType.allTime
: EmailReceiveTimeType.last7Days;
updateFilterEmail(emailReceiveTimeType: emailReceiveTimeType);
if (quickSearchFilterSelected) {
setEmailReceiveTimeType(null);
updateFilterEmail(emailReceiveTimeType: EmailReceiveTimeType.allTime);
} else {
setEmailReceiveTimeType(EmailReceiveTimeType.last7Days);
updateFilterEmail(emailReceiveTimeType: EmailReceiveTimeType.last7Days);
}
return;
case QuickSearchFilter.fromMe:
quickSearchFilterSelected
? searchEmailFilter.value.from.remove(_userProfile.email)
: searchEmailFilter.value.from.add(_userProfile.email);
? searchEmailFilter.value.from.remove(userProfile.email)
: searchEmailFilter.value.from.add(userProfile.email);
updateFilterEmail(from: searchEmailFilter.value.from);
return;
}
}
Future<List<PresentationEmail>> quickSearchEmails() async {
Future<List<PresentationEmail>> quickSearchEmails({required AccountId accountId}) async {
return await _quickSearchEmailInteractor
.execute(_accountId,
.execute(accountId,
limit: UnsignedInt(5),
sort: <Comparator>{}..add(
EmailComparator(EmailComparatorProperty.receivedAt)
@@ -176,17 +178,21 @@ class SearchController extends BaseController {
searchInputController.text = value;
}
bool checkQuickSearchFilterSelected({required QuickSearchFilter quickSearchFilter, bool fromSuggestionBox = false}) {
bool checkQuickSearchFilterSelected({
required QuickSearchFilter quickSearchFilter,
required UserProfile userProfile,
bool fromSuggestionBox = false,
}) {
switch (quickSearchFilter) {
case QuickSearchFilter.hasAttachment:
return searchEmailFilter.value.hasAttachment == true;
case QuickSearchFilter.last7Days:
if (fromSuggestionBox) {
if (emailReceiveTimeType.value != null) {
return true;
}
return searchEmailFilter.value.emailReceiveTimeType == EmailReceiveTimeType.last7Days;
case QuickSearchFilter.fromMe:
return searchEmailFilter.value.from.contains(_userProfile.email) && searchEmailFilter.value.from.length == 1;
return searchEmailFilter.value.from.contains(userProfile.email) && searchEmailFilter.value.from.length == 1;
}
}
@@ -195,12 +201,17 @@ class SearchController extends BaseController {
}
Future<List<RecentSearch>> getAllRecentSearchAction(String pattern) async {
return await _getAllRecentSearchLatestInteractor.execute(pattern: pattern)
return await _getAllRecentSearchLatestInteractor
.execute(pattern: pattern)
.then((result) => result.fold(
(failure) => <RecentSearch>[],
(success) => success is GetAllRecentSearchLatestSuccess
? success.listRecentSearch
: <RecentSearch>[]));
? success.listRecentSearch
: <RecentSearch>[]));
}
void setEmailReceiveTimeType(EmailReceiveTimeType? receiveTimeType) {
emailReceiveTimeType.value = receiveTimeType;
}
@override