TF-3385 Update save and remove draft email
This commit is contained in:
@@ -605,4 +605,19 @@ abstract class BaseMailboxController extends BaseController {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void updateMailboxTotalEmailsCountById(MailboxId mailboxId, int totalEmails) {
|
||||||
|
final mailboxTrees = [
|
||||||
|
defaultMailboxTree,
|
||||||
|
personalMailboxTree,
|
||||||
|
teamMailboxesTree,
|
||||||
|
];
|
||||||
|
|
||||||
|
for (var mailboxTree in mailboxTrees) {
|
||||||
|
if (mailboxTree.value.updateMailboxTotalEmailsCountById(mailboxId, totalEmails)) {
|
||||||
|
mailboxTree.refresh();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,17 +1,19 @@
|
|||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.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/email/email.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
|
|
||||||
class SaveEmailAsDraftsLoading extends LoadingState {}
|
class SaveEmailAsDraftsLoading extends LoadingState {}
|
||||||
|
|
||||||
class SaveEmailAsDraftsSuccess extends UIState {
|
class SaveEmailAsDraftsSuccess extends UIState {
|
||||||
|
|
||||||
final EmailId emailId;
|
final EmailId emailId;
|
||||||
|
final MailboxId? draftMailboxId;
|
||||||
|
|
||||||
SaveEmailAsDraftsSuccess(this.emailId);
|
SaveEmailAsDraftsSuccess(this.emailId, this.draftMailboxId);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => [emailId, ...super.props];
|
List<Object?> get props => [emailId, draftMailboxId, ...super.props];
|
||||||
}
|
}
|
||||||
|
|
||||||
class SaveEmailAsDraftsFailure extends FeatureFailure {
|
class SaveEmailAsDraftsFailure extends FeatureFailure {
|
||||||
|
|||||||
+4
-1
@@ -44,7 +44,10 @@ class CreateNewAndSaveEmailToDraftsInteractor {
|
|||||||
);
|
);
|
||||||
|
|
||||||
yield dartz.Right<Failure, Success>(
|
yield dartz.Right<Failure, Success>(
|
||||||
SaveEmailAsDraftsSuccess(emailDraftSaved.id!)
|
SaveEmailAsDraftsSuccess(
|
||||||
|
emailDraftSaved.id!,
|
||||||
|
createEmailRequest.draftsMailboxId,
|
||||||
|
)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
yield dartz.Right<Failure, Success>(UpdatingEmailDrafts());
|
yield dartz.Right<Failure, Success>(UpdatingEmailDrafts());
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import 'package:rxdart/transformers.dart';
|
|||||||
import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/base/mixin/contact_support_mixin.dart';
|
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/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/model/move_action.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/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/domain/state/mark_as_email_read_state.dart';
|
||||||
@@ -66,6 +67,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.
|
|||||||
import 'package:tmail_ui_user/features/mailbox_creator/domain/usecases/verify_name_interactor.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/mailbox_creator_arguments.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/new_mailbox_arguments.dart';
|
import 'package:tmail_ui_user/features/mailbox_creator/presentation/model/new_mailbox_arguments.dart';
|
||||||
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_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';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
|
||||||
@@ -310,6 +312,16 @@ class MailboxController extends BaseMailboxController
|
|||||||
?.value
|
?.value
|
||||||
.toInt() ?? 0,
|
.toInt() ?? 0,
|
||||||
);
|
);
|
||||||
|
} else if (reactionState is SaveEmailAsDraftsSuccess) {
|
||||||
|
_handleDraftSaved(
|
||||||
|
affectedMailboxId: reactionState.draftMailboxId,
|
||||||
|
totalEmailsChanged: 1,
|
||||||
|
);
|
||||||
|
} else if (reactionState is RemoveEmailDraftsSuccess) {
|
||||||
|
_handleDraftSaved(
|
||||||
|
affectedMailboxId: reactionState.draftMailboxId,
|
||||||
|
totalEmailsChanged: -1,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -335,6 +347,18 @@ class MailboxController extends BaseMailboxController
|
|||||||
clearUnreadCount(affectedMailboxId);
|
clearUnreadCount(affectedMailboxId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _handleDraftSaved({
|
||||||
|
required MailboxId? affectedMailboxId,
|
||||||
|
required int totalEmailsChanged,
|
||||||
|
}) {
|
||||||
|
if (affectedMailboxId == null) return;
|
||||||
|
|
||||||
|
updateMailboxTotalEmailsCountById(
|
||||||
|
affectedMailboxId,
|
||||||
|
totalEmailsChanged,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
void _initWebSocketQueueHandler() {
|
void _initWebSocketQueueHandler() {
|
||||||
_webSocketQueueHandler = WebSocketQueueHandler(
|
_webSocketQueueHandler = WebSocketQueueHandler(
|
||||||
processMessageCallback: _handleWebSocketMessage,
|
processMessageCallback: _handleWebSocketMessage,
|
||||||
|
|||||||
@@ -107,6 +107,20 @@ class MailboxTree with EquatableMixin {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool updateMailboxTotalEmailsCountById(MailboxId mailboxId, int totalEmailsCount) {
|
||||||
|
final matchedNode = findNode((node) => node.item.id == mailboxId);
|
||||||
|
if (matchedNode != null) {
|
||||||
|
final currentTotalEmailsCount = matchedNode.item.totalEmails?.value.value ?? 0;
|
||||||
|
final updatedTotalEmailsCount = currentTotalEmailsCount + totalEmailsCount;
|
||||||
|
if (updatedTotalEmailsCount < 0) return true;
|
||||||
|
matchedNode.item = matchedNode.item.copyWith(
|
||||||
|
totalEmails: TotalEmails(UnsignedInt(updatedTotalEmailsCount)),
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
String? getNodePath(MailboxId mailboxId) {
|
String? getNodePath(MailboxId mailboxId) {
|
||||||
final matchedNode = findNode((node) => node.item.id == mailboxId);
|
final matchedNode = findNode((node) => node.item.id == mailboxId);
|
||||||
if (matchedNode == null) {
|
if (matchedNode == null) {
|
||||||
|
|||||||
@@ -1,7 +1,15 @@
|
|||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||||
|
|
||||||
class RemoveEmailDraftsSuccess extends UIState {}
|
class RemoveEmailDraftsSuccess extends UIState {
|
||||||
|
final MailboxId? draftMailboxId;
|
||||||
|
|
||||||
|
RemoveEmailDraftsSuccess(this.draftMailboxId);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [draftMailboxId];
|
||||||
|
}
|
||||||
|
|
||||||
class RemoveEmailDraftsFailure extends FeatureFailure {
|
class RemoveEmailDraftsFailure 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/account_id.dart';
|
||||||
import 'package:jmap_dart_client/jmap/core/session/session.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/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/repository/email_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart';
|
||||||
|
|
||||||
@@ -12,11 +13,16 @@ class RemoveEmailDraftsInteractor {
|
|||||||
|
|
||||||
RemoveEmailDraftsInteractor(this._emailRepository);
|
RemoveEmailDraftsInteractor(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? draftMailboxId,
|
||||||
|
) async* {
|
||||||
try {
|
try {
|
||||||
final result = await _emailRepository.removeEmailDrafts(session, accountId, emailId);
|
final result = await _emailRepository.removeEmailDrafts(session, accountId, emailId);
|
||||||
if (result) {
|
if (result) {
|
||||||
yield Right<Failure, Success>(RemoveEmailDraftsSuccess());
|
yield Right<Failure, Success>(RemoveEmailDraftsSuccess(draftMailboxId));
|
||||||
} else {
|
} else {
|
||||||
yield Left<Failure, Success>(RemoveEmailDraftsFailure(result));
|
yield Left<Failure, Success>(RemoveEmailDraftsFailure(result));
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-3
@@ -811,7 +811,7 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
currentOverlayContext!,
|
currentOverlayContext!,
|
||||||
AppLocalizations.of(currentContext!).drafts_saved,
|
AppLocalizations.of(currentContext!).drafts_saved,
|
||||||
actionName: AppLocalizations.of(currentContext!).discard,
|
actionName: AppLocalizations.of(currentContext!).discard,
|
||||||
onActionClick: () => _discardEmail(success.emailId),
|
onActionClick: () => _discardEmail(success.emailId, success.draftMailboxId),
|
||||||
leadingSVGIcon: imagePaths.icMailboxDrafts,
|
leadingSVGIcon: imagePaths.icMailboxDrafts,
|
||||||
leadingSVGIconColor: Colors.white,
|
leadingSVGIconColor: Colors.white,
|
||||||
backgroundColor: AppColor.toastSuccessBackgroundColor,
|
backgroundColor: AppColor.toastSuccessBackgroundColor,
|
||||||
@@ -854,11 +854,16 @@ class MailboxDashBoardController extends ReloadableController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _discardEmail(EmailId emailId) {
|
void _discardEmail(EmailId emailId, MailboxId? draftMailboxId) {
|
||||||
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(_removeEmailDraftsInteractor.execute(session, currentAccountId, emailId));
|
consumeState(_removeEmailDraftsInteractor.execute(
|
||||||
|
session,
|
||||||
|
currentAccountId,
|
||||||
|
emailId,
|
||||||
|
draftMailboxId,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -591,7 +591,7 @@ void main() {
|
|||||||
createEmailRequest: anyNamed('createEmailRequest'),
|
createEmailRequest: anyNamed('createEmailRequest'),
|
||||||
cancelToken: anyNamed('cancelToken')))
|
cancelToken: anyNamed('cancelToken')))
|
||||||
.thenAnswer((_) => Stream.value(
|
.thenAnswer((_) => Stream.value(
|
||||||
Right(SaveEmailAsDraftsSuccess(EmailId(Id('123'))))));
|
Right(SaveEmailAsDraftsSuccess(EmailId(Id('123')), null))));
|
||||||
|
|
||||||
final savedEmailDraft = SavedEmailDraft(
|
final savedEmailDraft = SavedEmailDraft(
|
||||||
content: emailContent,
|
content: emailContent,
|
||||||
@@ -1039,7 +1039,7 @@ void main() {
|
|||||||
createEmailRequest: anyNamed('createEmailRequest'),
|
createEmailRequest: anyNamed('createEmailRequest'),
|
||||||
cancelToken: anyNamed('cancelToken')))
|
cancelToken: anyNamed('cancelToken')))
|
||||||
.thenAnswer((_) => Stream.value(
|
.thenAnswer((_) => Stream.value(
|
||||||
Right(SaveEmailAsDraftsSuccess(EmailId(Id('123'))))));
|
Right(SaveEmailAsDraftsSuccess(EmailId(Id('123')), null))));
|
||||||
|
|
||||||
final savedEmailDraft = SavedEmailDraft(
|
final savedEmailDraft = SavedEmailDraft(
|
||||||
content: emailContent,
|
content: emailContent,
|
||||||
|
|||||||
Reference in New Issue
Block a user