TF-4056 Persist filter search when change quick search input text

core/lib/presentation/extensions/string_extension.dart

@@ -98,4 +98,6 @@ extension StringExtension on String {
       return 0;
     }
   }
+
+  String get trimmed => trim();
 }

integration_test/robots/search_robot.dart

@@ -85,4 +85,14 @@ class SearchRobot extends CoreRobot {
   Future<void> tapBackButton() async {
     await $(#search_email_back_button).tap();
   }
+
+  Future<void> selectAttachmentFilter() async {
+    await $.scrollUntilVisible(
+      finder: $(#mobile_hasAttachment_search_filter_button),
+      view: $(#search_filter_list_view),
+      scrollDirection: AxisDirection.right,
+      delta: 50,
+    );
+    await $(#mobile_hasAttachment_search_filter_button).tap();
+  }
 }

integration_test/scenarios/search/persist_filter_when_change_search_input_text_scenario.dart

@@ -0,0 +1,63 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/search_filters/search_filter_button.dart';
+
+import '../../base/base_test_scenario.dart';
+import '../../models/provisioning_email.dart';
+import '../../robots/search_robot.dart';
+import '../../robots/thread_robot.dart';
+
+class PersistFilterWhenChangeSearchInputTextScenario
+    extends BaseTestScenario {
+  const PersistFilterWhenChangeSearchInputTextScenario(super.$);
+
+  @override
+  Future<void> runTestLogic() async {
+    const email = String.fromEnvironment('BASIC_AUTH_EMAIL');
+    const subject = 'Persist search filter';
+    const queryStringFirst = 'Persist';
+    const queryStringSecond = 'Persist search';
+
+    final threadRobot = ThreadRobot($);
+    final searchRobot = SearchRobot($);
+
+    final file = await preparingTxtFile('attachment');
+    await provisionEmail(
+      [
+        ProvisioningEmail(
+          toEmail: email,
+          subject: subject,
+          content: subject,
+          attachmentPaths: [file.path],
+        ),
+      ],
+      requestReadReceipt: false,
+    );
+    await $.pumpAndSettle();
+
+    await threadRobot.tapOnSearchField();
+    await searchRobot.enterKeyword(queryStringFirst);
+    await searchRobot.tapOnShowAllResultsText();
+    await _expectEmailWithSubjectVisible(subject);
+
+    await searchRobot.selectAttachmentFilter();
+    await _expectEmailWithSubjectVisible(subject);
+    _expectAttachmentFilterSelected();
+
+    await searchRobot.enterKeyword(queryStringSecond);
+    await _expectEmailWithSubjectVisible(subject);
+    _expectAttachmentFilterSelected();
+  }
+
+  Future<void> _expectEmailWithSubjectVisible(String subject) async {
+    await expectViewVisible($(find.text(subject)));
+  }
+
+  void _expectAttachmentFilterSelected() {
+    expect(
+      $(#mobile_hasAttachment_search_filter_button)
+          .which<SearchFilterButton>((widget) => widget.isSelected)
+          .visible,
+      true,
+    );
+  }
+}

integration_test/tests/search/persist_filter_when_change_search_input_text_test.dart

@@ -0,0 +1,9 @@
+import '../../base/test_base.dart';
+import '../../scenarios/search/persist_filter_when_change_search_input_text_scenario.dart';
+
+void main() {
+  TestBase().runPatrolTest(
+    description: 'Should see the same email when selecting filter and changing search input text',
+    scenarioBuilder: ($) => PersistFilterWhenChangeSearchInputTextScenario($),
+  );
+}

lib/features/mailbox/presentation/mailbox_controller.dart

@@ -262,12 +262,6 @@ class MailboxController extends BaseMailboxController
       _handleNavigationRouteParameters
     );
 
-    ever(mailboxDashBoardController.dashBoardAction, (action) {
-      if (action is ClearSearchEmailAction) {
-        _switchBackToMailboxDefault();
-      }
-    });
-
     ever(mailboxDashBoardController.mailboxUIAction, (action) {
       if (action is SelectMailboxDefaultAction) {
         _switchBackToMailboxDefault();

lib/features/mailbox_dashboard/presentation/action/dashboard_action.dart

@@ -58,8 +58,6 @@ class StartSearchEmailAction extends DashBoardAction {}
 
 class EmptyTrashAction extends DashBoardAction {}
 
-class ClearSearchEmailAction extends DashBoardAction {}
-
 class ClearAllFieldOfAdvancedSearchAction extends DashBoardAction {}
 
 class OpenEmailInsideMailboxFromLocationBar extends DashBoardAction {

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -968,7 +968,6 @@ class MailboxDashBoardController extends ReloadableController
   void searchEmailByQueryString(String queryString) {
     final isMailAddress = EmailUtils.isEmailAddressValid(queryString);
     log('MailboxDashBoardController::searchEmailByQueryString():QueryString = $queryString | isMailAddress = $isMailAddress');
-    clearFilterMessageOption();
     if (_searchInsideThreadDetailViewIsActive()) {
       _closeEmailDetailedView();
     }
@@ -999,11 +998,6 @@ class MailboxDashBoardController extends ReloadableController
       && dashboardRoute.value == DashboardRoutes.threadDetailed;
   }
 
-  void clearSearchEmail() {
-    dispatchAction(ClearSearchEmailAction());
-    searchController.disableSimpleSearch();
-  }
-
   void _unSelectedMailbox() {
     selectedMailbox.value = null;
   }

lib/features/mailbox_dashboard/presentation/controller/search_controller.dart

@@ -143,28 +143,27 @@ class SearchController extends BaseController with DateRangePickerMixin {
   void applyFilterSuggestionToSearchFilter(String currentUserEmail) {
     final receiveTime = listFilterOnSuggestionForm.contains(QuickSearchFilter.last7Days)
       ? EmailReceiveTimeType.last7Days
-      : EmailReceiveTimeType.allTime;
+      : null;
 
-    final hasAttachment = listFilterOnSuggestionForm.contains(QuickSearchFilter.hasAttachment) ? true : false;
+    final hasAttachment = listFilterOnSuggestionForm.contains(QuickSearchFilter.hasAttachment)
+        ? true
+        : null;
 
     var listFromAddress = searchEmailFilter.value.from;
-    if (currentUserEmail.isNotEmpty) {
-      if (listFilterOnSuggestionForm.contains(QuickSearchFilter.fromMe)) {
-        listFromAddress.add(currentUserEmail);
-      } else {
-        listFromAddress.remove(currentUserEmail);
-      }
+    if (currentUserEmail.isNotEmpty &&
+        listFilterOnSuggestionForm.contains(QuickSearchFilter.fromMe)) {
+      listFromAddress.add(currentUserEmail);
     }
 
     final listHasKeyword = listFilterOnSuggestionForm.contains(QuickSearchFilter.starred)
       ? {KeyWordIdentifier.emailFlagged.value}
       : null;
 
     updateFilterEmail(
-      emailReceiveTimeTypeOption: Some(receiveTime),
-      hasAttachmentOption: Some(hasAttachment),
+      emailReceiveTimeTypeOption: receiveTime != null ? Some(receiveTime) : null,
+      hasAttachmentOption: hasAttachment != null ? Some(hasAttachment) : null,
       fromOption: Some(listFromAddress),
-      hasKeywordOption: optionOf(listHasKeyword),
+      hasKeywordOption: listHasKeyword != null ? Some(listHasKeyword) : null,
     );
 
     clearFilterSuggestion();
@@ -232,13 +231,6 @@ class SearchController extends BaseController with DateRangePickerMixin {
     searchState.value = searchState.value.enableSearchState();
   }
 
-  void disableSimpleSearch() {
-    updateFilterEmail(textOption: Some(SearchQuery.initial()));
-    _clearAllTextInputSimpleSearch();
-    deactivateSimpleSearch();
-    hideSimpleSearchFormView();
-  }
-
   void clearTextSearch() {
     searchInputController.clear();
     searchFocus.requestFocus();

lib/features/mailbox_dashboard/presentation/widgets/search_input_form_widget.dart

@@ -1,5 +1,6 @@
 
 import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/presentation/extensions/string_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/utils/theme_utils.dart';
@@ -160,24 +161,22 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
 
   void _invokeSearchEmailAction(String queryString) {
     log('SearchInputFormWidget::_invokeSearchEmailAction:QueryString = $queryString');
+    final trimmedQueryString = queryString.trimmed;
+
     _searchController.searchFocus.unfocus();
     _searchController.enableSearch();
 
-    if (queryString.isNotEmpty) {
-      _saveRecentSearch(queryString);
+    if (trimmedQueryString.isNotEmpty) {
+      _saveRecentSearch(trimmedQueryString);
     }
 
-    if (queryString.isNotEmpty || _searchController.listFilterOnSuggestionForm.isNotEmpty) {
-      _searchController.clearSearchFilter(
-        sortOrderType: _dashBoardController.currentSortOrder,
-      );
+    if (_searchController.listFilterOnSuggestionForm.isNotEmpty) {
       _searchController.applyFilterSuggestionToSearchFilter(
         _dashBoardController.ownEmailAddress.value,
       );
-      _dashBoardController.searchEmailByQueryString(queryString);
-    } else {
-      _dashBoardController.clearSearchEmail();
     }
+
+    _dashBoardController.searchEmailByQueryString(trimmedQueryString);
   }
 
   void _saveRecentSearch(String queryString) {
@@ -192,7 +191,7 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
     _searchController.saveRecentSearch(
       accountId,
       userName,
-      RecentSearch.now(queryString),
+      RecentSearch.now(queryString.trimmed),
     );
   }
 
@@ -208,9 +207,6 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
     _searchController.searchInputController.text = recent.value;
     _searchController.searchFocus.unfocus();
     _searchController.enableSearch();
-    _searchController.clearSearchFilter(
-      sortOrderType: _dashBoardController.currentSortOrder,
-    );
     _searchController.applyFilterSuggestionToSearchFilter(
       _dashBoardController.ownEmailAddress.value,
     );

lib/features/search/email/presentation/search_email_controller.dart

@@ -603,9 +603,6 @@ class SearchEmailController extends BaseController
     listResultSearch.clear();
     emailReceiveTimeType.value = EmailReceiveTimeType.allTime;
     emailSortOrderType.value = mailboxDashBoardController.currentSortOrder;
-    searchEmailFilter.value = SearchEmailFilter.withSortOrder(
-      emailSortOrderType.value,
-    );
     searchIsRunning.value = false;
     final isMailAddress = EmailUtils.isEmailAddressValid(queryString);
     if (isMailAddress) {