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

TF-80 Move multiple email to mailbox from thread view

Browse Source
This commit is contained in:
dab246
2021-09-21 12:52:27 +07:00
committed by Dat H. Pham
parent 24e52dc6a4
commit a12efc8d2b
43 changed files with 1007 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/email/data/datasource/email_datasource.dart
+2 -2
View File
@@ -11,7 +11,7 @@ abstract class EmailDataSource {
Future<bool> sendEmail(AccountId accountId, EmailRequest emailRequest);
Future<bool> markAsRead(AccountId accountId, EmailId emailId, ReadActions readActions);
Future<List<Email>> markAsRead(AccountId accountId, List<Email> emails, ReadActions readActions);
Future<List<DownloadTaskId>> downloadAttachments(
List<Attachment> attachments,
@@ -28,5 +28,5 @@ abstract class EmailDataSource {
CancelToken cancelToken
);
Future<bool> moveToMailbox(AccountId accountId, MoveRequest moveRequest);
Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveRequest moveRequest);
}
lib/features/email/data/datasource_impl/email_datasource_impl.dart
+3 -3
View File
@@ -32,9 +32,9 @@ class EmailDataSourceImpl extends EmailDataSource {
}
@override
Future<bool> markAsRead(AccountId accountId, EmailId emailId, ReadActions readActions) {
Future<List<Email>> markAsRead(AccountId accountId, List<Email> emails, ReadActions readActions) {
return Future.sync(() async {
return await emailAPI.markAsRead(accountId, emailId, readActions);
return await emailAPI.markAsRead(accountId, emails, readActions);
}).catchError((error) {
throw error;
});
@@ -70,7 +70,7 @@ class EmailDataSourceImpl extends EmailDataSource {
}
@override
Future<bool> moveToMailbox(AccountId accountId, MoveRequest moveRequest) {
Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveRequest moveRequest) {
return Future.sync(() async {
return await emailAPI.moveToMailbox(accountId, moveRequest);
}).catchError((error) {
lib/features/email/data/network/email_api.dart
+22 -18
View File
@@ -15,7 +15,6 @@ import 'package:jmap_dart_client/jmap/jmap_request.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_method.dart';
import 'package:jmap_dart_client/jmap/mail/email/get/get_email_response.dart';
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
import 'package:jmap_dart_client/jmap/mail/email/set/set_email_method.dart';
import 'package:jmap_dart_client/jmap/mail/email/set/set_email_response.dart';
import 'package:jmap_dart_client/jmap/mail/email/submission/address.dart';
@@ -113,28 +112,33 @@ class EmailAPI {
});
}
Future<bool> markAsRead(AccountId accountId, EmailId emailId, ReadActions readAction) async {
Future<List<Email>> markAsRead(AccountId accountId, List<Email> emails, ReadActions readActions) async {
final emailIds = emails.map((email) => email.id).toList();
final setEmailMethod = SetEmailMethod(accountId)
..addUpdates({
emailId.id: KeyWordIdentifier.emailSeen.generateReadActionPath(readAction)
});
..addUpdates(emailIds.generateMapUpdateObjectMarkAsRead(readActions));
final getEmailMethod = GetEmailMethod(accountId)
..addIds(emailIds.toIds().toSet())
..addProperties(Properties({'keywords'}));
final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
final setEmailInvocation = requestBuilder.invocation(setEmailMethod);
requestBuilder.invocation(setEmailMethod);
final getEmailInvocation = requestBuilder.invocation(getEmailMethod);
final response = await (requestBuilder
..usings(setEmailMethod.requiredCapabilities))
.build()
.execute();
final setEmailResponse = response.parse<SetEmailResponse>(
setEmailInvocation.methodCallId,
SetEmailResponse.deserialize);
final getEmailResponse = response.parse<GetEmailResponse>(
getEmailInvocation.methodCallId,
GetEmailResponse.deserialize);
return Future.sync(() async {
final emailUpdated = setEmailResponse!.updated![emailId.id];
return emailUpdated == null;
return getEmailResponse!.list;
}).catchError((error) {
throw error;
});
@@ -188,12 +192,10 @@ class EmailAPI {
cancelToken: cancelToken);
}
Future<bool> moveToMailbox(AccountId accountId, MoveRequest moveRequest) async {
Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveRequest moveRequest) async {
final setEmailMethod = SetEmailMethod(accountId)
..addUpdates({
moveRequest.emailId.id: moveRequest.currentMailboxId
.generateMoveToMailboxActionPath(moveRequest.destinationMailboxId)
});
..addUpdates(moveRequest.emailIds
.generateMapUpdateObjectMoveToMailbox(moveRequest.currentMailboxId, moveRequest.destinationMailboxId));
final requestBuilder = JmapRequestBuilder(_httpClient, ProcessingInvocation());
@@ -209,8 +211,10 @@ class EmailAPI {
SetEmailResponse.deserialize);
return Future.sync(() async {
final emailUpdated = setEmailResponse!.updated![moveRequest.emailId.id];
return emailUpdated == null;
final mapUpdated = setEmailResponse!.updated!;
return moveRequest.emailIds
.where((emailId) => mapUpdated.containsKey(emailId.id))
.toList();
}).catchError((error) {
throw error;
});
lib/features/email/data/repository/email_repository_impl.dart
+3 -3
View File
@@ -25,8 +25,8 @@ class EmailRepositoryImpl extends EmailRepository {
}
@override
Future<bool> markAsRead(AccountId accountId, EmailId emailId, ReadActions readAction) {
return emailDataSource.markAsRead(accountId, emailId, readAction);
Future<List<Email>> markAsRead(AccountId accountId, List<Email> emails, ReadActions readActions) {
return emailDataSource.markAsRead(accountId, emails, readActions);
}
@override
@@ -56,7 +56,7 @@ class EmailRepositoryImpl extends EmailRepository {
}
@override
Future<bool> moveToMailbox(AccountId accountId, MoveRequest moveRequest) {
Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveRequest moveRequest) {
return emailDataSource.moveToMailbox(accountId, moveRequest);
}
}
lib/features/email/domain/model/move_request.dart
+9 -10
View File
@@ -6,29 +6,28 @@ import 'package:model/model.dart';
class MoveRequest with EquatableMixin {
final EmailId emailId;
final List<EmailId> emailIds;
final MailboxId currentMailboxId;
final MailboxName currentMailboxName;
final MailboxId destinationMailboxId;
final MailboxName destinationMailboxName;
final MoveAction moveAction;
final String? destinationPath;
MoveRequest(
this.emailId,
this.emailIds,
this.currentMailboxId,
this.currentMailboxName,
this.destinationMailboxId,
this.destinationMailboxName,
this.moveAction,
{
this.destinationPath,
}
);
@override
List<Object?> get props => [
emailId,
emailIds,
currentMailboxId,
currentMailboxName,
destinationMailboxId,
destinationMailboxName,
moveAction
moveAction,
destinationPath,
];
}
lib/features/email/domain/repository/email_repository.dart
+2 -2
View File
@@ -10,7 +10,7 @@ abstract class EmailRepository {
Future<bool> sendEmail(AccountId accountId, EmailRequest emailRequest);
Future<bool> markAsRead(AccountId accountId, EmailId emailId, ReadActions readAction);
Future<List<Email>> markAsRead(AccountId accountId, List<Email> emails, ReadActions readActions);
Future<List<DownloadTaskId>> downloadAttachments(
List<Attachment> attachments,
@@ -27,5 +27,5 @@ abstract class EmailRepository {
CancelToken cancelToken
);
Future<bool> moveToMailbox(AccountId accountId, MoveRequest moveRequest);
Future<List<EmailId>> moveToMailbox(AccountId accountId, MoveRequest moveRequest);
}
lib/features/email/domain/state/mark_as_email_read_state.dart
+4 -3
View File
@@ -1,15 +1,16 @@
import 'package:core/core.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/email/read_actions.dart';
import 'package:model/model.dart';
class MarkAsEmailReadSuccess extends UIState {
final EmailId emailId;
final Email updatedEmail;
final ReadActions readActions;
MarkAsEmailReadSuccess(this.emailId, this.readActions);
MarkAsEmailReadSuccess(this.updatedEmail, this.readActions);
@override
List<Object?> get props => [emailId, readActions];
List<Object?> get props => [updatedEmail, readActions];
}
class MarkAsEmailReadFailure extends FeatureFailure {
lib/features/email/domain/state/move_to_mailbox_state.dart
+20 -4
View File
@@ -1,13 +1,29 @@
import 'package:core/core.dart';
import 'package:tmail_ui_user/features/email/domain/model/move_request.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/model.dart';
class MoveToMailboxSuccess extends UIState {
final MoveRequest moveRequest;
final EmailId emailId;
final MailboxId currentMailboxId;
final MailboxId destinationMailboxId;
final MoveAction moveAction;
final String? destinationPath;
MoveToMailboxSuccess(this.moveRequest);
MoveToMailboxSuccess(
this.emailId,
this.currentMailboxId,
this.destinationMailboxId,
this.moveAction,
this.destinationPath);
@override
List<Object?> get props => [moveRequest];
List<Object?> get props => [
emailId,
currentMailboxId,
destinationMailboxId,
moveAction,
destinationPath];
}
class MoveToMailboxFailure extends FeatureFailure {
lib/features/email/domain/usecases/mark_as_email_read_interactor.dart
+11 -6
View File
@@ -2,19 +2,24 @@ import 'package:core/core.dart';
import 'package:dartz/dartz.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:model/email/read_actions.dart';
import 'package:model/model.dart';
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
class MarkAsEmailReadInteractor {
final EmailRepository emailRepository;
final EmailRepository _emailRepository;
MarkAsEmailReadInteractor(this.emailRepository);
MarkAsEmailReadInteractor(this._emailRepository);
Stream<Either<Failure, Success>> execute(AccountId accountId, EmailId emailId, ReadActions readAction) async* {
Stream<Either<Failure, Success>> execute(AccountId accountId, Email email, ReadActions readAction) async* {
try {
final result = await emailRepository.markAsRead(accountId, emailId, readAction);
yield result ? Right(MarkAsEmailReadSuccess(emailId, readAction)) : Left(MarkAsEmailReadFailure(null, readAction));
final result = await _emailRepository.markAsRead(accountId, [email], readAction);
if (result.isNotEmpty) {
final updatedEmail = email.updatedEmail(newKeywords: result.first.keywords);
yield Right(MarkAsEmailReadSuccess(updatedEmail, readAction));
} else {
yield Left(MarkAsEmailReadFailure(null, readAction));
}
} catch (e) {
yield Left(MarkAsEmailReadFailure(e, readAction));
}
lib/features/email/domain/usecases/move_to_mailbox_interactor.dart
+10 -3
View File
@@ -13,9 +13,16 @@ class MoveToMailboxInteractor {
Stream<Either<Failure, Success>> execute(AccountId accountId, MoveRequest moveRequest) async* {
try {
final result = await emailRepository.moveToMailbox(accountId, moveRequest);
yield result
? Right(MoveToMailboxSuccess(moveRequest))
: Left(MoveToMailboxFailure(null));
if (result.isNotEmpty) {
yield Right(MoveToMailboxSuccess(
result.first,
moveRequest.currentMailboxId,
moveRequest.destinationMailboxId,
moveRequest.moveAction,
moveRequest.destinationPath));
} else {
yield Left(MoveToMailboxFailure(null));
}
} catch (e) {
yield Left(MoveToMailboxFailure(e));
}
lib/features/email/presentation/email_controller.dart
+28 -23
View File
@@ -8,7 +8,6 @@ import 'package:flutter/widgets.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/model.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:tmail_ui_user/features/base/base_controller.dart';
@@ -47,6 +46,7 @@ class EmailController extends BaseController {
final emailAddressExpandMode = ExpandMode.COLLAPSE.obs;
final attachmentsExpandMode = ExpandMode.COLLAPSE.obs;
final emailContent = Rxn<EmailContent>();
EmailId? _currentEmailId;
EmailController(
this._getEmailContentInteractor,
@@ -62,12 +62,15 @@ class EmailController extends BaseController {
void onReady() {
super.onReady();
mailboxDashBoardController.selectedEmail.listen((presentationEmail) {
_clearEmailContent();
final accountId = mailboxDashBoardController.accountId.value;
if (accountId != null && presentationEmail != null) {
_getEmailContentAction(accountId, presentationEmail.id);
if (presentationEmail.isUnReadEmail()) {
markAsEmailRead(presentationEmail, ReadActions.markAsRead);
if (_currentEmailId != presentationEmail?.id) {
_currentEmailId = presentationEmail?.id;
_clearEmailContent();
final accountId = mailboxDashBoardController.accountId.value;
if (accountId != null && presentationEmail != null) {
_getEmailContentAction(accountId, presentationEmail.id);
if (presentationEmail.isUnReadEmail()) {
markAsEmailRead(presentationEmail, ReadActions.markAsRead);
}
}
}
});
@@ -131,11 +134,14 @@ class EmailController extends BaseController {
final accountId = mailboxDashBoardController.accountId.value;
final mailboxCurrent = mailboxDashBoardController.selectedMailbox.value;
if (accountId != null && mailboxCurrent != null) {
consumeState(_markAsEmailReadInteractor.execute(accountId, presentationEmail.id, readActions));
consumeState(_markAsEmailReadInteractor.execute(accountId, presentationEmail.toEmail(), readActions));
}
}
void _markAsEmailReadSuccess(Success success) {
if (success is MarkAsEmailReadSuccess) {
mailboxDashBoardController.setSelectedEmail(success.updatedEmail.toPresentationEmail(selectMode: SelectMode.ACTIVE));
}
mailboxDashBoardController.dispatchState(Right(success));
if (success is MarkAsEmailReadSuccess && success.readActions == ReadActions.markAsUnread) {
@@ -144,7 +150,9 @@ class EmailController extends BaseController {
}
void _markAsEmailReadFailure(Failure failure) {
backToThreadView();
if (failure is MarkAsEmailReadFailure && failure.readActions == ReadActions.markAsUnread) {
backToThreadView();
}
}
void toggleDisplayAttachmentsAction() {
@@ -244,19 +252,18 @@ class EmailController extends BaseController {
final accountId = mailboxDashBoardController.accountId.value;
if (currentMailbox != null && accountId != null) {
final mailboxDestination = await push(
final destinationMailbox = await push(
AppRoutes.DESTINATION_PICKER,
arguments: DestinationPickerArguments(accountId, [email.id], currentMailbox)
);
if (mailboxDestination != null && mailboxDestination is PresentationMailbox) {
if (destinationMailbox != null && destinationMailbox is PresentationMailbox) {
_moveToMailbox(accountId, MoveRequest(
email.id,
[email.id],
currentMailbox.id,
currentMailbox.name ?? MailboxName(''),
mailboxDestination.id,
mailboxDestination.name ?? MailboxName(''),
MoveAction.moveTo));
destinationMailbox.id,
MoveAction.moveTo,
destinationPath: destinationMailbox.mailboxPath));
}
}
}
@@ -269,19 +276,17 @@ class EmailController extends BaseController {
mailboxDashBoardController.dispatchState(Right(success));
if (success is MoveToMailboxSuccess
&& success.moveRequest.moveAction == MoveAction.moveTo
&& success.moveAction == MoveAction.moveTo
&& Get.context != null && Get.overlayContext != null) {
_appToast.showToastWithAction(
Get.overlayContext!,
AppLocalizations.of(Get.context!).moved_to_mailbox(success.moveRequest.destinationMailboxName.name),
AppLocalizations.of(Get.context!).moved_to_mailbox(success.destinationPath ?? ''),
AppLocalizations.of(Get.context!).undo_action,
() {
final newMoveRequest = MoveRequest(
success.moveRequest.emailId,
success.moveRequest.destinationMailboxId,
success.moveRequest.destinationMailboxName,
success.moveRequest.currentMailboxId,
success.moveRequest.currentMailboxName,
[success.emailId],
success.destinationMailboxId,
success.currentMailboxId,
MoveAction.undo);
_undoMoveToMailbox(newMoveRequest);
}