TF-4229 Add quick search label filter button in dashboard view
This commit is contained in:
+6
-1
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
+18
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user