TF-599 Handle move mailbox action for mailbox
This commit is contained in:
@@ -6,6 +6,7 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
|
||||
abstract class MailboxDataSource {
|
||||
@@ -22,4 +23,6 @@ abstract class MailboxDataSource {
|
||||
Future<bool> deleteMultipleMailbox(Session session, AccountId accountId, List<MailboxId> mailboxIds);
|
||||
|
||||
Future<bool> renameMailbox(AccountId accountId, RenameMailboxRequest request);
|
||||
|
||||
Future<bool> moveMailbox(AccountId accountId, MoveMailboxRequest request);
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.
|
||||
import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
|
||||
class MailboxCacheDataSourceImpl extends MailboxDataSource {
|
||||
@@ -59,4 +60,9 @@ class MailboxCacheDataSourceImpl extends MailboxDataSource {
|
||||
Future<bool> renameMailbox(AccountId accountId, RenameMailboxRequest request) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> moveMailbox(AccountId accountId, MoveMailboxRequest request) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_respons
|
||||
import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_api.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
|
||||
class MailboxDataSourceImpl extends MailboxDataSource {
|
||||
@@ -70,4 +71,13 @@ class MailboxDataSourceImpl extends MailboxDataSource {
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> moveMailbox(AccountId accountId, MoveMailboxRequest request) {
|
||||
return Future.sync(() async {
|
||||
return await mailboxAPI.moveMailbox(accountId, request);
|
||||
}).catchError((error) {
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@ import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/main/error/capability_validator.dart';
|
||||
|
||||
@@ -201,4 +202,32 @@ class MailboxAPI {
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
|
||||
Future<bool> moveMailbox(AccountId accountId, MoveMailboxRequest request) async {
|
||||
final setMailboxMethod = SetMailboxMethod(accountId)
|
||||
..addUpdates({
|
||||
request.mailboxId.id : PatchObject({
|
||||
'parentId': request.destinationMailboxId?.id.value
|
||||
})
|
||||
});
|
||||
|
||||
final requestBuilder = JmapRequestBuilder(httpClient, ProcessingInvocation());
|
||||
|
||||
final setMailboxInvocation = requestBuilder.invocation(setMailboxMethod);
|
||||
|
||||
final response = await (requestBuilder
|
||||
..usings(setMailboxMethod.requiredCapabilities))
|
||||
.build()
|
||||
.execute();
|
||||
|
||||
final setMailboxResponse = response.parse<SetMailboxResponse>(
|
||||
setMailboxInvocation.methodCallId,
|
||||
SetMailboxResponse.deserialize);
|
||||
|
||||
return Future.sync(() async {
|
||||
return setMailboxResponse?.updated?.isNotEmpty == true;
|
||||
}).catchError((error) {
|
||||
throw error;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,7 @@ import 'package:tmail_ui_user/features/mailbox/data/extensions/state_extension.d
|
||||
import 'package:tmail_ui_user/features/mailbox/data/model/state_type.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
||||
import 'package:tmail_ui_user/features/thread/data/datasource/thread_datasource.dart';
|
||||
@@ -220,4 +221,9 @@ class MailboxRepositoryImpl extends MailboxRepository {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<bool> moveMailbox(AccountId accountId, MoveMailboxRequest request) {
|
||||
return mapDataSource[DataSourceType.network]!.moveMailbox(accountId, request);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
||||
|
||||
class MoveMailboxRequest with EquatableMixin {
|
||||
|
||||
final MailboxId? destinationMailboxId;
|
||||
final MailboxName? destinationMailboxName;
|
||||
final MailboxId? parentId;
|
||||
final MailboxId mailboxId;
|
||||
final MoveAction moveAction;
|
||||
|
||||
MoveMailboxRequest(
|
||||
this.mailboxId,
|
||||
this.moveAction,
|
||||
{
|
||||
this.parentId,
|
||||
this.destinationMailboxId,
|
||||
this.destinationMailboxName
|
||||
}
|
||||
);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
mailboxId,
|
||||
moveAction,
|
||||
parentId,
|
||||
destinationMailboxId,
|
||||
destinationMailboxName
|
||||
];
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import 'package:jmap_dart_client/jmap/core/state.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
|
||||
abstract class MailboxRepository {
|
||||
@@ -19,4 +20,6 @@ abstract class MailboxRepository {
|
||||
Future<bool> renameMailbox(AccountId accountId, RenameMailboxRequest request);
|
||||
|
||||
Future<bool> markAsMailboxRead(AccountId accountId, MailboxId mailboxId, MailboxName mailboxName);
|
||||
|
||||
Future<bool> moveMailbox(AccountId accountId, MoveMailboxRequest request);
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
||||
|
||||
class MoveMailboxLoading extends UIState {
|
||||
|
||||
MoveMailboxLoading();
|
||||
|
||||
@override
|
||||
List<Object?> get props => [];
|
||||
}
|
||||
|
||||
class MoveMailboxSuccess extends UIState {
|
||||
|
||||
final MailboxId mailboxIdSelected;
|
||||
final MoveAction moveAction;
|
||||
final MailboxId? parentId;
|
||||
final MailboxId? destinationMailboxId;
|
||||
final MailboxName? destinationMailboxName;
|
||||
|
||||
MoveMailboxSuccess(
|
||||
this.mailboxIdSelected,
|
||||
this.moveAction,
|
||||
{
|
||||
this.parentId,
|
||||
this.destinationMailboxId,
|
||||
this.destinationMailboxName
|
||||
}
|
||||
);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [
|
||||
mailboxIdSelected,
|
||||
parentId,
|
||||
destinationMailboxId];
|
||||
}
|
||||
|
||||
class MoveMailboxFailure extends FeatureFailure {
|
||||
final dynamic exception;
|
||||
|
||||
MoveMailboxFailure(this.exception);
|
||||
|
||||
@override
|
||||
List<Object> get props => [exception];
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/move_mailbox_state.dart';
|
||||
|
||||
class MoveMailboxInteractor {
|
||||
final MailboxRepository mailboxRepository;
|
||||
|
||||
MoveMailboxInteractor(this.mailboxRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId, MoveMailboxRequest request) async* {
|
||||
try {
|
||||
final result = await mailboxRepository.moveMailbox(accountId, request);
|
||||
if (result) {
|
||||
yield Right<Failure, Success>(MoveMailboxSuccess(
|
||||
request.mailboxId,
|
||||
request.moveAction,
|
||||
parentId: request.parentId,
|
||||
destinationMailboxId: request.destinationMailboxId,
|
||||
destinationMailboxName: request.destinationMailboxName));
|
||||
} else {
|
||||
yield Left<Failure, Success>(MoveMailboxFailure(null));
|
||||
}
|
||||
} catch (e) {
|
||||
yield Left<Failure, Success>(MoveMailboxFailure(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,7 @@ import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_reposit
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/create_new_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/delete_multiple_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/move_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/refresh_all_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/rename_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/search_mailbox_interactor.dart';
|
||||
@@ -54,6 +55,7 @@ class MailboxBindings extends BaseBindings {
|
||||
Get.find<DeleteMultipleMailboxInteractor>(),
|
||||
Get.find<VerifyNameInteractor>(),
|
||||
Get.find<RenameMailboxInteractor>(),
|
||||
Get.find<MoveMailboxInteractor>(),
|
||||
Get.find<Uuid>(),
|
||||
Get.find<TreeBuilder>(),
|
||||
));
|
||||
@@ -85,6 +87,7 @@ class MailboxBindings extends BaseBindings {
|
||||
Get.lazyPut(() => DeleteMultipleMailboxInteractor(Get.find<MailboxRepository>()));
|
||||
Get.lazyPut(() => VerifyNameInteractor());
|
||||
Get.lazyPut(() => RenameMailboxInteractor(Get.find<MailboxRepository>()));
|
||||
Get.lazyPut(() => MoveMailboxInteractor(Get.find<MailboxRepository>()));
|
||||
}
|
||||
|
||||
@override
|
||||
|
||||
@@ -17,21 +17,26 @@ import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/state/save_email_as_drafts_state.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/state/send_email_state.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/state/update_email_drafts_state.dart';
|
||||
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/delete_email_permanently_state.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/state/delete_multiple_emails_permanently_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/move_to_mailbox_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/move_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/model/rename_mailbox_request.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/create_new_mailbox_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/delete_multiple_mailbox_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/move_mailbox_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/refresh_changes_all_mailboxes_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/rename_mailbox_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/state/search_mailbox_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/create_new_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/delete_multiple_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/move_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/refresh_all_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/rename_mailbox_interactor.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/domain/usecases/search_mailbox_interactor.dart';
|
||||
@@ -77,6 +82,7 @@ class MailboxController extends BaseMailboxController {
|
||||
final DeleteMultipleMailboxInteractor _deleteMultipleMailboxInteractor;
|
||||
final VerifyNameInteractor _verifyNameInteractor;
|
||||
final RenameMailboxInteractor _renameMailboxInteractor;
|
||||
final MoveMailboxInteractor _moveMailboxInteractor;
|
||||
final Uuid _uuid;
|
||||
|
||||
final listMailboxSearched = <PresentationMailbox>[].obs;
|
||||
@@ -103,6 +109,7 @@ class MailboxController extends BaseMailboxController {
|
||||
this._deleteMultipleMailboxInteractor,
|
||||
this._verifyNameInteractor,
|
||||
this._renameMailboxInteractor,
|
||||
this._moveMailboxInteractor,
|
||||
this._uuid,
|
||||
treeBuilder,
|
||||
) : super(treeBuilder);
|
||||
@@ -172,6 +179,8 @@ class MailboxController extends BaseMailboxController {
|
||||
_searchMailboxAction(allMailboxes, searchQuery.value);
|
||||
} else if (success is RenameMailboxSuccess) {
|
||||
refreshMailboxChanges();
|
||||
} else if (success is MoveMailboxSuccess) {
|
||||
_moveMailboxSuccess(success);
|
||||
}
|
||||
}
|
||||
);
|
||||
@@ -483,6 +492,9 @@ class MailboxController extends BaseMailboxController {
|
||||
case MailboxActions.markAsRead:
|
||||
_markAsReadMailboxAction(selectionMailbox.first);
|
||||
break;
|
||||
case MailboxActions.move:
|
||||
_moveMailboxAction(selectionMailbox.first);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -664,6 +676,69 @@ class MailboxController extends BaseMailboxController {
|
||||
}
|
||||
}
|
||||
|
||||
void _moveMailboxAction(PresentationMailbox mailboxSelected) async {
|
||||
final accountId = mailboxDashBoardController.accountId.value;
|
||||
if (accountId != null) {
|
||||
final destinationMailbox = await push(
|
||||
AppRoutes.DESTINATION_PICKER,
|
||||
arguments: DestinationPickerArguments(
|
||||
accountId,
|
||||
MailboxActions.move,
|
||||
mailboxIdSelected: mailboxSelected.id));
|
||||
|
||||
_handleMovingMailbox(
|
||||
accountId,
|
||||
MoveAction.moving,
|
||||
mailboxSelected,
|
||||
destinationMailbox: destinationMailbox);
|
||||
}
|
||||
|
||||
_cancelSelectMailbox();
|
||||
}
|
||||
|
||||
void _handleMovingMailbox(
|
||||
AccountId accountId,
|
||||
MoveAction moveAction,
|
||||
PresentationMailbox mailboxSelected,
|
||||
{PresentationMailbox? destinationMailbox}) {
|
||||
consumeState(_moveMailboxInteractor.execute(accountId,
|
||||
MoveMailboxRequest(
|
||||
mailboxSelected.id,
|
||||
moveAction,
|
||||
destinationMailboxId: destinationMailbox?.id,
|
||||
destinationMailboxName: destinationMailbox?.name,
|
||||
parentId: mailboxSelected.parentId)));
|
||||
}
|
||||
|
||||
void _moveMailboxSuccess(MoveMailboxSuccess success) {
|
||||
if (success.moveAction == MoveAction.moving
|
||||
&& currentOverlayContext != null
|
||||
&& currentContext != null) {
|
||||
_appToast.showToastWithAction(
|
||||
currentOverlayContext!,
|
||||
AppLocalizations.of(currentContext!).moved_to_mailbox(
|
||||
success.destinationMailboxName?.name ?? AppLocalizations.of(currentContext!).default_mailbox),
|
||||
AppLocalizations.of(currentContext!).undo_action,
|
||||
() {
|
||||
_undoMovingMailbox(MoveMailboxRequest(
|
||||
success.mailboxIdSelected,
|
||||
MoveAction.undo,
|
||||
destinationMailboxId: success.parentId,
|
||||
parentId: success.destinationMailboxId));
|
||||
},
|
||||
maxWidth: _responsiveUtils.getMaxWidthToast(currentContext!));
|
||||
}
|
||||
|
||||
refreshMailboxChanges();
|
||||
}
|
||||
|
||||
void _undoMovingMailbox(MoveMailboxRequest newMoveRequest) {
|
||||
final accountId = mailboxDashBoardController.accountId.value;
|
||||
if (accountId != null) {
|
||||
consumeState(_moveMailboxInteractor.execute(accountId, newMoveRequest));
|
||||
}
|
||||
}
|
||||
|
||||
void _createListMailboxNameAsStringInMailboxParent(PresentationMailbox mailboxRenamed) {
|
||||
if (mailboxRenamed.parentId == null) {
|
||||
final allChildrenAtMailboxLocation = (defaultMailboxTree.value.root.childrenItems ?? <MailboxNode>[]) + (folderMailboxTree.value.root.childrenItems ?? <MailboxNode>[]);
|
||||
@@ -715,7 +790,7 @@ class MailboxController extends BaseMailboxController {
|
||||
_openDialogRenameMailboxAction(context, mailbox);
|
||||
break;
|
||||
case MailboxActions.move:
|
||||
_appToast.showToast(AppLocalizations.of(context).the_feature_is_under_development);
|
||||
_moveMailboxAction(mailbox);
|
||||
break;
|
||||
case MailboxActions.markAsRead:
|
||||
_markAsReadMailboxAction(mailbox);
|
||||
|
||||
@@ -21,6 +21,8 @@ extension MailboxActionsExtension on MailboxActions {
|
||||
return AppLocalizations.of(context).mailbox_location;
|
||||
case MailboxActions.moveEmail:
|
||||
return AppLocalizations.of(context).move_message;
|
||||
case MailboxActions.move:
|
||||
return AppLocalizations.of(context).allMailboxes;
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ class MailBoxFolderTileBuilder {
|
||||
borderRadius: const BorderRadius.all(Radius.circular(14)),
|
||||
child: Container(
|
||||
color: Colors.white,
|
||||
padding: const EdgeInsets.only(left: 16, top: 8, bottom: 8),
|
||||
padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10),
|
||||
child: Row(children: [
|
||||
_buildLeadingMailboxItem(),
|
||||
const SizedBox(width: 8),
|
||||
|
||||
Reference in New Issue
Block a user