From cc508c210a1ff716be5fc266e43741acbb8698a8 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 5 Jan 2026 12:20:34 +0700
Subject: [PATCH] TF-4229 Add quick search label filter button in dashboard
 view

---
 .../popup_context_menu_action_mixin.dart      | 11 +++-
 .../popup_menu_item_action_widget.dart        | 11 +++-
 .../mailbox_dashboard_controller.dart         |  7 +-
 .../controller/search_controller.dart         |  5 ++
 ...select_search_filter_action_extension.dart | 18 +++++
 .../mailbox_dashboard_view_web.dart           | 36 +++++++++-
 .../model/search/quick_search_filter.dart     |  4 +-
 .../model/search/search_email_filter.dart     |  2 +-
 .../search_label_filter_modal_mixin.dart      |  3 +-
 .../email/presentation/search_email_view.dart | 66 +++++++++++--------
 10 files changed, 125 insertions(+), 38 deletions(-)

diff --git a/lib/features/base/mixin/popup_context_menu_action_mixin.dart b/lib/features/base/mixin/popup_context_menu_action_mixin.dart
index 6fd561daa..d03c6dced 100644
--- a/lib/features/base/mixin/popup_context_menu_action_mixin.dart
+++ b/lib/features/base/mixin/popup_context_menu_action_mixin.dart
@@ -28,6 +28,7 @@ mixin PopupContextMenuActionMixin {
     required OnContextMenuActionClick onContextMenuActionClick,
     Key? key,
     bool useGroupedActions = false,
+    double? maxHeight,
   }) async {
     return await showModalBottomSheet(
       context: context,
@@ -42,6 +43,9 @@ mixin PopupContextMenuActionMixin {
       ),
       backgroundColor: Colors.white,
       barrierColor: Colors.black.withValues(alpha: 0.2),
+      constraints: BoxConstraints(
+        maxHeight: maxHeight ?? double.infinity,
+      ),
       builder: (_) {
         return PointerInterceptor(
           child: Container(
@@ -63,6 +67,7 @@ mixin PopupContextMenuActionMixin {
     BuildContext context,
     RelativeRect position,
     List<PopupMenuEntry> popupMenuItems,
+    {double? maxHeight}
   ) async {
     return await showMenu(
       context: context,
@@ -74,7 +79,11 @@ mixin PopupContextMenuActionMixin {
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.all(Radius.circular(6)),
       ),
-      constraints: const BoxConstraints(maxWidth: 300, minWidth: 178),
+      constraints: BoxConstraints(
+        maxWidth: 300,
+        minWidth: 178,
+        maxHeight: maxHeight ?? double.infinity,
+      ),
       items: popupMenuItems,
     );
   }
diff --git a/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart b/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart
index 38078e13e..c86959522 100644
--- a/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart
+++ b/lib/features/base/widget/popup_menu/popup_menu_item_action_widget.dart
@@ -46,6 +46,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
     Widget? iconWidget;
     Widget? selectedIconWidget;
     bool isSelected = false;
+    bool isArrangeRTL = true;
 
     if (widget.menuAction is PopupMenuItemActionRequiredIcon) {
       final specificMenuAction =
@@ -75,6 +76,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
       );
       isSelected =
           specificMenuAction.selectedAction == widget.menuAction.action;
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     } else if (widget.menuAction is PopupMenuItemActionRequiredFull) {
       final specificMenuAction =
           widget.menuAction as PopupMenuItemActionRequiredFull;
@@ -100,6 +102,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
       );
       isSelected =
           specificMenuAction.selectedAction == widget.menuAction.action;
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     } else if (widget.menuAction
         is PopupMenuItemActionRequiredIconWithMultipleSelected) {
       final specificMenuAction = widget.menuAction
@@ -126,6 +129,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
       );
       isSelected =
           specificMenuAction.selectedActions.contains(widget.menuAction.action);
+      isArrangeRTL = specificMenuAction.isArrangeRTL;
     }
 
     if (widget.menuAction is PopupMenuItemEmailAction &&
@@ -217,6 +221,11 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
             child: Row(
               children: [
                 if (iconWidget != null) iconWidget,
+                if (!isArrangeRTL && selectedIconWidget != null)
+                  Padding(
+                    padding: const EdgeInsetsDirectional.only(end: 16),
+                    child: selectedIconWidget,
+                  ),
                 Expanded(
                   child: Text(
                     widget.menuAction.actionName,
@@ -227,7 +236,7 @@ class _PopupMenuItemActionWidgetState extends State<PopupMenuItemActionWidget> {
                     overflow: TextOverflow.ellipsis,
                   ),
                 ),
-                if (isSelected && selectedIconWidget != null)
+                if (isArrangeRTL && isSelected && selectedIconWidget != null)
                   selectedIconWidget,
               ],
             ),
diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index db1454e92..c1454e79c 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -177,6 +177,7 @@ import 'package:tmail_ui_user/features/push_notification/presentation/controller
 import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_service.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/utils/fcm_utils.dart';
+import 'package:tmail_ui_user/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/state/get_all_sending_email_state.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/state/update_sending_email_state.dart';
@@ -226,7 +227,8 @@ class MailboxDashBoardController extends ReloadableController
     with ContactSupportMixin,
         OwnEmailAddressMixin,
         SaaSPremiumMixin,
-        AiScribeMixin {
+        AiScribeMixin,
+        SearchLabelFilterModalMixin {
 
   final RemoveEmailDraftsInteractor _removeEmailDraftsInteractor = Get.find<RemoveEmailDraftsInteractor>();
   final EmailReceiveManager _emailReceiveManager = Get.find<EmailReceiveManager>();
@@ -2363,6 +2365,9 @@ class MailboxDashBoardController extends ReloadableController
       case QuickSearchFilter.unread:
         deleteUnreadSearchFilter();
         break;
+      case QuickSearchFilter.labels:
+        deleteQuickSearchFilter(filter: searchFilter);
+        break;
       default:
         break;
     }
diff --git a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
index 6a2ddf2d0..7619cc9fa 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
@@ -15,6 +15,7 @@ import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/model/label.dart';
 import 'package:model/email/presentation_email.dart';
 import 'package:model/extensions/email_filter_condition_extension.dart';
 import 'package:model/mailbox/presentation_mailbox.dart';
@@ -209,6 +210,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
     Option<UTCDate>? endDateOption,
     Option<int>? positionOption,
     Option<EmailSortOrderType>? sortOrderTypeOption,
+    Option<Label>? labelOption,
   }) {
     searchEmailFilter.value = searchEmailFilter.value.copyWith(
       fromOption: fromOption,
@@ -226,6 +228,7 @@ class SearchController extends BaseController with DateRangePickerMixin {
       endDateOption: endDateOption,
       positionOption: positionOption,
       sortOrderTypeOption: sortOrderTypeOption,
+      labelOption: labelOption,
     );
     searchEmailFilter.refresh();
   }
@@ -238,6 +241,8 @@ class SearchController extends BaseController with DateRangePickerMixin {
 
   PresentationMailbox? get mailboxFiltered => searchEmailFilter.value.mailbox;
 
+  Label? get labelFiltered => searchEmailFilter.value.label;
+
   Set<String> get listAddressOfToFiltered => searchEmailFilter.value.to;
 
   Set<String> get listAddressOfFromFiltered => searchEmailFilter.value.from;
diff --git a/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart b/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart
index 20d797470..26e3e5be8 100644
--- a/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart
+++ b/lib/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart
@@ -1,7 +1,9 @@
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
+import 'package:labels/model/label.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.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/quick_search_filter.dart';
 
 extension SelectSearchFilterActionExtension on MailboxDashBoardController {
   void selectStarredSearchFilter() {
@@ -31,4 +33,20 @@ extension SelectSearchFilterActionExtension on MailboxDashBoardController {
     searchController.updateFilterEmail(unreadOption: const None());
     dispatchAction(StartSearchEmailAction());
   }
+
+  void deleteQuickSearchFilter({required QuickSearchFilter filter}) {
+    switch (filter) {
+      case QuickSearchFilter.labels:
+        searchController.updateFilterEmail(labelOption: const None());
+        break;
+      default:
+        break;
+    }
+    dispatchAction(StartSearchEmailAction());
+  }
+
+  void onSelectLabelFilter(Label? newLabel) {
+    searchController.updateFilterEmail(labelOption: optionOf(newLabel));
+    dispatchAction(StartSearchEmailAction());
+  }
 }
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
index cbb6fdbd5..4226a725e 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
@@ -22,6 +22,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/das
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_profile_setting_action_type_click_extension.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/select_search_filter_action_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
@@ -644,8 +645,13 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
 
   Widget _buildListButtonQuickSearchFilter(BuildContext context) {
     return Obx(() {
-      if (controller.searchController.isSearchEmailRunning &&
-          controller.dashboardRoute.value == DashboardRoutes.thread) {
+      final isSearchEmailRunning =
+          controller.searchController.isSearchEmailRunning;
+      final isThreadRoute =
+          controller.dashboardRoute.value == DashboardRoutes.thread;
+      final isLabelAvailable = controller.isLabelAvailable;
+
+      if (isSearchEmailRunning && isThreadRoute) {
         return Padding(
           padding: const EdgeInsetsDirectional.only(end: 16),
           child: Row(
@@ -672,6 +678,14 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
                       children: [
                         _buildQuickSearchFilterButton(context, QuickSearchFilter.folder),
                         MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
+                        if (isLabelAvailable)
+                          ...[
+                            _buildQuickSearchFilterButton(
+                              context,
+                              QuickSearchFilter.labels,
+                            ),
+                            MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
+                          ],
                         _buildQuickSearchFilterButton(context, QuickSearchFilter.from),
                         MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
                         _buildQuickSearchFilterButton(context, QuickSearchFilter.to),
@@ -732,6 +746,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
       final endDate = controller.searchController.endDateFiltered;
       final receiveTimeType = controller.searchController.receiveTimeFiltered;
       final mailbox = controller.searchController.mailboxFiltered;
+      final label = controller.searchController.labelFiltered;
       final listAddressOfTo = controller.searchController.listAddressOfToFiltered;
       final listHasKeywordFiltered = controller.searchController.listHasKeywordFiltered;
       final unreadFiltered = controller.searchController.unreadFiltered;
@@ -769,13 +784,15 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
         listAddressOfFrom: listAddressOfFrom,
         listAddressOfTo: listAddressOfTo,
         mailbox: mailbox,
+        label: label,
         buttonPadding: buttonPadding,
         backgroundColor: searchFilter == QuickSearchFilter.sortBy
           ? isSelected
               ? AppColor.primaryColor.withValues(alpha: 0.06)
               : AppColor.colorFilterMessageButton.withValues(alpha: 0.6)
           : null,
-        isContextMenuAlignEndButton: isFilterApplied,
+        isContextMenuAlignEndButton:
+          searchFilter != QuickSearchFilter.labels && isFilterApplied,
         onSelectSearchFilterAction: _onSelectSearchFilterAction,
         onDeleteSearchFilterAction: controller.onDeleteSearchFilterAction,
       );
@@ -820,6 +837,19 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
       case QuickSearchFilter.unread:
         controller.selectUnreadSearchFilter();
         break;
+      case QuickSearchFilter.labels:
+        final listLabels = controller.labelController.labels;
+        final selectedLabel = controller.searchController.labelFiltered;
+
+        controller.openLabelsFilterModal(
+          context: context,
+          position: buttonPosition,
+          labels: listLabels,
+          selectedLabel: selectedLabel,
+          imagePaths: controller.imagePaths,
+          onSelectLabelsActions: controller.onSelectLabelFilter,
+        );
+        break;
       default:
         break;
     }
diff --git a/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
index a80eb33b0..b3f21b3d5 100644
--- a/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
+++ b/lib/features/mailbox_dashboard/presentation/model/search/quick_search_filter.dart
@@ -172,7 +172,9 @@ enum QuickSearchFilter {
     if (responsiveUtils.isMobile(context)) {
       return false;
     } else {
-      return this == QuickSearchFilter.dateTime || this == QuickSearchFilter.sortBy;
+      return this == QuickSearchFilter.dateTime ||
+          this == QuickSearchFilter.sortBy ||
+          this == QuickSearchFilter.labels;
     }
   }
 
diff --git a/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
index 45c36dd13..d338ea6e9 100644
--- a/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
+++ b/lib/features/mailbox_dashboard/presentation/model/search/search_email_filter.dart
@@ -152,7 +152,7 @@ class SearchEmailFilter with EquatableMixin, OptionParamMixin {
           hasKeyword.map((e) => EmailFilterCondition(hasKeyword: e)).toSet(),
         ),
       if (label != null)
-        EmailFilterCondition(hasKeyword: label!.keyword),
+        EmailFilterCondition(hasKeyword: label!.keyword?.value),
       if (moreFilterCondition != null && moreFilterCondition.hasCondition)
         moreFilterCondition
     };
diff --git a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
index c2b1ecabd..ae4ca3638 100644
--- a/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
+++ b/lib/features/search/email/presentation/mixin/search_label_filter_modal_mixin.dart
@@ -62,7 +62,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
       );
     }).toList();
 
-    openPopupMenuAction(context, position, popupMenuItems);
+    openPopupMenuAction(context, position, popupMenuItems, maxHeight: 400);
   }
 
   void openContextMenuLabelsFilter({
@@ -87,6 +87,7 @@ mixin SearchLabelFilterModalMixin on PopupContextMenuActionMixin {
         popBack();
         onSelectLabelsActions(menuAction.action);
       },
+      maxHeight: 400,
     );
   }
 }
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index 5f90e85b8..e12fea0fe 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -267,35 +267,43 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                 scrollbars: false
               ),
               scrollController: controller.listSearchFilterScrollController,
-              child: ListView(
-                key: const Key('search_filter_list_view'),
-                scrollDirection: Axis.horizontal,
-                shrinkWrap: true,
-                controller: controller.listSearchFilterScrollController,
-                padding: SearchEmailViewStyle.getListSearchFilterButtonPadding(
-                  context,
-                  controller.responsiveUtils
-                ),
-                children: [
-                  _buildSearchFilterButton(context, QuickSearchFilter.folder),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.labels),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.from),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.to),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.hasAttachment),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.dateTime),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.starred),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.unread),
-                  SearchEmailViewStyle.searchFilterSizeBoxMargin,
-                  _buildSearchFilterButton(context, QuickSearchFilter.sortBy),
-                ],
-              ),
+              child: Obx(() {
+                final isLabelAvailable =
+                    controller.mailboxDashBoardController.isLabelAvailable;
+
+                return ListView(
+                  key: const Key('search_filter_list_view'),
+                  scrollDirection: Axis.horizontal,
+                  shrinkWrap: true,
+                  controller: controller.listSearchFilterScrollController,
+                  padding: SearchEmailViewStyle.getListSearchFilterButtonPadding(
+                      context,
+                      controller.responsiveUtils
+                  ),
+                  children: [
+                    _buildSearchFilterButton(context, QuickSearchFilter.folder),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    if (isLabelAvailable)
+                     ...[
+                       _buildSearchFilterButton(context, QuickSearchFilter.labels),
+                       SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                     ],
+                    _buildSearchFilterButton(context, QuickSearchFilter.from),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.to),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.hasAttachment),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.dateTime),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.starred),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.unread),
+                    SearchEmailViewStyle.searchFilterSizeBoxMargin,
+                    _buildSearchFilterButton(context, QuickSearchFilter.sortBy),
+                  ],
+                );
+              }),
             ),
           ),
         ),