TF-3385 Fix mark as read not work properly
This commit is contained in:
@@ -673,7 +673,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
|
||||
if (_currentEmailId != null) {
|
||||
mailboxDashBoardController.updateEmailFlagByEmailIds(
|
||||
[_currentEmailId!],
|
||||
readAction: ReadActions.markAsRead,
|
||||
readAction: readActions,
|
||||
);
|
||||
}
|
||||
if (readActions == ReadActions.markAsUnread) {
|
||||
|
||||
@@ -281,25 +281,29 @@ class MailboxController extends BaseMailboxController
|
||||
: null,
|
||||
);
|
||||
} else if (reactionState is MarkAsMultipleEmailReadAllSuccess) {
|
||||
_handleMarkEmailsAsReadOrUnread(
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
readCount: reactionState.readActions == ReadActions.markAsRead
|
||||
? reactionState.emailIds.length
|
||||
: null,
|
||||
unreadCount: reactionState.readActions == ReadActions.markAsUnread
|
||||
? reactionState.emailIds.length
|
||||
: null,
|
||||
);
|
||||
for (var emailIdsByMailboxId in reactionState.markSuccessEmailIdsByMailboxId.entries) {
|
||||
_handleMarkEmailsAsReadOrUnread(
|
||||
affectedMailboxId: emailIdsByMailboxId.key,
|
||||
readCount: reactionState.readActions == ReadActions.markAsRead
|
||||
? emailIdsByMailboxId.value.length
|
||||
: null,
|
||||
unreadCount: reactionState.readActions == ReadActions.markAsUnread
|
||||
? emailIdsByMailboxId.value.length
|
||||
: null,
|
||||
);
|
||||
}
|
||||
} else if (reactionState is MarkAsMultipleEmailReadHasSomeEmailFailure) {
|
||||
_handleMarkEmailsAsReadOrUnread(
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
readCount: reactionState.readActions == ReadActions.markAsRead
|
||||
? reactionState.successEmailIds.length
|
||||
: null,
|
||||
unreadCount: reactionState.readActions == ReadActions.markAsUnread
|
||||
? reactionState.successEmailIds.length
|
||||
: null,
|
||||
);
|
||||
for (var emailIdsByMailboxId in reactionState.markSuccessEmailIdsByMailboxId.entries) {
|
||||
_handleMarkEmailsAsReadOrUnread(
|
||||
affectedMailboxId: emailIdsByMailboxId.key,
|
||||
readCount: reactionState.readActions == ReadActions.markAsRead
|
||||
? emailIdsByMailboxId.value.length
|
||||
: null,
|
||||
unreadCount: reactionState.readActions == ReadActions.markAsUnread
|
||||
? emailIdsByMailboxId.value.length
|
||||
: null,
|
||||
);
|
||||
}
|
||||
} else if (reactionState is MarkAsMailboxReadAllSuccess) {
|
||||
_handleMarkMailboxAsRead(
|
||||
affectedMailboxId: reactionState.mailboxId,
|
||||
|
||||
+1
-1
@@ -967,7 +967,7 @@ class MailboxDashBoardController extends ReloadableController
|
||||
accountId.value!,
|
||||
listEmailNeedMarkAsRead.listEmailIds,
|
||||
readActions,
|
||||
listPresentationEmail.firstOrNull?.mailboxContain?.mailboxId,
|
||||
listEmailNeedMarkAsRead.emailIdsByMailboxId,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,16 +9,16 @@ class LoadingMarkAsMultipleEmailReadAll extends UIState {}
|
||||
class MarkAsMultipleEmailReadAllSuccess extends UIState {
|
||||
final List<EmailId> emailIds;
|
||||
final ReadActions readActions;
|
||||
final MailboxId? mailboxId;
|
||||
final Map<MailboxId, List<EmailId>> markSuccessEmailIdsByMailboxId;
|
||||
|
||||
MarkAsMultipleEmailReadAllSuccess(
|
||||
this.emailIds,
|
||||
this.readActions,
|
||||
this.mailboxId,
|
||||
this.markSuccessEmailIdsByMailboxId,
|
||||
);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [emailIds, readActions, mailboxId];
|
||||
List<Object?> get props => [emailIds, readActions, markSuccessEmailIdsByMailboxId];
|
||||
}
|
||||
|
||||
class MarkAsMultipleEmailReadAllFailure extends FeatureFailure {
|
||||
@@ -33,16 +33,16 @@ class MarkAsMultipleEmailReadAllFailure extends FeatureFailure {
|
||||
class MarkAsMultipleEmailReadHasSomeEmailFailure extends UIState {
|
||||
final List<EmailId> successEmailIds;
|
||||
final ReadActions readActions;
|
||||
final MailboxId? mailboxId;
|
||||
final Map<MailboxId, List<EmailId>> markSuccessEmailIdsByMailboxId;
|
||||
|
||||
MarkAsMultipleEmailReadHasSomeEmailFailure(
|
||||
this.successEmailIds,
|
||||
this.readActions,
|
||||
this.mailboxId,
|
||||
this.markSuccessEmailIdsByMailboxId,
|
||||
);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [successEmailIds, readActions, mailboxId];
|
||||
List<Object?> get props => [successEmailIds, readActions, markSuccessEmailIdsByMailboxId];
|
||||
}
|
||||
|
||||
class MarkAsMultipleEmailReadFailure extends FeatureFailure {
|
||||
|
||||
@@ -19,7 +19,7 @@ class MarkAsMultipleEmailReadInteractor {
|
||||
AccountId accountId,
|
||||
List<EmailId> emailIds,
|
||||
ReadActions readAction,
|
||||
MailboxId? mailboxId,
|
||||
Map<MailboxId, List<EmailId>> emailIdsByMailboxId,
|
||||
) async* {
|
||||
try {
|
||||
yield Right(LoadingMarkAsMultipleEmailReadAll());
|
||||
@@ -30,12 +30,18 @@ class MarkAsMultipleEmailReadInteractor {
|
||||
emailIds,
|
||||
readAction,
|
||||
);
|
||||
final markSuccessEmailIdsByMailboxId = emailIdsByMailboxId.map(
|
||||
(key, value) => MapEntry(
|
||||
key,
|
||||
value.where(result.emailIdsSuccess.contains).toList(),
|
||||
),
|
||||
);
|
||||
|
||||
if (emailIds.length == result.emailIdsSuccess.length) {
|
||||
yield Right(MarkAsMultipleEmailReadAllSuccess(
|
||||
result.emailIdsSuccess,
|
||||
readAction,
|
||||
mailboxId,
|
||||
markSuccessEmailIdsByMailboxId,
|
||||
));
|
||||
} else if (result.emailIdsSuccess.isEmpty) {
|
||||
yield Left(MarkAsMultipleEmailReadAllFailure(readAction));
|
||||
@@ -43,7 +49,7 @@ class MarkAsMultipleEmailReadInteractor {
|
||||
yield Right(MarkAsMultipleEmailReadHasSomeEmailFailure(
|
||||
result.emailIdsSuccess,
|
||||
readAction,
|
||||
mailboxId,
|
||||
markSuccessEmailIdsByMailboxId,
|
||||
));
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
@@ -22,6 +22,17 @@ extension ListPresentationEmailExtension on List<PresentationEmail> {
|
||||
|
||||
List<EmailId> get listEmailIds => map((email) => email.id).whereNotNull().toList();
|
||||
|
||||
Map<MailboxId, List<EmailId>> get emailIdsByMailboxId => Map.from(
|
||||
where((email) => email.mailboxContain?.mailboxId != null && email.id != null)
|
||||
.fold(<MailboxId, List<EmailId>>{}, (combine, email) {
|
||||
final mailboxId = email.mailboxContain!.mailboxId!;
|
||||
combine[mailboxId] ??= [];
|
||||
combine[mailboxId]!.add(email.id!);
|
||||
return combine;
|
||||
}
|
||||
),
|
||||
);
|
||||
|
||||
bool isAllCanDeletePermanently(Map<MailboxId, PresentationMailbox> mapMailbox) {
|
||||
final listMailboxContain = map((email) => email.findMailboxContain(mapMailbox))
|
||||
.whereType<PresentationMailbox>()
|
||||
|
||||
Reference in New Issue
Block a user