TF-3385 Update permanently delete emails
This commit is contained in:
@@ -1,9 +1,19 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
|
||||
class StartDeleteEmailPermanently extends UIState {}
|
||||
|
||||
class DeleteEmailPermanentlySuccess extends UIState {}
|
||||
class DeleteEmailPermanentlySuccess extends UIState {
|
||||
final EmailId emailId;
|
||||
final MailboxId? mailboxId;
|
||||
|
||||
DeleteEmailPermanentlySuccess(this.emailId, this.mailboxId);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [emailId, mailboxId];
|
||||
}
|
||||
|
||||
class DeleteEmailPermanentlyFailure extends FeatureFailure {
|
||||
|
||||
|
||||
@@ -1,27 +1,30 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
|
||||
class LoadingDeleteMultipleEmailsPermanentlyAll extends UIState {}
|
||||
|
||||
class DeleteMultipleEmailsPermanentlyAllSuccess extends UIState {
|
||||
|
||||
List<EmailId> emailIds;
|
||||
final MailboxId? mailboxId;
|
||||
|
||||
DeleteMultipleEmailsPermanentlyAllSuccess(this.emailIds);
|
||||
DeleteMultipleEmailsPermanentlyAllSuccess(this.emailIds, this.mailboxId);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [emailIds];
|
||||
List<Object?> get props => [emailIds, mailboxId];
|
||||
}
|
||||
|
||||
class DeleteMultipleEmailsPermanentlyHasSomeEmailFailure extends UIState {
|
||||
|
||||
List<EmailId> emailIds;
|
||||
final MailboxId? mailboxId;
|
||||
|
||||
DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(this.emailIds);
|
||||
DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(this.emailIds, this.mailboxId);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [emailIds];
|
||||
List<Object?> get props => [emailIds, mailboxId];
|
||||
}
|
||||
|
||||
class DeleteMultipleEmailsPermanentlyAllFailure extends FeatureFailure {}
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'package:dartz/dartz.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/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/delete_email_permanently_state.dart';
|
||||
|
||||
@@ -12,12 +13,17 @@ class DeleteEmailPermanentlyInteractor {
|
||||
|
||||
DeleteEmailPermanentlyInteractor(this._emailRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, EmailId emailId) async* {
|
||||
Stream<Either<Failure, Success>> execute(
|
||||
Session session,
|
||||
AccountId accountId,
|
||||
EmailId emailId,
|
||||
MailboxId? mailboxId,
|
||||
) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(StartDeleteEmailPermanently());
|
||||
final result = await _emailRepository.deleteEmailPermanently(session, accountId, emailId);
|
||||
if (result) {
|
||||
yield Right<Failure, Success>(DeleteEmailPermanentlySuccess());
|
||||
yield Right<Failure, Success>(DeleteEmailPermanentlySuccess(emailId, mailboxId));
|
||||
} else {
|
||||
yield Left<Failure, Success>(DeleteEmailPermanentlyFailure(null));
|
||||
}
|
||||
|
||||
+9
-3
@@ -4,6 +4,7 @@ import 'package:dartz/dartz.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/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/delete_multiple_emails_permanently_state.dart';
|
||||
|
||||
@@ -12,14 +13,19 @@ class DeleteMultipleEmailsPermanentlyInteractor {
|
||||
|
||||
DeleteMultipleEmailsPermanentlyInteractor(this._emailRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, List<EmailId> emailIds) async* {
|
||||
Stream<Either<Failure, Success>> execute(
|
||||
Session session,
|
||||
AccountId accountId,
|
||||
List<EmailId> emailIds,
|
||||
MailboxId? mailboxId,
|
||||
) async* {
|
||||
try {
|
||||
yield Right<Failure, Success>(LoadingDeleteMultipleEmailsPermanentlyAll());
|
||||
final listResult = await _emailRepository.deleteMultipleEmailsPermanently(session, accountId, emailIds);
|
||||
if (listResult.emailIdsSuccess.length == emailIds.length) {
|
||||
yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyAllSuccess(listResult.emailIdsSuccess));
|
||||
yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyAllSuccess(listResult.emailIdsSuccess, mailboxId));
|
||||
} else if (listResult.emailIdsSuccess.isNotEmpty) {
|
||||
yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(listResult.emailIdsSuccess));
|
||||
yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(listResult.emailIdsSuccess, mailboxId));
|
||||
} else {
|
||||
yield Left<Failure, Success>(DeleteMultipleEmailsPermanentlyAllFailure());
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ import 'package:tmail_ui_user/features/base/mixin/contact_support_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/mailbox_action_handler_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/state/save_email_as_drafts_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/move_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/get_restored_deleted_message_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
||||
@@ -322,6 +324,21 @@ class MailboxController extends BaseMailboxController
|
||||
affectedMailboxId: reactionState.draftMailboxId,
|
||||
totalEmailsChanged: -1,
|
||||
);
|
||||
} else if (reactionState is DeleteEmailPermanentlySuccess) {
|
||||
_handleDeleteEmailsFromMailbox(
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
totalEmailsChanged: -1,
|
||||
);
|
||||
} else if (reactionState is DeleteMultipleEmailsPermanentlyAllSuccess) {
|
||||
_handleDeleteEmailsFromMailbox(
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
totalEmailsChanged: -reactionState.emailIds.length,
|
||||
);
|
||||
} else if (reactionState is DeleteMultipleEmailsPermanentlyHasSomeEmailFailure) {
|
||||
_handleDeleteEmailsFromMailbox(
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
totalEmailsChanged: -reactionState.emailIds.length,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -359,6 +376,18 @@ class MailboxController extends BaseMailboxController
|
||||
);
|
||||
}
|
||||
|
||||
void _handleDeleteEmailsFromMailbox({
|
||||
required MailboxId? affectedMailboxId,
|
||||
required int totalEmailsChanged,
|
||||
}) {
|
||||
if (affectedMailboxId == null) return;
|
||||
|
||||
updateMailboxTotalEmailsCountById(
|
||||
affectedMailboxId,
|
||||
totalEmailsChanged,
|
||||
);
|
||||
}
|
||||
|
||||
void _initWebSocketQueueHandler() {
|
||||
_webSocketQueueHandler = WebSocketQueueHandler(
|
||||
processMessageCallback: _handleWebSocketMessage,
|
||||
|
||||
+8
-2
@@ -871,7 +871,12 @@ class MailboxDashBoardController extends ReloadableController
|
||||
final currentAccountId = accountId.value;
|
||||
final session = sessionCurrent;
|
||||
if (currentAccountId != null && session != null && email.id != null) {
|
||||
consumeState(_deleteEmailPermanentlyInteractor.execute(session, currentAccountId, email.id!));
|
||||
consumeState(_deleteEmailPermanentlyInteractor.execute(
|
||||
session,
|
||||
currentAccountId,
|
||||
email.id!,
|
||||
email.mailboxContain?.mailboxId,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1434,7 +1439,8 @@ class MailboxDashBoardController extends ReloadableController
|
||||
consumeState(_deleteMultipleEmailsPermanentlyInteractor.execute(
|
||||
sessionCurrent!,
|
||||
accountId.value!,
|
||||
listEmails.listEmailIds));
|
||||
listEmails.listEmailIds,
|
||||
listEmails.firstOrNull?.mailboxContain?.mailboxId));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||
|
||||
extension DeleteEmailsInMailboxExtension on MailboxDashBoardController {
|
||||
void handleDeleteEmailsInMailbox({
|
||||
required List<EmailId> emailIds,
|
||||
required MailboxId? affectedMailboxId,
|
||||
}) {
|
||||
if (selectedMailbox.value?.id != affectedMailboxId) {
|
||||
return;
|
||||
}
|
||||
|
||||
emailsInCurrentMailbox.removeWhere((email) => emailIds.contains(email.id));
|
||||
}
|
||||
}
|
||||
@@ -33,6 +33,8 @@ import 'package:tmail_ui_user/features/composer/presentation/extensions/prefix_e
|
||||
import 'package:tmail_ui_user/features/contact/presentation/model/contact_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.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/mark_as_email_read_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_star_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
|
||||
@@ -46,6 +48,7 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_all
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/quick_search_email_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/delete_emails_in_mailbox_extension.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/update_current_emails_flags_extension.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
|
||||
@@ -298,6 +301,21 @@ class SearchEmailController extends BaseController
|
||||
reactionState.successEmailIds,
|
||||
markStarAction: reactionState.markStarAction,
|
||||
);
|
||||
} else if (reactionState is DeleteEmailPermanentlySuccess) {
|
||||
mailboxDashBoardController.handleDeleteEmailsInMailbox(
|
||||
emailIds: [reactionState.emailId],
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
);
|
||||
} else if (reactionState is DeleteMultipleEmailsPermanentlyAllSuccess) {
|
||||
mailboxDashBoardController.handleDeleteEmailsInMailbox(
|
||||
emailIds: reactionState.emailIds,
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
);
|
||||
} else if (reactionState is DeleteMultipleEmailsPermanentlyHasSomeEmailFailure) {
|
||||
mailboxDashBoardController.handleDeleteEmailsInMailbox(
|
||||
emailIds: reactionState.emailIds,
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -20,6 +20,8 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:model/model.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/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/mark_as_email_read_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_star_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
|
||||
@@ -28,6 +30,7 @@ import 'package:tmail_ui_user/features/home/data/exceptions/session_exceptions.d
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/search_controller.dart' as search;
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/delete_emails_in_mailbox_extension.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/update_current_emails_flags_extension.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
|
||||
@@ -377,6 +380,21 @@ class ThreadController extends BaseController with EmailActionController {
|
||||
reactionState.successEmailIds,
|
||||
markStarAction: reactionState.markStarAction,
|
||||
);
|
||||
} else if (reactionState is DeleteEmailPermanentlySuccess) {
|
||||
mailboxDashBoardController.handleDeleteEmailsInMailbox(
|
||||
emailIds: [reactionState.emailId],
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
);
|
||||
} else if (reactionState is DeleteMultipleEmailsPermanentlyAllSuccess) {
|
||||
mailboxDashBoardController.handleDeleteEmailsInMailbox(
|
||||
emailIds: reactionState.emailIds,
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
);
|
||||
} else if (reactionState is DeleteMultipleEmailsPermanentlyHasSomeEmailFailure) {
|
||||
mailboxDashBoardController.handleDeleteEmailsInMailbox(
|
||||
emailIds: reactionState.emailIds,
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user