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

TF-3002 [WEB] Add delete button in search filters

Browse Source
This commit is contained in:
dab246
2024-09-12 21:31:44 +07:00
committed by Dat H. Pham
parent 8290025c14
commit e6eeabedee
9 changed files with 175 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
+12 -4
View File
@@ -446,13 +446,21 @@ class AdvancedFilterController extends BaseController {
}
void _updateFromField() {
listFromEmailAddress = List.from(
searchEmailFilter.from.map((address) => EmailAddress(null, address)));
if (searchEmailFilter.from.isNotEmpty) {
listFromEmailAddress = List.from(
searchEmailFilter.from.map((address) => EmailAddress(null, address)));
} else {
listFromEmailAddress.clear();
}
}
void _updateToField() {
listToEmailAddress= List.from(
searchEmailFilter.to.map((address) => EmailAddress(null, address)));
if (searchEmailFilter.to.isNotEmpty) {
listToEmailAddress = List.from(
searchEmailFilter.to.map((address) => EmailAddress(null, address)));
} else {
listToEmailAddress.clear();
}
}
void onSearchAction(BuildContext context) {
lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+70 -5
View File
@@ -1579,10 +1579,6 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
_getAllIdentities();
}
void addFilterToSuggestionForm(QuickSearchFilter filter) {
searchController.addFilterToSuggestionForm(filter);
}
Future<List<PresentationEmail>> quickSearchEmails(String query) async {
if (sessionCurrent != null && accountId.value != null) {
return searchController.quickSearchEmails(
@@ -1733,7 +1729,7 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
: const None()
);
dispatchAction(StartSearchEmailAction(filter: QuickSearchFilter.folder));
dispatchAction(StartSearchEmailAction());
}
}
@@ -1777,6 +1773,75 @@ class MailboxDashBoardController extends ReloadableController with UserSettingPo
dispatchAction(StartSearchEmailAction());
}
void _deleteDateTimeSearchFilter() {
dispatchAction(ClearDateRangeToAdvancedSearch(EmailReceiveTimeType.allTime));
searchController.updateFilterEmail(
emailReceiveTimeType: EmailReceiveTimeType.allTime,
startDateOption: const None(),
endDateOption: const None(),
beforeOption: const None()
);
dispatchAction(StartSearchEmailAction());
}
void _deleteSortOrderSearchFilter() {
searchController.sortOrderFiltered.value = EmailSortOrderType.mostRecent;
searchController.updateFilterEmail(
sortOrderOption: EmailSortOrderType.mostRecent.getSortOrder());
dispatchAction(StartSearchEmailAction());
}
void _deleteFromSearchFilter() {
searchController.updateFilterEmail(fromOption: const None());
dispatchAction(StartSearchEmailAction(filter: QuickSearchFilter.from));
}
void _deleteToSearchFilter() {
searchController.updateFilterEmail(toOption: const None());
dispatchAction(StartSearchEmailAction(filter: QuickSearchFilter.to));
}
void _deleteHasAttachmentSearchFilter() {
searchController.updateFilterEmail(hasAttachment: false);
dispatchAction(StartSearchEmailAction());
}
void _deleteFolderSearchFilter() {
searchController.updateFilterEmail(
mailboxOption: const None(),
beforeOption: const None(),
positionOption: searchController.sortOrderFiltered.value.isScrollByPosition()
? const Some(0)
: const None()
);
dispatchAction(StartSearchEmailAction());
}
void onDeleteSearchFilterAction(QuickSearchFilter searchFilter) {
switch(searchFilter) {
case QuickSearchFilter.dateTime:
_deleteDateTimeSearchFilter();
break;
case QuickSearchFilter.sortBy:
_deleteSortOrderSearchFilter();
break;
case QuickSearchFilter.from:
_deleteFromSearchFilter();
break;
case QuickSearchFilter.hasAttachment:
_deleteHasAttachmentSearchFilter();
break;
case QuickSearchFilter.to:
_deleteToSearchFilter();
break;
case QuickSearchFilter.folder:
_deleteFolderSearchFilter();
break;
default:
break;
}
}
bool isEmptyTrashBannerEnabledOnWeb(
BuildContext context,
PresentationMailbox? mailbox
lib/features/mailbox_dashboard/presentation/controller/search_controller.dart
+7 -5
View File
@@ -70,14 +70,16 @@ class SearchController extends BaseController with DateRangePickerMixin {
searchEmailFilter.value = SearchEmailFilter.initial();
}
void addFilterToSuggestionForm(QuickSearchFilter filter) {
if (listFilterOnSuggestionForm.contains(filter)) {
listFilterOnSuggestionForm.remove(filter);
} else {
listFilterOnSuggestionForm.add(filter);
void addQuickSearchFilterToSuggestionSearchView(QuickSearchFilter searchFilter) {
if (!listFilterOnSuggestionForm.contains(searchFilter)) {
listFilterOnSuggestionForm.add(searchFilter);
}
}
void deleteQuickSearchFilterFromSuggestionSearchView(QuickSearchFilter searchFilter) {
listFilterOnSuggestionForm.remove(searchFilter);
}
Future<List<PresentationEmail>> quickSearchEmails({
required Session session,
required AccountId accountId,
lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+16 -8
View File
@@ -19,6 +19,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dash
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/email_sort_order_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/styles/mailbox_dashboard_view_web_style.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/download/download_task_item_widget.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/mark_mailbox_as_read_loading_banner.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/navigation_bar/navigation_bar_widget.dart';
@@ -460,15 +461,15 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
controller: controller.listSearchFilterScrollController!,
children: [
_buildQuickSearchFilterButton(context, QuickSearchFilter.folder),
const SizedBox(width: 8),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
_buildQuickSearchFilterButton(context, QuickSearchFilter.from),
const SizedBox(width: 8),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
_buildQuickSearchFilterButton(context, QuickSearchFilter.to),
const SizedBox(width: 8),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
_buildQuickSearchFilterButton(context, QuickSearchFilter.dateTime),
const SizedBox(width: 8),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
_buildQuickSearchFilterButton(context, QuickSearchFilter.hasAttachment),
const SizedBox(width: 8),
MailboxDashboardViewWebStyle.searchFilterSizeBoxMargin,
],
),
),
@@ -484,8 +485,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
}
Widget _buildQuickSearchFilterButton(
BuildContext context,
QuickSearchFilter searchFilter
BuildContext context,
QuickSearchFilter searchFilter,
) {
return Obx(() {
final searchEmailFilter = controller.searchController.searchEmailFilter.value;
@@ -503,6 +504,11 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
searchEmailFilter,
sortOrderType);
EdgeInsetsGeometry? buttonPadding;
if (searchFilter != QuickSearchFilter.sortBy) {
buttonPadding = MailboxDashboardViewWebStyle.getSearchFilterButtonPadding(isSelected);
}
return SearchFilterButton(
key: Key('${searchFilter.name}_search_filter_button'),
searchFilter: searchFilter,
@@ -516,12 +522,14 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
listAddressOfTo: listAddressOfTo,
userName: userName,
mailbox: mailbox,
buttonPadding: buttonPadding,
onSelectSearchFilterAction: _onSelectSearchFilterAction,
onDeleteSearchFilterAction: controller.onDeleteSearchFilterAction,
);
});
}
void _onSelectSearchFilterAction(
Future<void> _onSelectSearchFilterAction(
BuildContext context,
QuickSearchFilter searchFilter,
{RelativeRect? buttonPosition}
lib/features/mailbox_dashboard/presentation/styles/mailbox_dashboard_view_web_style.dart
+14
View File
@@ -0,0 +1,14 @@
import 'package:flutter/cupertino.dart';
class MailboxDashboardViewWebStyle {
static const SizedBox searchFilterSizeBoxMargin = SizedBox(width: 8);
static EdgeInsetsGeometry getSearchFilterButtonPadding(bool isSelected) {
if (isSelected) {
return const EdgeInsetsDirectional.only(start: 12, end: 4);
} else {
return const EdgeInsets.symmetric(horizontal: 12);
}
}
}
lib/features/mailbox_dashboard/presentation/styles/search_filter_button_style.dart
+7 -2
View File
@@ -5,9 +5,14 @@ class SearchFilterButtonStyle {
static const double iconSize = 16;
static const double deleteIconSize = 10;
static const double spaceSize = 4;
static const double buttonSize = 35;
static const EdgeInsetsGeometry buttonPadding = EdgeInsets.symmetric(horizontal: 12, vertical: 8);
static EdgeInsetsGeometry getButtonPadding(bool isSelected) {
if (isSelected) {
return const EdgeInsetsDirectional.only(start: 12, end: 4, top: 4, bottom: 4);
} else {
return const EdgeInsets.symmetric(horizontal: 12, vertical: 8);
}
}
static const EdgeInsetsGeometry elementPadding = EdgeInsetsDirectional.only(start: 8);
static const BorderRadius borderRadius = BorderRadius.all(Radius.circular(10));
lib/features/mailbox_dashboard/presentation/widgets/search_filters/search_filter_button.dart
+8 -4
View File
@@ -15,6 +15,7 @@ typedef OnSelectSearchFilterAction = Function(
BuildContext context,
QuickSearchFilter searchFilter,
{RelativeRect? buttonPosition});
typedef OnDeleteSearchFilterAction = Function(QuickSearchFilter searchFilter);
class SearchFilterButton extends StatelessWidget {
@@ -32,7 +33,9 @@ class SearchFilterButton extends StatelessWidget {
final UserName? userName;
final PresentationMailbox? mailbox;
final Color? backgroundColor;
final EdgeInsetsGeometry? buttonPadding;
final OnSelectSearchFilterAction? onSelectSearchFilterAction;
final OnDeleteSearchFilterAction? onDeleteSearchFilterAction;
const SearchFilterButton({
super.key,
@@ -48,7 +51,9 @@ class SearchFilterButton extends StatelessWidget {
this.userName,
this.mailbox,
this.backgroundColor,
this.buttonPadding,
this.onSelectSearchFilterAction,
this.onDeleteSearchFilterAction,
});
@override
@@ -69,8 +74,7 @@ class SearchFilterButton extends StatelessWidget {
decoration: BoxDecoration(
borderRadius: SearchFilterButtonStyle.borderRadius,
color: backgroundColor ?? searchFilter.getBackgroundColor(isFilterSelected: isSelected)),
padding: SearchFilterButtonStyle.buttonPadding,
height: SearchFilterButtonStyle.buttonSize,
padding: buttonPadding ?? SearchFilterButtonStyle.getButtonPadding(isSelected),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
@@ -104,9 +108,9 @@ class SearchFilterButton extends StatelessWidget {
icon: imagePaths.icDeleteSelection,
iconSize: SearchFilterButtonStyle.deleteIconSize,
iconColor: AppColor.colorTextBody,
padding: EdgeInsets.zero,
padding: const EdgeInsets.all(8),
backgroundColor: Colors.transparent,
margin: SearchFilterButtonStyle.elementPadding,
onTapActionCallback: () => onDeleteSearchFilterAction?.call(searchFilter),
),
]
)
lib/features/mailbox_dashboard/presentation/widgets/search_input_form_widget.dart
+16 -5
View File
@@ -70,16 +70,19 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
QuickSearchFilter.last7Days,
QuickSearchFilter.fromMe,
],
actionButtonBuilder: (context, filterAction) {
actionButtonBuilder: (context, filterAction, suggestionsListState) {
if (filterAction is QuickSearchFilter) {
return buildListButtonForQuickSearchForm(context, filterAction);
return buildListButtonForQuickSearchForm(
context,
filterAction,
suggestionsListState);
} else {
return const SizedBox.shrink();
}
},
buttonActionCallback: (filterAction) {
if (filterAction is QuickSearchFilter) {
_dashBoardController.addFilterToSuggestionForm(filterAction);
_searchController.addQuickSearchFilterToSuggestionSearchView(filterAction);
}
},
listActionPadding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 6),
@@ -94,7 +97,7 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
)
)
),
buttonShowAllResult: (context, keyword) {
buttonShowAllResult: (context, keyword, _) {
if (keyword is String) {
return _buildShowAllResultButton(context, keyword);
} else {
@@ -221,7 +224,11 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
);
}
Widget buildListButtonForQuickSearchForm(BuildContext context, QuickSearchFilter searchFilter) {
Widget buildListButtonForQuickSearchForm(
BuildContext context,
QuickSearchFilter searchFilter,
SuggestionsListState suggestionsListState
) {
return Obx(() {
final isSelected = searchFilter.isApplied(_searchController.listFilterOnSuggestionForm);
@@ -230,6 +237,10 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin {
imagePaths: _imagePaths,
isSelected: isSelected,
backgroundColor: searchFilter.getSuggestionBackgroundColor(isFilterSelected: isSelected),
onDeleteSearchFilterAction: (searchFilter) {
_searchController.deleteQuickSearchFilterFromSuggestionSearchView(searchFilter);
suggestionsListState.invalidateSuggestions();
},
);
});
}