TF-3385 Fix move and delete emails not work properly
This commit is contained in:
@@ -7,7 +7,7 @@ class LoadingDeleteMultipleEmailsPermanentlyAll extends UIState {}
|
|||||||
|
|
||||||
class DeleteMultipleEmailsPermanentlyAllSuccess extends UIState {
|
class DeleteMultipleEmailsPermanentlyAllSuccess extends UIState {
|
||||||
|
|
||||||
List<EmailId> emailIds;
|
final List<EmailId> emailIds;
|
||||||
final MailboxId? mailboxId;
|
final MailboxId? mailboxId;
|
||||||
|
|
||||||
DeleteMultipleEmailsPermanentlyAllSuccess(this.emailIds, this.mailboxId);
|
DeleteMultipleEmailsPermanentlyAllSuccess(this.emailIds, this.mailboxId);
|
||||||
@@ -18,7 +18,7 @@ class DeleteMultipleEmailsPermanentlyAllSuccess extends UIState {
|
|||||||
|
|
||||||
class DeleteMultipleEmailsPermanentlyHasSomeEmailFailure extends UIState {
|
class DeleteMultipleEmailsPermanentlyHasSomeEmailFailure extends UIState {
|
||||||
|
|
||||||
List<EmailId> emailIds;
|
final List<EmailId> emailIds;
|
||||||
final MailboxId? mailboxId;
|
final MailboxId? mailboxId;
|
||||||
|
|
||||||
DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(this.emailIds, this.mailboxId);
|
DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(this.emailIds, this.mailboxId);
|
||||||
|
|||||||
+19
-8
@@ -253,6 +253,7 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
StreamSubscription? _pendingSharedFileInfoSubscription;
|
StreamSubscription? _pendingSharedFileInfoSubscription;
|
||||||
StreamSubscription? _receivingFileSharingStreamSubscription;
|
StreamSubscription? _receivingFileSharingStreamSubscription;
|
||||||
StreamSubscription? _currentEmailIdInNotificationIOSStreamSubscription;
|
StreamSubscription? _currentEmailIdInNotificationIOSStreamSubscription;
|
||||||
|
List<PresentationEmail> emailsToBeUndo = [];
|
||||||
|
|
||||||
final StreamController<Either<Failure, Success>> _progressStateController =
|
final StreamController<Either<Failure, Success>> _progressStateController =
|
||||||
StreamController<Either<Failure, Success>>.broadcast();
|
StreamController<Either<Failure, Success>>.broadcast();
|
||||||
@@ -836,12 +837,22 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
MoveToMailboxRequest moveRequest,
|
MoveToMailboxRequest moveRequest,
|
||||||
Map<EmailId, bool> emailIdsWithReadStatus,
|
Map<EmailId, bool> emailIdsWithReadStatus,
|
||||||
) {
|
) {
|
||||||
consumeState(_moveToMailboxInteractor.execute(
|
final currentMailboxes = moveRequest.currentMailboxes;
|
||||||
session,
|
if (currentMailboxes.length == 1 && currentMailboxes.values.first.length == 1) {
|
||||||
accountId,
|
consumeState(_moveToMailboxInteractor.execute(
|
||||||
moveRequest,
|
session,
|
||||||
emailIdsWithReadStatus,
|
accountId,
|
||||||
));
|
moveRequest,
|
||||||
|
emailIdsWithReadStatus,
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
consumeState(_moveMultipleEmailToMailboxInteractor.execute(
|
||||||
|
session,
|
||||||
|
accountId,
|
||||||
|
moveRequest,
|
||||||
|
emailIdsWithReadStatus,
|
||||||
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _moveToMailboxSuccess(MoveToMailboxSuccess success) {
|
void _moveToMailboxSuccess(MoveToMailboxSuccess success) {
|
||||||
@@ -873,12 +884,12 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
final currentAccountId = accountId.value;
|
final currentAccountId = accountId.value;
|
||||||
final session = sessionCurrent;
|
final session = sessionCurrent;
|
||||||
if (currentAccountId != null && session != null) {
|
if (currentAccountId != null && session != null) {
|
||||||
consumeState(_moveToMailboxInteractor.execute(
|
moveToMailbox(
|
||||||
session,
|
session,
|
||||||
currentAccountId,
|
currentAccountId,
|
||||||
newMoveRequest,
|
newMoveRequest,
|
||||||
emailIdsWithReadStatus,
|
emailIdsWithReadStatus,
|
||||||
));
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+14
-4
@@ -1,15 +1,15 @@
|
|||||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
import 'package:model/email/presentation_email.dart';
|
import 'package:model/email/presentation_email.dart';
|
||||||
|
import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||||
|
|
||||||
extension MoveEmailsToMailboxExtension on MailboxDashBoardController {
|
extension MoveEmailsToMailboxExtension on MailboxDashBoardController {
|
||||||
void handleMoveEmailsToMailbox({
|
void handleMoveEmailsToMailbox({
|
||||||
required Map<MailboxId,List<EmailId>> originalMailboxIdsWithEmailIds,
|
required Map<MailboxId,List<EmailId>> originalMailboxIdsWithEmailIds,
|
||||||
required MailboxId destinationMailboxId,
|
required MailboxId destinationMailboxId,
|
||||||
|
required MoveAction moveAction,
|
||||||
}) {
|
}) {
|
||||||
if (destinationMailboxId == selectedMailbox.value?.id) return;
|
|
||||||
|
|
||||||
final currentEmails = List<PresentationEmail>.from(
|
final currentEmails = List<PresentationEmail>.from(
|
||||||
emailsInCurrentMailbox,
|
emailsInCurrentMailbox,
|
||||||
);
|
);
|
||||||
@@ -20,7 +20,17 @@ extension MoveEmailsToMailboxExtension on MailboxDashBoardController {
|
|||||||
return emailIds;
|
return emailIds;
|
||||||
},
|
},
|
||||||
).toList();
|
).toList();
|
||||||
currentEmails.removeWhere((email) => movedEmailIds.contains(email.id));
|
final currentEmailsToBeMoved = currentEmails
|
||||||
updateEmailList(currentEmails);
|
.where((email) => movedEmailIds.contains(email.id))
|
||||||
|
.toList();
|
||||||
|
if (currentEmailsToBeMoved.isNotEmpty && destinationMailboxId != selectedMailbox.value?.id) {
|
||||||
|
emailsToBeUndo = currentEmailsToBeMoved;
|
||||||
|
currentEmails.removeWhere(currentEmailsToBeMoved.contains);
|
||||||
|
updateEmailList(currentEmails);
|
||||||
|
} else if (moveAction == MoveAction.undo && destinationMailboxId == selectedMailbox.value?.id) {
|
||||||
|
currentEmails.addAll(emailsToBeUndo);
|
||||||
|
currentEmails.sort((a, b) => b.receivedAt?.value.compareTo(a.receivedAt?.value ?? DateTime.now()) ?? -1);
|
||||||
|
updateEmailList(currentEmails);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+4
-3
@@ -18,13 +18,14 @@ extension UpdateEmailsWithNewMailboxIdExtension on MailboxDashBoardController {
|
|||||||
return emailIds;
|
return emailIds;
|
||||||
},
|
},
|
||||||
).toList();
|
).toList();
|
||||||
for (var email in currentEmails) {
|
for (int i = 0; i < currentEmails.length; i++) {
|
||||||
if (!movedEmailIds.contains(email.id)) continue;
|
if (!movedEmailIds.contains(currentEmails[i].id)) continue;
|
||||||
|
|
||||||
email = email.copyWith(
|
currentEmails[i] = currentEmails[i].copyWith(
|
||||||
mailboxIds: {destinationMailboxId: true},
|
mailboxIds: {destinationMailboxId: true},
|
||||||
mailboxContain: mapMailboxById[destinationMailboxId],
|
mailboxContain: mapMailboxById[destinationMailboxId],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
updateEmailList(currentEmails);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -265,6 +265,7 @@ class SearchEmailController extends BaseController
|
|||||||
);
|
);
|
||||||
|
|
||||||
ever(mailboxDashBoardController.viewState, (viewState) {
|
ever(mailboxDashBoardController.viewState, (viewState) {
|
||||||
|
if (!mailboxDashBoardController.searchController.isSearchEmailRunning) return;
|
||||||
final reactionState = viewState.getOrElse(() => UIState.idle);
|
final reactionState = viewState.getOrElse(() => UIState.idle);
|
||||||
if (reactionState is MoveToMailboxSuccess) {
|
if (reactionState is MoveToMailboxSuccess) {
|
||||||
mailboxDashBoardController.handleUpdateEmailsWithNewMailboxId(
|
mailboxDashBoardController.handleUpdateEmailsWithNewMailboxId(
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
|||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
|
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
|
||||||
|
import 'package:tmail_ui_user/features/email/domain/state/delete_email_permanently_state.dart';
|
||||||
|
import 'package:tmail_ui_user/features/email/domain/state/delete_multiple_emails_permanently_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/move_to_mailbox_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/move_to_mailbox_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
|
import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
|
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
|
||||||
@@ -338,6 +340,7 @@ class ThreadController extends BaseController with EmailActionController {
|
|||||||
});
|
});
|
||||||
|
|
||||||
ever(mailboxDashBoardController.viewState, (viewState) {
|
ever(mailboxDashBoardController.viewState, (viewState) {
|
||||||
|
if (mailboxDashBoardController.searchController.isSearchEmailRunning) return;
|
||||||
final reactionState = viewState.getOrElse(() => UIState.idle);
|
final reactionState = viewState.getOrElse(() => UIState.idle);
|
||||||
if (reactionState is MarkAsMailboxReadAllSuccess) {
|
if (reactionState is MarkAsMailboxReadAllSuccess) {
|
||||||
_handleMarkEmailsAsReadByMailboxId(reactionState.mailboxId);
|
_handleMarkEmailsAsReadByMailboxId(reactionState.mailboxId);
|
||||||
@@ -350,17 +353,30 @@ class ThreadController extends BaseController with EmailActionController {
|
|||||||
mailboxDashBoardController.handleMoveEmailsToMailbox(
|
mailboxDashBoardController.handleMoveEmailsToMailbox(
|
||||||
originalMailboxIdsWithEmailIds: reactionState.originalMailboxIdsWithEmailIds,
|
originalMailboxIdsWithEmailIds: reactionState.originalMailboxIdsWithEmailIds,
|
||||||
destinationMailboxId: reactionState.destinationMailboxId,
|
destinationMailboxId: reactionState.destinationMailboxId,
|
||||||
|
moveAction: reactionState.moveAction,
|
||||||
);
|
);
|
||||||
|
_checkIfCurrentMailboxCanLoadMore();
|
||||||
} else if (reactionState is MoveMultipleEmailToMailboxAllSuccess) {
|
} else if (reactionState is MoveMultipleEmailToMailboxAllSuccess) {
|
||||||
mailboxDashBoardController.handleMoveEmailsToMailbox(
|
mailboxDashBoardController.handleMoveEmailsToMailbox(
|
||||||
originalMailboxIdsWithEmailIds: reactionState.originalMailboxIdsWithEmailIds,
|
originalMailboxIdsWithEmailIds: reactionState.originalMailboxIdsWithEmailIds,
|
||||||
destinationMailboxId: reactionState.destinationMailboxId,
|
destinationMailboxId: reactionState.destinationMailboxId,
|
||||||
|
moveAction: reactionState.moveAction,
|
||||||
);
|
);
|
||||||
|
_checkIfCurrentMailboxCanLoadMore();
|
||||||
} else if (reactionState is MoveMultipleEmailToMailboxHasSomeEmailFailure) {
|
} else if (reactionState is MoveMultipleEmailToMailboxHasSomeEmailFailure) {
|
||||||
mailboxDashBoardController.handleMoveEmailsToMailbox(
|
mailboxDashBoardController.handleMoveEmailsToMailbox(
|
||||||
originalMailboxIdsWithEmailIds: reactionState.originalMailboxIdsWithMoveSucceededEmailIds,
|
originalMailboxIdsWithEmailIds: reactionState.originalMailboxIdsWithMoveSucceededEmailIds,
|
||||||
destinationMailboxId: reactionState.destinationMailboxId,
|
destinationMailboxId: reactionState.destinationMailboxId,
|
||||||
|
moveAction: reactionState.moveAction,
|
||||||
);
|
);
|
||||||
|
_checkIfCurrentMailboxCanLoadMore();
|
||||||
|
} else if (reactionState is DeleteEmailPermanentlySuccess
|
||||||
|
|| reactionState is DeleteMultipleEmailsPermanentlyAllSuccess
|
||||||
|
|| reactionState is DeleteMultipleEmailsPermanentlyHasSomeEmailFailure
|
||||||
|
) {
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
_checkIfCurrentMailboxCanLoadMore();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -376,6 +392,18 @@ class ThreadController extends BaseController with EmailActionController {
|
|||||||
mailboxDashBoardController.emailsInCurrentMailbox.refresh();
|
mailboxDashBoardController.emailsInCurrentMailbox.refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _checkIfCurrentMailboxCanLoadMore() {
|
||||||
|
final currentMailbox = mailboxDashBoardController.selectedMailbox.value;
|
||||||
|
if (currentMailbox == null) return;
|
||||||
|
|
||||||
|
final totalEmailsCount = currentMailbox.totalEmails?.value.value ?? 0;
|
||||||
|
if (totalEmailsCount == 0
|
||||||
|
|| mailboxDashBoardController.emailsInCurrentMailbox.isNotEmpty
|
||||||
|
) return;
|
||||||
|
|
||||||
|
dispatchState(Right(GetAllEmailLoading()));
|
||||||
|
}
|
||||||
|
|
||||||
void _registerBrowserResizeListener() {
|
void _registerBrowserResizeListener() {
|
||||||
_resizeBrowserStreamSubscription = html.window.onResize.listen((_) {
|
_resizeBrowserStreamSubscription = html.window.onResize.listen((_) {
|
||||||
_validateBrowserHeight();
|
_validateBrowserHeight();
|
||||||
|
|||||||
Reference in New Issue
Block a user