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

TF-4392 [Team Mailbox] Hide Recover deleted messages and Archive message in team mailbox

Browse Source
This commit is contained in:
dab246
2026-04-01 14:48:54 +07:00
committed by Dat H. Pham
parent a4bea6524b
commit 7cc9cd82fa
16 changed files with 165 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/email/presentation/controller/single_email_controller.dart
+8
View File
@@ -778,6 +778,14 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
return;
}
final emailId = email.id;
if (emailId == null) {
mailboxDashBoardController.emitMoveToTrashFailure(
NotFoundEmailIdException(),
);
return;
}
final moveActionRequest = emailActionReactor.buildMoveToTrashRequest(
email,
trashMailboxId: trashId,
lib/features/mailbox/domain/exceptions/mailbox_exception.dart
+8 -1
View File
@@ -40,4 +40,11 @@ class NotFoundTrashMailboxException extends AppBaseException {
@override
String get exceptionName => 'NotFoundTrashMailboxException';
}
}
class NotFoundEmailIdException extends AppBaseException {
NotFoundEmailIdException([super.message]);
@override
String get exceptionName => 'NotFoundEmailIdException';
}
lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart
+4 -4
View File
@@ -87,20 +87,20 @@ mixin MailboxWidgetMixin {
return [
if (PlatformInfo.isWeb && mailbox.isSubscribedMailbox)
MailboxActions.openInNewTab,
if (mailbox.myRights?.mayCreateChild == true)
if (mailbox.myRights?.mayCreateChild != false)
MailboxActions.newSubfolder,
if (mailbox.countUnReadEmailsAsString.isNotEmpty)
MailboxActions.markAsRead,
if (mailbox.myRights?.mayRename == true)
if (mailbox.myRights?.mayRename != false)
MailboxActions.rename,
if (mailbox.isTeamMailboxes)
if (mailbox.isSubscribedMailbox)
MailboxActions.disableMailbox
else
MailboxActions.enableMailbox,
if (mailbox.isTrash && mailbox.myRights?.mayRemoveItems == true)
if (mailbox.isTrash && mailbox.myRights?.mayRemoveItems != false)
MailboxActions.emptyTrash,
if (mailbox.myRights?.mayDelete == true)
if (mailbox.myRights?.mayDelete != false)
MailboxActions.delete,
];
}
lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+3 -5
View File
@@ -1864,7 +1864,7 @@ class MailboxDashBoardController extends ReloadableController
}
if (CapabilityIdentifier.jmapMailboxClear.isSupported(session, accountId) &&
trashFolder.isTrashTeamMailbox != true) {
!trashFolder.isFirstLevelTeamSystemFolder(mapMailboxById, PresentationMailbox.trashRole)) {
clearMailbox(
session,
accountId,
@@ -2406,8 +2406,7 @@ class MailboxDashBoardController extends ReloadableController
PresentationMailbox? mailbox
) {
return mailbox != null &&
mailbox.isTrash &&
mailbox.myRights?.mayRemoveItems == true &&
(mailbox.isTrash || (mailbox.isTrashTeamMailbox && mailbox.myRights?.mayRemoveItems != false)) &&
mailbox.countTotalEmails > 0 &&
!searchController.isSearchActive() &&
responsiveUtils.isWebDesktop(context);
@@ -2418,8 +2417,7 @@ class MailboxDashBoardController extends ReloadableController
PresentationMailbox? mailbox
) {
return mailbox != null &&
mailbox.isTrash &&
mailbox.myRights?.mayRemoveItems == true &&
(mailbox.isTrash || (mailbox.isTrashTeamMailbox && mailbox.myRights?.mayRemoveItems != false)) &&
mailbox.countTotalEmails > 0 &&
!searchController.isSearchActive() &&
!responsiveUtils.isWebDesktop(context);
lib/features/mailbox_dashboard/presentation/extensions/handle_action_type_for_email_selection.dart
+82 -2
View File
@@ -23,6 +23,17 @@ extension HandleActionTypeForEmailSelection on MailboxDashBoardController {
EmailActionType actionType,
{MailboxId? selectedMailboxId, String? destinationFolderPath}
) {
final isInSearchOrVirtualFolder =
searchController.isSearchEmailRunning ||
selectedMailbox.value?.isVirtualFolder == true;
// In search / virtual-folder mode the selected mailbox does not represent
// the emails' actual home namespace, so trash must be resolved per email.
if (actionType == EmailActionType.moveToTrash && isInSearchOrVirtualFolder) {
_moveEmailsToTrashAcrossNamespaces(emails);
return;
}
MailboxId? destinationMailboxId;
if (actionType == EmailActionType.moveToMailbox) {
@@ -58,8 +69,7 @@ extension HandleActionTypeForEmailSelection on MailboxDashBoardController {
final mapEmailIdsByMailboxId = <MailboxId, List<EmailId>>{};
if (searchController.isSearchEmailRunning ||
selectedMailbox.value?.isVirtualFolder == true) {
if (isInSearchOrVirtualFolder) {
for (final email in emails) {
final mailboxId = email.firstMailboxIdAvailable;
final emailId = email.id;
@@ -115,4 +125,74 @@ extension HandleActionTypeForEmailSelection on MailboxDashBoardController {
emailIdsWithReadStatus,
);
}
void _moveEmailsToTrashAcrossNamespaces(List<PresentationEmail> emails) {
if (accountId.value == null || sessionCurrent == null) {
consumeState(Stream.value(Left(MoveMultipleEmailToMailboxFailure(
EmailActionType.moveToTrash,
MoveAction.moving,
ParametersIsNullException(),
))));
return;
}
// Group emails by resolved trash destination: trashId → (path, sourceId → [emailIds])
final groups = <MailboxId,
({String? trashPath, Map<MailboxId, List<EmailId>> sourceToEmails})>{};
for (final email in emails) {
final sourceMailboxId = email.firstMailboxIdAvailable;
final emailId = email.id;
if (sourceMailboxId == null || emailId == null) continue;
final sourceMailbox = mapMailboxById[sourceMailboxId];
if (sourceMailbox == null) continue;
final (:trashId, :trashPath) = getTrashMailboxIdAndPath(sourceMailbox);
if (trashId == null || sourceMailboxId == trashId) continue;
groups
.putIfAbsent(trashId, () => (trashPath: trashPath, sourceToEmails: {}))
.sourceToEmails
.putIfAbsent(sourceMailboxId, () => [])
.add(emailId);
}
if (groups.isEmpty) {
consumeState(Stream.value(Left(MoveMultipleEmailToMailboxFailure(
EmailActionType.moveToTrash,
MoveAction.moving,
ParametersIsNullException(),
))));
return;
}
final emailIdsWithReadStatus = Map.fromEntries(
emails
.where((e) => e.id != null)
.map((e) => MapEntry(e.id!, e.hasRead)),
);
for (final entry in groups.entries) {
final trashId = entry.key;
final resolvedPath = entry.value.trashPath ??
(currentContext != null
? mapMailboxById[trashId]?.getDisplayName(currentContext!)
: null);
log('$runtimeType::_moveEmailsToTrashAcrossNamespaces: trashId=$trashId sources=${entry.value.sourceToEmails.keys}');
moveSelectedEmailMultipleToMailboxAction(
sessionCurrent!,
accountId.value!,
MoveToMailboxRequest(
entry.value.sourceToEmails,
trashId,
MoveAction.moving,
EmailActionType.moveToTrash,
destinationPath: resolvedPath,
),
emailIdsWithReadStatus,
);
}
}
}
lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+1 -1
View File
@@ -506,7 +506,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
}
}),
Obx(() {
if (controller.selectedMailbox.value?.isTrash == true) {
if (controller.selectedMailbox.value?.isTrashPersonal == true) {
return TMailButtonWidget.fromIcon(
key: const Key('recover_deleted_messages_button'),
icon: controller.imagePaths.icRecoverDeletedMessages,
lib/features/thread/presentation/extensions/handle_press_email_selection_action.dart
+2 -1
View File
@@ -48,7 +48,8 @@ extension HandlePressEmailSelectionActionExtension on ThreadController {
EmailSelectionActionType.markAsNotSpam
else
EmailSelectionActionType.markAsSpam,
if (selectedMailbox?.isArchive != true)
if (selectedMailbox?.isArchive != true &&
selectedMailbox?.isChildOfTeamMailboxes != true)
EmailSelectionActionType.archiveMessage,
if (selectedMailbox?.isDeletePermanentlyEnabled == true)
EmailSelectionActionType.deletePermanently,
lib/features/thread/presentation/mixin/email_action_controller.dart
+10 -2
View File
@@ -107,17 +107,25 @@ mixin EmailActionController {
return;
}
final emailId = email.id;
if (emailId == null) {
mailboxDashBoardController.emitMoveToTrashFailure(
NotFoundEmailIdException(),
);
return;
}
_moveToTrashAction(
session,
accountId,
MoveToMailboxRequest(
{mailboxContain.id: email.id != null ? [email.id!] : []},
{mailboxContain.id: [emailId]},
trashId,
MoveAction.moving,
EmailActionType.moveToTrash,
destinationPath: trashPath,
),
email.id != null ? {email.id!: email.hasRead} : {},
{emailId: email.hasRead},
);
}
lib/features/thread/presentation/mixin/email_more_action_context_menu_mixin.dart
+1 -1
View File
@@ -78,7 +78,7 @@ mixin EmailMoreActionContextMenu on LabelSubMenuMixin {
if (PlatformInfo.isWeb) EmailActionType.openInNewTab,
if (!isDrafts && !isChildOfTeam)
isSpam ? EmailActionType.unSpam : EmailActionType.moveToSpam,
if (!isArchive) EmailActionType.archiveMessage,
if (!isArchive && !isChildOfTeam) EmailActionType.archiveMessage,
if (!isDrafts && !isTemplates) EmailActionType.editAsNewEmail,
];
}
lib/features/thread/presentation/thread_controller.dart
+5 -3
View File
@@ -1563,9 +1563,11 @@ class ThreadController extends BaseController with EmailActionController {
return DismissDirection.none;
}
return isInArchiveMailbox(email) || !hasArchiveMailbox()
? DismissDirection.startToEnd
: DismissDirection.horizontal;
return isInArchiveMailbox(email) ||
!hasArchiveMailbox() ||
email.mailboxContain?.isChildOfTeamMailboxes == true
? DismissDirection.startToEnd
: DismissDirection.horizontal;
}
bool isInArchiveMailbox(PresentationEmail email) => email.mailboxContain?.isArchive == true;
lib/features/thread_detail/presentation/extension/get_thread_detail_action_status.dart
+13 -6
View File
@@ -1,5 +1,6 @@
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/extensions/presentation_mailbox_extension.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/thread_detail/presentation/thread_detail_controller.dart';
@@ -26,16 +27,22 @@ extension GetThreadDetailActionStatus on ThreadDetailController {
}
bool get threadDetailIsArchived {
final archiveMailboxId = getMailboxIdByRole(
PresentationMailbox.roleArchive,
);
final archiveMailboxId = getMailboxIdByRole(PresentationMailbox.roleArchive);
return emailsInThreadDetailInfo.every(
(email) {
return email.mailboxIds?[archiveMailboxId] == true;
},
(email) => email.mailboxIds?[archiveMailboxId] == true,
);
}
bool get threadDetailIsTeamMailbox {
return emailsInThreadDetailInfo.any((email) {
final mailboxId = email.mailboxIdContain;
if (mailboxId == null) return false;
return mailboxDashBoardController.mapMailboxById[mailboxId]
?.isChildOfTeamMailboxes ==
true;
});
}
bool get threadDetailIsSpam {
final spamMailboxId =
getMailboxIdByRole(PresentationMailbox.roleJunk) ??
lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
+1 -1
View File
@@ -147,7 +147,7 @@ extension OnThreadDetailActionClick on ThreadDetailController {
if (mailboxDashBoardController.isLabelAvailable &&
mailboxDashBoardController.labelController.labels.isNotEmpty)
EmailActionType.labelAs,
if (!threadDetailIsArchived) EmailActionType.archiveMessage,
if (!threadDetailIsArchived && !threadDetailIsTeamMailbox) EmailActionType.archiveMessage,
threadDetailIsSpam ? EmailActionType.unSpam : EmailActionType.moveToSpam,
threadDetailIsTrashed
? EmailActionType.deletePermanently