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

TF-2302 Resolve conflicts on the master branch

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit 6eb9f32ee0f67d9b78be13a4ecd4b1ae2b4de9a0)
This commit is contained in:
dab246
2023-11-09 16:49:20 +07:00
committed by Dat Vu
parent 3d5677f6e0
commit dbdffff355
9 changed files with 87 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/mailbox/data/network/mailbox_api.dart
+2 -5
View File
@@ -422,8 +422,7 @@ class MailboxAPI with HandleSetErrorMixin {
SetMailboxResponse.deserialize
);
final listEntriesErrors = handleSetResponse([createResponse]);
final mapErrors = Map.fromEntries(listEntriesErrors);
final mapErrors = handleSetResponse([createResponse]);
if (mapErrors.isNotEmpty) {
throw SetMailboxMethodException(mapErrors);
@@ -495,9 +494,7 @@ class MailboxAPI with HandleSetErrorMixin {
SetMailboxResponse.deserialize
);
final listEntriesErrors = handleSetResponse([updateResponse]);
final mapErrors = Map.fromEntries(listEntriesErrors);
final mapErrors = handleSetResponse([updateResponse]);
if (mapErrors.isNotEmpty) {
throw SetMailboxMethodException(mapErrors);
}
lib/features/mailbox/domain/constants/mailbox_constants.dart
+12
View File
@@ -1,5 +1,7 @@
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/mailbox/mailbox_property.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
class MailboxConstants {
static final propertiesDefault = Properties({
@@ -16,4 +18,14 @@ class MailboxConstants {
MailboxProperty.myRights,
MailboxProperty.namespace
});
static final List<Role> defaultMailboxRoles = [
PresentationMailbox.roleInbox,
PresentationMailbox.roleOutbox,
PresentationMailbox.roleDrafts,
PresentationMailbox.roleSent,
PresentationMailbox.roleTrash,
PresentationMailbox.roleSpam,
PresentationMailbox.roleTemplates,
];
}
lib/features/mailbox/presentation/mailbox_controller.dart
-1
View File
@@ -64,7 +64,6 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_catego
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/open_mailbox_view_event.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_constants.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.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';
lib/features/mailbox/presentation/utils/mailbox_constants.dart
-15
View File
@@ -1,15 +0,0 @@
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/mailbox/presentation_mailbox.dart';
class MailboxConstants {
static final List<Role> defaultMailboxRoles = [
PresentationMailbox.roleInbox,
PresentationMailbox.roleOutbox,
PresentationMailbox.roleDrafts,
PresentationMailbox.roleSent,
PresentationMailbox.roleTrash,
PresentationMailbox.roleSpam,
PresentationMailbox.roleTemplates,
];
}