TF-4392 [Team Mailbox] Empty the team mailbox trash
This commit is contained in:
@@ -68,10 +68,7 @@ mixin MailboxActionHandlerMixin {
|
||||
..onConfirmAction(AppLocalizations.of(context).delete, () {
|
||||
popBack();
|
||||
if (mailbox.countTotalEmails > 0) {
|
||||
dashboardController.emptyTrashFolderAction(
|
||||
trashFolderId: mailbox.id,
|
||||
totalEmails: mailbox.countTotalEmails
|
||||
);
|
||||
dashboardController.emptyTrashFolderAction(trashMailbox: mailbox);
|
||||
} else {
|
||||
appToast.showToastWarningMessage(
|
||||
context,
|
||||
@@ -92,10 +89,7 @@ mixin MailboxActionHandlerMixin {
|
||||
onConfirmAction: () {
|
||||
popBack();
|
||||
if (mailbox.countTotalEmails > 0) {
|
||||
dashboardController.emptyTrashFolderAction(
|
||||
trashFolderId: mailbox.id,
|
||||
totalEmails: mailbox.countTotalEmails
|
||||
);
|
||||
dashboardController.emptyTrashFolderAction(trashMailbox: mailbox);
|
||||
} else {
|
||||
appToast.showToastWarningMessage(
|
||||
context,
|
||||
|
||||
@@ -1600,8 +1600,7 @@ class MailboxController extends BaseMailboxController
|
||||
log('MailboxController::emptyMailboxAction:presentationMailbox: ${presentationMailbox.name}');
|
||||
if (presentationMailbox.isTrash) {
|
||||
mailboxDashBoardController.emptyTrashFolderAction(
|
||||
trashFolderId: presentationMailbox.id,
|
||||
totalEmails: presentationMailbox.countTotalEmails
|
||||
trashMailbox: presentationMailbox,
|
||||
);
|
||||
} else if (presentationMailbox.isSpam) {
|
||||
mailboxDashBoardController.emptySpamFolderAction(
|
||||
|
||||
@@ -93,7 +93,9 @@ mixin MailboxWidgetMixin {
|
||||
if (mailbox.isSubscribedMailbox)
|
||||
MailboxActions.disableMailbox
|
||||
else
|
||||
MailboxActions.enableMailbox
|
||||
MailboxActions.enableMailbox,
|
||||
if (mailbox.isTrash && mailbox.myRights?.mayRemoveItems == true)
|
||||
MailboxActions.emptyTrash,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
+16
-15
@@ -1841,41 +1841,40 @@ class MailboxDashBoardController extends ReloadableController
|
||||
|
||||
void emptyTrashFolderAction({
|
||||
Function? onCancelSelectionEmail,
|
||||
MailboxId? trashFolderId,
|
||||
int totalEmails = 0,
|
||||
PresentationMailbox? trashMailbox,
|
||||
}) {
|
||||
onCancelSelectionEmail?.call();
|
||||
|
||||
final trashMailboxId = trashFolderId ?? mapDefaultMailboxIdByRole[PresentationMailbox.roleTrash];
|
||||
final trashFolder = trashMailbox
|
||||
?? (selectedMailbox.value?.isTrash == true ? selectedMailbox.value : null)
|
||||
?? mapMailboxById[mapDefaultMailboxIdByRole[PresentationMailbox.roleTrash]];
|
||||
final accountId = this.accountId.value;
|
||||
final session = sessionCurrent;
|
||||
|
||||
if (accountId == null || sessionCurrent == null) {
|
||||
if (accountId == null || session == null) {
|
||||
consumeState(Stream.value(Left(EmptyTrashFolderFailure(NotFoundSessionException()))));
|
||||
return;
|
||||
}
|
||||
|
||||
if (trashMailboxId == null) {
|
||||
if (trashFolder == null) {
|
||||
consumeState(Stream.value(Left(EmptyTrashFolderFailure(NotFoundMailboxException()))));
|
||||
return;
|
||||
}
|
||||
|
||||
if (CapabilityIdentifier.jmapMailboxClear.isSupported(sessionCurrent!, accountId)) {
|
||||
if (CapabilityIdentifier.jmapMailboxClear.isSupported(session, accountId) &&
|
||||
trashFolder.isTrashTeamMailbox != true) {
|
||||
clearMailbox(
|
||||
sessionCurrent!,
|
||||
session,
|
||||
accountId,
|
||||
trashMailboxId,
|
||||
trashFolder.id,
|
||||
PresentationMailbox.roleTrash,
|
||||
);
|
||||
} else {
|
||||
final totalEmailsInTrash = totalEmails == 0
|
||||
? mapMailboxById[trashMailboxId]?.countTotalEmails ?? 0
|
||||
: totalEmails;
|
||||
|
||||
consumeState(_emptyTrashFolderInteractor.execute(
|
||||
sessionCurrent!,
|
||||
session,
|
||||
accountId,
|
||||
trashMailboxId,
|
||||
totalEmailsInTrash,
|
||||
trashFolder.id,
|
||||
trashFolder.countTotalEmails,
|
||||
progressStateController,
|
||||
));
|
||||
}
|
||||
@@ -2406,6 +2405,7 @@ class MailboxDashBoardController extends ReloadableController
|
||||
) {
|
||||
return mailbox != null &&
|
||||
mailbox.isTrash &&
|
||||
mailbox.myRights?.mayRemoveItems == true &&
|
||||
mailbox.countTotalEmails > 0 &&
|
||||
!searchController.isSearchActive() &&
|
||||
responsiveUtils.isWebDesktop(context);
|
||||
@@ -2417,6 +2417,7 @@ class MailboxDashBoardController extends ReloadableController
|
||||
) {
|
||||
return mailbox != null &&
|
||||
mailbox.isTrash &&
|
||||
mailbox.myRights?.mayRemoveItems == true &&
|
||||
mailbox.countTotalEmails > 0 &&
|
||||
!searchController.isSearchActive() &&
|
||||
!responsiveUtils.isWebDesktop(context);
|
||||
|
||||
@@ -44,12 +44,15 @@ extension PresentationMailboxExtension on PresentationMailbox {
|
||||
if (isPersonal) {
|
||||
return role == PresentationMailbox.roleTrash;
|
||||
} else {
|
||||
return isChildOfTeamMailboxes &&
|
||||
name?.name.toLowerCase() ==
|
||||
PresentationMailbox.trashRole.toLowerCase();
|
||||
return isTrashTeamMailbox;
|
||||
}
|
||||
}
|
||||
|
||||
bool get isTrashTeamMailbox {
|
||||
return isChildOfTeamMailboxes &&
|
||||
name?.name.toLowerCase() == PresentationMailbox.trashRole.toLowerCase();
|
||||
}
|
||||
|
||||
bool get isDrafts => role == PresentationMailbox.roleDrafts;
|
||||
|
||||
bool get isTemplates => role == PresentationMailbox.roleTemplates;
|
||||
|
||||
Reference in New Issue
Block a user