TF-1371 Update position of Identity in edit email
(cherry picked from commit f0c6a5716cd55c963606550b09d4f5ec4b2140a5)
This commit is contained in:
@@ -4,7 +4,8 @@ import 'package:model/model.dart';
|
||||
abstract class HtmlDataSource {
|
||||
Future<EmailContent> transformEmailContent(
|
||||
EmailContent emailContent,
|
||||
Map<String, String> mapUrlDownloadCID
|
||||
Map<String, String> mapUrlDownloadCID,
|
||||
{bool draftsEmail = false}
|
||||
);
|
||||
|
||||
Future<EmailContent> addTooltipWhenHoverOnLink(EmailContent emailContent);
|
||||
|
||||
@@ -14,11 +14,17 @@ class HtmlDataSourceImpl extends HtmlDataSource {
|
||||
|
||||
@override
|
||||
Future<EmailContent> transformEmailContent(
|
||||
EmailContent emailContent,
|
||||
Map<String, String>? mapUrlDownloadCID
|
||||
EmailContent emailContent,
|
||||
Map<String, String>? mapUrlDownloadCID,
|
||||
{bool draftsEmail = false}
|
||||
) {
|
||||
return Future.sync(() async {
|
||||
return await _htmlAnalyzer.transformEmailContent(emailContent, mapUrlDownloadCID, _dioClient);
|
||||
return await _htmlAnalyzer.transformEmailContent(
|
||||
emailContent,
|
||||
mapUrlDownloadCID,
|
||||
_dioClient,
|
||||
draftsEmail: draftsEmail
|
||||
);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,22 +1,34 @@
|
||||
|
||||
import 'package:core/core.dart';
|
||||
import 'package:core/data/network/dio_client.dart';
|
||||
import 'package:core/presentation/utils/html_transformer/dom/add_tooltip_link_transformers.dart';
|
||||
import 'package:core/presentation/utils/html_transformer/html_transform.dart';
|
||||
import 'package:core/presentation/utils/html_transformer/text/convert_url_string_to_html_links_transformers.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
|
||||
import 'package:model/email/email_content.dart';
|
||||
import 'package:model/email/email_content_type.dart';
|
||||
|
||||
class HtmlAnalyzer {
|
||||
|
||||
Future<EmailContent> transformEmailContent(
|
||||
EmailContent emailContent,
|
||||
Map<String, String>? mapUrlDownloadCID,
|
||||
DioClient dioClient
|
||||
EmailContent emailContent,
|
||||
Map<String, String>? mapUrlDownloadCID,
|
||||
DioClient dioClient,
|
||||
{bool draftsEmail = false}
|
||||
) async {
|
||||
switch(emailContent.type) {
|
||||
case EmailContentType.textHtml:
|
||||
final htmlTransform = HtmlTransform(
|
||||
emailContent.content,
|
||||
dioClient: dioClient,
|
||||
mapUrlDownloadCID: mapUrlDownloadCID);
|
||||
final htmlContent = await htmlTransform.transformToHtml();
|
||||
emailContent.content,
|
||||
dioClient: dioClient,
|
||||
mapUrlDownloadCID: mapUrlDownloadCID
|
||||
);
|
||||
|
||||
final htmlContent = await htmlTransform.transformToHtml(
|
||||
transformConfiguration: draftsEmail
|
||||
? TransformConfiguration.create(customDomTransformers: TransformConfiguration.domTransformersForDraftEmail)
|
||||
: null
|
||||
);
|
||||
|
||||
return EmailContent(emailContent.type, htmlContent);
|
||||
case EmailContentType.textPlain:
|
||||
final htmlTransform = HtmlTransform(emailContent.content);
|
||||
|
||||
@@ -90,7 +90,8 @@ class EmailRepositoryImpl extends EmailRepository {
|
||||
List<EmailContent> emailContents,
|
||||
List<Attachment> attachmentInlines,
|
||||
String? baseUrlDownload,
|
||||
AccountId accountId
|
||||
AccountId accountId,
|
||||
{bool draftsEmail = false}
|
||||
) async {
|
||||
final mapUrlDownloadCID = {
|
||||
for (var attachment in attachmentInlines)
|
||||
@@ -98,7 +99,11 @@ class EmailRepositoryImpl extends EmailRepository {
|
||||
};
|
||||
return await Future.wait(emailContents
|
||||
.map((emailContent) async {
|
||||
return await _htmlDataSource.transformEmailContent(emailContent, mapUrlDownloadCID);
|
||||
return await _htmlDataSource.transformEmailContent(
|
||||
emailContent,
|
||||
mapUrlDownloadCID,
|
||||
draftsEmail: draftsEmail
|
||||
);
|
||||
})
|
||||
.toList());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user