TF-56 Implement upload multiple attachment
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
class UploadAttachmentLoadingState extends UIState {
|
class UploadAttachmentLoadingState extends UIState {
|
||||||
@@ -22,6 +23,33 @@ class UploadAttachmentFailure extends FeatureFailure {
|
|||||||
|
|
||||||
UploadAttachmentFailure(this.exception);
|
UploadAttachmentFailure(this.exception);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object> get props => [exception];
|
||||||
|
}
|
||||||
|
|
||||||
|
class UploadAttachmentAllSuccess extends UIState {
|
||||||
|
final List<Either<Failure, Success>> listResults;
|
||||||
|
|
||||||
|
UploadAttachmentAllSuccess(this.listResults);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [listResults];
|
||||||
|
}
|
||||||
|
|
||||||
|
class UploadAttachmentHasSomeFailure extends UIState {
|
||||||
|
final List<Either<Failure, Success>> listResults;
|
||||||
|
|
||||||
|
UploadAttachmentHasSomeFailure(this.listResults);
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [listResults];
|
||||||
|
}
|
||||||
|
|
||||||
|
class UploadAttachmentAllFailure extends FeatureFailure {
|
||||||
|
final exception;
|
||||||
|
|
||||||
|
UploadAttachmentAllFailure(this.exception);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object> get props => [exception];
|
List<Object> get props => [exception];
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,6 @@ class UploadAttachmentInteractor {
|
|||||||
|
|
||||||
Stream<Either<Failure, Success>> execute(FileInfo fileInfo, AccountId accountId, Uri uploadUrl) async* {
|
Stream<Either<Failure, Success>> execute(FileInfo fileInfo, AccountId accountId, Uri uploadUrl) async* {
|
||||||
try {
|
try {
|
||||||
yield Right<Failure, Success>(UploadAttachmentLoadingState());
|
|
||||||
final result = await Future.wait(
|
final result = await Future.wait(
|
||||||
[_credentialRepository.getUserName(), _credentialRepository.getPassword()],
|
[_credentialRepository.getUserName(), _credentialRepository.getPassword()],
|
||||||
eagerError: true
|
eagerError: true
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import 'package:core/core.dart';
|
||||||
|
import 'package:dartz/dartz.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
import 'package:model/model.dart';
|
||||||
|
import 'package:tmail_ui_user/features/composer/domain/state/upload_attachment_state.dart';
|
||||||
|
import 'package:tmail_ui_user/features/composer/domain/usecases/upload_attachment_interactor.dart';
|
||||||
|
|
||||||
|
class UploadMultipleAttachmentInteractor {
|
||||||
|
final UploadAttachmentInteractor _uploadAttachmentInteractor;
|
||||||
|
|
||||||
|
UploadMultipleAttachmentInteractor(this._uploadAttachmentInteractor);
|
||||||
|
|
||||||
|
Stream<Either<Failure, Success>> execute(List<FileInfo> listFiles, AccountId accountId, Uri uploadUrl) async* {
|
||||||
|
try {
|
||||||
|
yield Right<Failure, Success>(UploadAttachmentLoadingState());
|
||||||
|
final listResult = await Future.wait(
|
||||||
|
listFiles.map((fileInfo) async {
|
||||||
|
final result = await _uploadAttachmentInteractor.execute(fileInfo, accountId, uploadUrl).toList();
|
||||||
|
return result.first;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
if (listResult.length == 1) {
|
||||||
|
yield listResult.first;
|
||||||
|
} else {
|
||||||
|
final listResultSuccess = listResult.where((either) => either.isRight()).toList();
|
||||||
|
if (listResultSuccess.length == listResult.length) {
|
||||||
|
yield Right<Failure, Success>(UploadAttachmentHasSomeFailure(listResultSuccess));
|
||||||
|
} else {
|
||||||
|
yield Right<Failure, Success>(UploadAttachmentAllSuccess(listResult));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
yield Left<Failure, Success>(UploadAttachmentAllFailure(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ import 'package:tmail_ui_user/features/composer/domain/usecases/upload_attachmen
|
|||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/save_email_addresses_interactor.dart';
|
import 'package:tmail_ui_user/features/composer/domain/usecases/save_email_addresses_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
|
import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
|
import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
|
||||||
|
import 'package:tmail_ui_user/features/composer/domain/usecases/upload_mutiple_attachment_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/presentation/composer_controller.dart';
|
import 'package:tmail_ui_user/features/composer/presentation/composer_controller.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/login/data/repository/credential_repository_impl.dart';
|
import 'package:tmail_ui_user/features/login/data/repository/credential_repository_impl.dart';
|
||||||
@@ -73,6 +74,7 @@ class ComposerBindings extends Bindings {
|
|||||||
Get.lazyPut(() => UploadAttachmentInteractor(
|
Get.lazyPut(() => UploadAttachmentInteractor(
|
||||||
Get.find<ComposerRepository>(),
|
Get.find<ComposerRepository>(),
|
||||||
Get.find<CredentialRepository>()));
|
Get.find<CredentialRepository>()));
|
||||||
|
Get.lazyPut(() => UploadMultipleAttachmentInteractor(Get.find<UploadAttachmentInteractor>()));
|
||||||
Get.lazyPut(() => ComposerController(
|
Get.lazyPut(() => ComposerController(
|
||||||
Get.find<SendEmailInteractor>(),
|
Get.find<SendEmailInteractor>(),
|
||||||
Get.find<SaveEmailAddressesInteractor>(),
|
Get.find<SaveEmailAddressesInteractor>(),
|
||||||
@@ -85,6 +87,6 @@ class ComposerBindings extends Bindings {
|
|||||||
Get.find<HtmlMessagePurifier>()));
|
Get.find<HtmlMessagePurifier>()));
|
||||||
Get.find<HtmlEditorController>(),
|
Get.find<HtmlEditorController>(),
|
||||||
Get.find<LocalFilePickerInteractor>(),
|
Get.find<LocalFilePickerInteractor>(),
|
||||||
Get.find<UploadAttachmentInteractor>()));
|
Get.find<UploadMultipleAttachmentInteractor>()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,9 +27,9 @@ import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete
|
|||||||
import 'package:tmail_ui_user/features/composer/domain/state/upload_attachment_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/upload_attachment_state.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/search_email_address_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/search_email_address_state.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/send_email_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/send_email_state.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/upload_attachment_interactor.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/save_email_addresses_interactor.dart';
|
import 'package:tmail_ui_user/features/composer/domain/usecases/save_email_addresses_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
|
import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
|
||||||
|
import 'package:tmail_ui_user/features/composer/domain/usecases/upload_mutiple_attachment_interactor.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
|
import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/constants/email_constants.dart';
|
import 'package:tmail_ui_user/features/email/presentation/constants/email_constants.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/extensions/email_content_extension.dart';
|
import 'package:tmail_ui_user/features/email/presentation/extensions/email_content_extension.dart';
|
||||||
@@ -60,7 +60,7 @@ class ComposerController extends BaseController {
|
|||||||
final HtmlMessagePurifier _htmlMessagePurifier;
|
final HtmlMessagePurifier _htmlMessagePurifier;
|
||||||
final HtmlEditorController htmlEditorController;
|
final HtmlEditorController htmlEditorController;
|
||||||
final LocalFilePickerInteractor _localFilePickerInteractor;
|
final LocalFilePickerInteractor _localFilePickerInteractor;
|
||||||
final UploadAttachmentInteractor _uploadAttachmentInteractor;
|
final UploadMultipleAttachmentInteractor _uploadMultipleAttachmentInteractor;
|
||||||
|
|
||||||
List<EmailAddress> listToEmailAddress = [];
|
List<EmailAddress> listToEmailAddress = [];
|
||||||
List<EmailAddress> listCcEmailAddress = [];
|
List<EmailAddress> listCcEmailAddress = [];
|
||||||
@@ -82,7 +82,7 @@ class ComposerController extends BaseController {
|
|||||||
this._htmlMessagePurifier,
|
this._htmlMessagePurifier,
|
||||||
this.htmlEditorController,
|
this.htmlEditorController,
|
||||||
this._localFilePickerInteractor,
|
this._localFilePickerInteractor,
|
||||||
this._uploadAttachmentInteractor,
|
this._uploadMultipleAttachmentInteractor,
|
||||||
);
|
);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -101,7 +101,8 @@ class ComposerController extends BaseController {
|
|||||||
_sendEmailFailure(failure);
|
_sendEmailFailure(failure);
|
||||||
} else if (failure is LocalFilePickerFailure || failure is LocalFilePickerCancel) {
|
} else if (failure is LocalFilePickerFailure || failure is LocalFilePickerCancel) {
|
||||||
_pickFileFailure(failure);
|
_pickFileFailure(failure);
|
||||||
} else if (failure is UploadAttachmentFailure) {
|
} else if (failure is UploadAttachmentFailure
|
||||||
|
|| failure is UploadAttachmentAllFailure) {
|
||||||
_uploadAttachmentsFailure(failure);
|
_uploadAttachmentsFailure(failure);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -110,7 +111,9 @@ class ComposerController extends BaseController {
|
|||||||
_sendEmailSuccess(success);
|
_sendEmailSuccess(success);
|
||||||
} else if (success is LocalFilePickerSuccess) {
|
} else if (success is LocalFilePickerSuccess) {
|
||||||
_pickFileSuccess(success);
|
_pickFileSuccess(success);
|
||||||
} else if (success is UploadAttachmentSuccess) {
|
} else if (success is UploadAttachmentSuccess
|
||||||
|
|| success is UploadAttachmentAllSuccess
|
||||||
|
|| success is UploadAttachmentHasSomeFailure) {
|
||||||
_uploadAttachmentsSuccess(success);
|
_uploadAttachmentsSuccess(success);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -366,16 +369,16 @@ class ComposerController extends BaseController {
|
|||||||
|
|
||||||
void _pickFileSuccess(Success success) {
|
void _pickFileSuccess(Success success) {
|
||||||
if (success is LocalFilePickerSuccess) {
|
if (success is LocalFilePickerSuccess) {
|
||||||
_uploadAttachmentsAction(success.fileInfo);
|
_uploadAttachmentsAction(success.pickedFiles);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _uploadAttachmentsAction(FileInfo fileInfo) async {
|
void _uploadAttachmentsAction(List<FileInfo> pickedFiles) async {
|
||||||
if (composerArguments.value != null) {
|
if (composerArguments.value != null) {
|
||||||
final accountId = composerArguments.value!.session.accounts.keys.first;
|
final accountId = composerArguments.value!.session.accounts.keys.first;
|
||||||
final uploadUrl = composerArguments.value!.session.getUploadUrl(accountId);
|
final uploadUrl = composerArguments.value!.session.getUploadUrl(accountId);
|
||||||
|
|
||||||
consumeState(_uploadAttachmentInteractor.execute(fileInfo, accountId, uploadUrl));
|
consumeState(_uploadMultipleAttachmentInteractor.execute(pickedFiles, accountId, uploadUrl));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -388,9 +391,25 @@ class ComposerController extends BaseController {
|
|||||||
void _uploadAttachmentsSuccess(Success success) {
|
void _uploadAttachmentsSuccess(Success success) {
|
||||||
if (success is UploadAttachmentSuccess) {
|
if (success is UploadAttachmentSuccess) {
|
||||||
attachments.add(success.attachment);
|
attachments.add(success.attachment);
|
||||||
if (Get.context != null) {
|
} else if (success is UploadAttachmentAllSuccess) {
|
||||||
_appToast.showSuccessToast(AppLocalizations.of(Get.context!).attachments_uploaded_successfully);
|
final listAttachment = success.listResults
|
||||||
}
|
.map((either) => either
|
||||||
|
.map((result) => (result as UploadAttachmentSuccess).attachment)
|
||||||
|
.toIterable().first)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
attachments.addAll(listAttachment);
|
||||||
|
} else if (success is UploadAttachmentHasSomeFailure) {
|
||||||
|
final listAttachment = success.listResults
|
||||||
|
.map((either) => either
|
||||||
|
.map((result) => (result as UploadAttachmentSuccess).attachment)
|
||||||
|
.toIterable().first)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
attachments.addAll(listAttachment);
|
||||||
|
}
|
||||||
|
if (Get.context != null) {
|
||||||
|
_appToast.showSuccessToast(AppLocalizations.of(Get.context!).attachments_uploaded_successfully);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,12 +3,12 @@ import 'package:core/core.dart';
|
|||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
class LocalFilePickerSuccess extends UIState {
|
class LocalFilePickerSuccess extends UIState {
|
||||||
final FileInfo fileInfo;
|
final List<FileInfo> pickedFiles;
|
||||||
|
|
||||||
LocalFilePickerSuccess(this.fileInfo);
|
LocalFilePickerSuccess(this.pickedFiles);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object> get props => [fileInfo];
|
List<Object> get props => [pickedFiles];
|
||||||
}
|
}
|
||||||
|
|
||||||
class LocalFilePickerFailure extends FeatureFailure {
|
class LocalFilePickerFailure extends FeatureFailure {
|
||||||
|
|||||||
@@ -11,15 +11,14 @@ class LocalFilePickerInteractor {
|
|||||||
|
|
||||||
Stream<Either<Failure, Success>> execute({FileType fileType = FileType.any}) async* {
|
Stream<Either<Failure, Success>> execute({FileType fileType = FileType.any}) async* {
|
||||||
try {
|
try {
|
||||||
final filesResult = await FilePicker.platform.pickFiles(type: fileType);
|
final filesResult = await FilePicker.platform.pickFiles(type: fileType, allowMultiple: true);
|
||||||
if (filesResult != null && filesResult.files.isNotEmpty) {
|
if (filesResult != null && filesResult.files.isNotEmpty) {
|
||||||
final platformFile = filesResult.files.first;
|
final fileInfoResults = filesResult.files
|
||||||
final fileInfoResult = FileInfo(
|
.map((platformFile) => FileInfo(
|
||||||
platformFile.name,
|
platformFile.name,
|
||||||
platformFile.path ?? '',
|
platformFile.path ?? '',
|
||||||
platformFile.size,
|
platformFile.size)).toList();
|
||||||
);
|
yield Right<Failure, Success>(LocalFilePickerSuccess(fileInfoResults));
|
||||||
yield Right<Failure, Success>(LocalFilePickerSuccess(fileInfoResult));
|
|
||||||
} else {
|
} else {
|
||||||
yield Left<Failure, Success>(LocalFilePickerCancel());
|
yield Left<Failure, Success>(LocalFilePickerCancel());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user