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

[bugfix] TF-2316 Can not delete folder when its children are hidden (#2519)

Browse Source
This commit is contained in:
Bùi Trung Hiếu
2026-04-06 13:18:34 +07:00
committed by GitHub
parent 7cf61ac2f0
commit ea7b9fed33
7 changed files with 785 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox/presentation/mailbox_controller.dart
+2 -11
View File
@@ -79,7 +79,6 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.d
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/open_mailbox_view_event.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_action_reactor.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
import 'package:tmail_ui_user/features/mailbox_creator/domain/usecases/verify_name_interactor.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/mailbox_creator_arguments.dart';
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/new_mailbox_arguments.dart';
@@ -565,7 +564,7 @@ class MailboxController extends BaseMailboxController
consumeState(Stream.value(Left(GetAllMailboxFailure(NotFoundSessionException()))));
}
}
void _refreshMailboxChanges({required jmap.State newState}) {
log('MailboxController::_refreshMailboxChanges():newState: $newState');
if (accountId == null ||
@@ -1039,18 +1038,10 @@ class MailboxController extends BaseMailboxController
void _deleteMailboxAction(PresentationMailbox presentationMailbox) {
if (session != null && accountId != null) {
final tupleMap = MailboxUtils.generateMapDescendantIdsAndMailboxIdList(
[presentationMailbox],
defaultMailboxTree.value,
personalMailboxTree.value);
final mapDescendantIds = tupleMap.value1;
final listMailboxId = tupleMap.value2;
consumeState(_deleteMultipleMailboxInteractor.execute(
session!,
accountId!,
mapDescendantIds,
listMailboxId,
[presentationMailbox.id],
));
} else {
_deleteMailboxFailure(DeleteMultipleMailboxFailure(null));
lib/features/mailbox/presentation/utils/mailbox_utils.dart
-51
View File
@@ -1,60 +1,9 @@
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/utils/app_logger.dart';
import 'package:dartz/dartz.dart';
import 'package:email_recovery/email_recovery/capability_deleted_messages_vault.dart';
import 'package:flutter/material.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/extensions/list_mailbox_node_extension.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart';
import 'package:tmail_ui_user/main/error/capability_validator.dart';
class MailboxUtils {
static Tuple2<Map<MailboxId, List<MailboxId>>, List<MailboxId>> generateMapDescendantIdsAndMailboxIdList(
List<PresentationMailbox> selectedMailboxList,
MailboxTree defaultMailboxTree,
MailboxTree folderMailboxTree,
) {
Map<MailboxId, List<MailboxId>> mapDescendantIds = {};
List<MailboxId> allMailboxIds = [];
for (var mailbox in selectedMailboxList) {
final currentMailboxId = mailbox.id;
if (allMailboxIds.contains(currentMailboxId)) {
continue;
} else {
final matchedNode = defaultMailboxTree.findNode((node) => node.item.id == currentMailboxId)
?? folderMailboxTree.findNode((node) => node.item.id == currentMailboxId);
if (matchedNode != null) {
final descendantIds = matchedNode.descendantsAsList().mailboxIds;
final descendantIdsReversed = descendantIds.reversed.toList();
mapDescendantIds[currentMailboxId] = descendantIdsReversed;
allMailboxIds.addAll(descendantIdsReversed);
}
}
}
log('MailboxUtils::generateMapDescendantIdsAndMailboxIdList(): mapDescendantIds: $mapDescendantIds');
return Tuple2(mapDescendantIds, allMailboxIds);
}
static EdgeInsets getPaddingListViewMailboxSearched(BuildContext context, ResponsiveUtils responsiveUtils) {
if (responsiveUtils.isWebDesktop(context)) {
return const EdgeInsets.only(left: 16, right: 16, bottom: 16);
} else {
if (responsiveUtils.isScreenWithShortestSide(context)) {
return const EdgeInsets.all(16);
} else {
return const EdgeInsets.symmetric(horizontal: 32, vertical: 16);
}
}
}
static bool isDeletedMessageVaultSupported(Session? session, AccountId? accountId) {
if (session == null || accountId == null) {
return false;