TF-3189 subaddressing features only shown if supported by the server

This commit is contained in:
Florent Azavant
2024-11-29 12:30:22 +01:00
committed by Dat H. Pham
parent f1ec1d7324
commit 019dbe6e03
4 changed files with 130 additions and 18 deletions
@@ -4,9 +4,11 @@ import 'package:core/utils/direction_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:model/extensions/presentation_mailbox_extension.dart'; import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:model/mailbox/expand_mode.dart'; import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:model/mailbox/mailbox_constants.dart';
import 'package:model/model.dart';
import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart'; import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
import 'package:tmail_ui_user/features/base/widget/popup_item_widget.dart'; import 'package:tmail_ui_user/features/base/widget/popup_item_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
@@ -15,6 +17,8 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_action
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_bottom_sheet_action_tile_builder.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/app_dashboard/app_list_dashboard_item.dart';
import 'package:tmail_ui_user/main/error/capability_validator.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
mixin MailboxWidgetMixin { mixin MailboxWidgetMixin {
@@ -53,7 +57,7 @@ mixin MailboxWidgetMixin {
]; ];
} }
List<MailboxActions> _listActionForPersonalMailbox(PresentationMailbox mailbox) { List<MailboxActions> _listActionForPersonalMailbox(PresentationMailbox mailbox, bool subaddressingSupported) {
return [ return [
if (PlatformInfo.isWeb && mailbox.isSubscribedMailbox) if (PlatformInfo.isWeb && mailbox.isSubscribedMailbox)
MailboxActions.openInNewTab, MailboxActions.openInNewTab,
@@ -62,12 +66,14 @@ mixin MailboxWidgetMixin {
MailboxActions.markAsRead, MailboxActions.markAsRead,
MailboxActions.move, MailboxActions.move,
MailboxActions.rename, MailboxActions.rename,
if (mailbox.isSubaddressingAllowed) if (subaddressingSupported) ...[
MailboxActions.disallowSubaddressing if (mailbox.isSubaddressingAllowed)
else MailboxActions.disallowSubaddressing
MailboxActions.allowSubaddressing, else
if (mailbox.isSubaddressingAllowed) MailboxActions.allowSubaddressing,
MailboxActions.copySubaddress, if (mailbox.isSubaddressingAllowed)
MailboxActions.copySubaddress,
],
if (mailbox.isSubscribedMailbox) if (mailbox.isSubscribedMailbox)
MailboxActions.disableMailbox MailboxActions.disableMailbox
else else
@@ -93,12 +99,13 @@ mixin MailboxWidgetMixin {
List<MailboxActions> _listActionForAllMailboxType( List<MailboxActions> _listActionForAllMailboxType(
PresentationMailbox mailbox, PresentationMailbox mailbox,
bool spamReportEnabled, bool spamReportEnabled,
bool deletedMessageVaultSupported bool deletedMessageVaultSupported,
bool subaddressingSupported,
) { ) {
if (mailbox.isDefault) { if (mailbox.isDefault) {
return _listActionForDefaultMailbox(mailbox, spamReportEnabled, deletedMessageVaultSupported); return _listActionForDefaultMailbox(mailbox, spamReportEnabled, deletedMessageVaultSupported);
} else if (mailbox.isPersonal) { } else if (mailbox.isPersonal) {
return _listActionForPersonalMailbox(mailbox); return _listActionForPersonalMailbox(mailbox, subaddressingSupported);
} else { } else {
return _listActionForTeamMailbox(mailbox); return _listActionForTeamMailbox(mailbox);
} }
@@ -114,10 +121,15 @@ mixin MailboxWidgetMixin {
controller.mailboxDashBoardController.sessionCurrent, controller.mailboxDashBoardController.sessionCurrent,
controller.mailboxDashBoardController.accountId.value); controller.mailboxDashBoardController.accountId.value);
final bool subaddressingSupported = isSubaddressingSupported(
controller.mailboxDashBoardController.sessionCurrent,
controller.mailboxDashBoardController.accountId.value);
final contextMenuActions = listContextMenuItemAction( final contextMenuActions = listContextMenuItemAction(
mailbox, mailbox,
controller.mailboxDashBoardController.enableSpamReport, controller.mailboxDashBoardController.enableSpamReport,
deletedMessageVaultSupported deletedMessageVaultSupported,
subaddressingSupported,
); );
if (contextMenuActions.isEmpty) { if (contextMenuActions.isEmpty) {
@@ -189,9 +201,10 @@ mixin MailboxWidgetMixin {
List<ContextMenuItemMailboxAction> listContextMenuItemAction( List<ContextMenuItemMailboxAction> listContextMenuItemAction(
PresentationMailbox mailbox, PresentationMailbox mailbox,
bool spamReportEnabled, bool spamReportEnabled,
bool deletedMessageVaultSupported bool deletedMessageVaultSupported,
bool subaddressingSupported,
) { ) {
final mailboxActionsSupported = _listActionForAllMailboxType(mailbox, spamReportEnabled, deletedMessageVaultSupported); final mailboxActionsSupported = _listActionForAllMailboxType(mailbox, spamReportEnabled, deletedMessageVaultSupported, subaddressingSupported);
final listContextMenuItemAction = mailboxActionsSupported final listContextMenuItemAction = mailboxActionsSupported
.map((action) => ContextMenuItemMailboxAction(action, action.getContextMenuItemState(mailbox))) .map((action) => ContextMenuItemMailboxAction(action, action.getContextMenuItemState(mailbox)))
@@ -212,10 +225,15 @@ mixin MailboxWidgetMixin {
controller.mailboxDashBoardController.sessionCurrent, controller.mailboxDashBoardController.sessionCurrent,
controller.mailboxDashBoardController.accountId.value); controller.mailboxDashBoardController.accountId.value);
final bool subaddressingSupported = isSubaddressingSupported(
controller.mailboxDashBoardController.sessionCurrent,
controller.mailboxDashBoardController.accountId.value);
final contextMenuActions = listContextMenuItemAction( final contextMenuActions = listContextMenuItemAction(
mailbox, mailbox,
controller.mailboxDashBoardController.enableSpamReport, controller.mailboxDashBoardController.enableSpamReport,
deletedMessageVaultSupported deletedMessageVaultSupported,
subaddressingSupported,
); );
if (contextMenuActions.isEmpty) { if (contextMenuActions.isEmpty) {
@@ -268,6 +286,20 @@ mixin MailboxWidgetMixin {
.toList(); .toList();
} }
static bool isSubaddressingSupported(Session? session, AccountId? accountId) {
if (session == null || accountId == null) {
return false;
}
if (!CapabilityIdentifier.jmapTeamMailboxes.isSupported(session, accountId)) {
return false;
}
return (session.getCapabilityProperties(accountId, CapabilityIdentifier.jmapTeamMailboxes)
?.props[0] as Map<String, dynamic>?)
?[subaddressingSupported]
?? false;
}
PopupMenuItem _buildPopupMenuItem( PopupMenuItem _buildPopupMenuItem(
BuildContext context, BuildContext context,
ImagePaths imagePaths, ImagePaths imagePaths,
@@ -201,10 +201,15 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
controller.dashboardController.sessionCurrent, controller.dashboardController.sessionCurrent,
controller.dashboardController.accountId.value); controller.dashboardController.accountId.value);
final bool subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(
controller.dashboardController.sessionCurrent,
controller.dashboardController.accountId.value);
final contextMenuActions = listContextMenuItemAction( final contextMenuActions = listContextMenuItemAction(
mailbox, mailbox,
controller.dashboardController.enableSpamReport, controller.dashboardController.enableSpamReport,
deletedMessageVaultSupported deletedMessageVaultSupported,
subaddressingSupported,
); );
return contextMenuActions return contextMenuActions
.map((action) => _mailboxFocusedMenuItem(context, action, mailbox)) .map((action) => _mailboxFocusedMenuItem(context, action, mailbox))
@@ -262,10 +267,15 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
controller.dashboardController.sessionCurrent, controller.dashboardController.sessionCurrent,
controller.dashboardController.accountId.value); controller.dashboardController.accountId.value);
final bool subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(
controller.dashboardController.sessionCurrent,
controller.dashboardController.accountId.value);
final contextMenuActions = listContextMenuItemAction( final contextMenuActions = listContextMenuItemAction(
mailbox, mailbox,
controller.dashboardController.enableSpamReport, controller.dashboardController.enableSpamReport,
deletedMessageVaultSupported deletedMessageVaultSupported,
subaddressingSupported,
); );
if (contextMenuActions.isEmpty) { if (contextMenuActions.isEmpty) {
+1
View File
@@ -1,2 +1,3 @@
const String anyoneIdentifier = 'anyone'; const String anyoneIdentifier = 'anyone';
const String postingRight = 'p'; const String postingRight = 'p';
const String subaddressingSupported = "subaddressingSupported";
@@ -0,0 +1,69 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/account/account.dart';
import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
import 'package:jmap_dart_client/jmap/core/capability/default_capability.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/core/state.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart';
void main() {
group('MailboxWidgetMixin::isSubaddressingSupported::test', () {
test(
'should return true '
'when the server advertizes true',
() {
// arrange
final session = Session(
{CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": true})},
{AccountId(Id("1")): Account(AccountName("name"), true, false, {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": true})})},
{}, UserName(''), Uri(), Uri(), Uri(), Uri(), State(''));
// act
final subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(session, AccountId(Id("1")));
// assert
expect(subaddressingSupported, true);
});
test(
'should return false '
'when the server advertizes false',
() {
// arrange
final session = Session(
{CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": false})},
{AccountId(Id("1")): Account(AccountName("name"), true, false, {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({"subaddressingSupported": false})})},
{}, UserName(''), Uri(), Uri(), Uri(), Uri(), State(''));
// act
final subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(session, AccountId(Id("1")));
// assert
expect(subaddressingSupported, false);
});
test(
'should return false '
'when the server advertizes nothing',
() {
// arrange
final session = Session(
{CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({})},
{AccountId(Id("1")): Account(AccountName("name"), true, false, {CapabilityIdentifier.jmapTeamMailboxes: DefaultCapability({})})},
{}, UserName(''), Uri(), Uri(), Uri(), Uri(), State(''));
// act
final subaddressingSupported = MailboxWidgetMixin.isSubaddressingSupported(session, AccountId(Id("1")));
// assert
expect(subaddressingSupported, false);
});
});
}