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

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
@@ -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);
@@ -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,
);
}
}
}
@@ -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,