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

Hotfix conflict role Spam/Junk

Browse Source
This commit is contained in:
dab246
2024-08-14 17:04:43 +07:00
committed by Dat H. Pham
parent b5e3881ad4
commit 4d045bbf1a
33 changed files with 519 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox/data/local/mailbox_cache_manager.dart
+2 -2
View File
@@ -4,7 +4,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/extensions/account_id_extensions.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
import 'package:model/extensions/mailbox_extension.dart';
import 'package:tmail_ui_user/features/caching/clients/mailbox_cache_client.dart';
import 'package:tmail_ui_user/features/caching/utils/cache_utils.dart';
import 'package:tmail_ui_user/features/mailbox/data/extensions/list_mailbox_cache_extension.dart';
@@ -49,7 +49,7 @@ class MailboxCacheManager {
Future<Mailbox> getSpamMailbox(AccountId accountId, UserName userName) async {
final mailboxList = await getAllMailbox(accountId, userName);
final spamMailbox = mailboxList.firstWhereOrNull((mailbox) => mailbox.role == PresentationMailbox.roleSpam);
final spamMailbox = mailboxList.firstWhereOrNull((mailbox) => mailbox.isSpam);
if (spamMailbox != null) {
return spamMailbox;
} else {
lib/features/mailbox/data/network/mailbox_api.dart
+1
View File
@@ -30,6 +30,7 @@ import 'package:model/model.dart';
import 'package:tmail_ui_user/features/base/mixin/handle_error_mixin.dart';
import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart';
import 'package:tmail_ui_user/features/mailbox/domain/exceptions/mailbox_exception.dart';
import 'package:tmail_ui_user/features/mailbox/domain/exceptions/set_mailbox_method_exception.dart';
import 'package:tmail_ui_user/features/mailbox/domain/extensions/list_mailbox_id_extension.dart';
import 'package:tmail_ui_user/features/mailbox/domain/extensions/role_extension.dart';
lib/features/mailbox/domain/constants/mailbox_constants.dart
+1 -1
View File
@@ -25,7 +25,7 @@ class MailboxConstants {
PresentationMailbox.roleDrafts,
PresentationMailbox.roleSent,
PresentationMailbox.roleTrash,
PresentationMailbox.roleSpam,
PresentationMailbox.roleJunk,
PresentationMailbox.roleTemplates,
];
}
lib/features/mailbox/domain/exceptions/mailbox_exception.dart
+4
View File
@@ -0,0 +1,4 @@
class NotFoundInboxMailboxException implements Exception {}
class NotFoundMailboxException implements Exception {}
lib/features/mailbox/domain/exceptions/set_mailbox_method_exception.dart
+1 -3
View File
@@ -11,6 +11,4 @@ class SetMailboxMethodException implements Exception {
class NotFoundMailboxCreatedException implements Exception {}
class NotFoundMailboxUpdatedRoleException implements Exception {}
class NotFoundMailboxException implements Exception {}
class NotFoundMailboxUpdatedRoleException implements Exception {}
lib/features/mailbox/domain/extensions/role_extension.dart
+1 -1
View File
@@ -15,7 +15,7 @@ extension RoleExtension on Role {
return 'Drafts';
} else if (this == PresentationMailbox.roleTrash) {
return 'Trash';
} else if (this == PresentationMailbox.roleSpam) {
} else if (this == PresentationMailbox.roleSpam || this == PresentationMailbox.roleJunk) {
return 'Spam';
} else if (this == PresentationMailbox.roleTemplates) {
return 'Templates';
lib/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart
+2
View File
@@ -26,6 +26,7 @@ extension PresentationMailboxExtension on PresentationMailbox {
case PresentationMailbox.trashRole:
return AppLocalizations.of(context).trashMailboxDisplayName;
case PresentationMailbox.spamRole:
case PresentationMailbox.junkRole:
return AppLocalizations.of(context).spamMailboxDisplayName;
case PresentationMailbox.templatesRole:
return AppLocalizations.of(context).templatesMailboxDisplayName;
@@ -52,6 +53,7 @@ extension PresentationMailboxExtension on PresentationMailbox {
case PresentationMailbox.trashRole:
return imagePaths.icMailboxTrash;
case PresentationMailbox.spamRole:
case PresentationMailbox.junkRole:
return imagePaths.icMailboxSpam;
case PresentationMailbox.templatesRole:
return imagePaths.icMailboxTemplate;