TF-1961 Transform html email content in composer
(cherry picked from commit f5470c130744242195b265a0ea4aad044ad8e740)
This commit is contained in:
@@ -1,12 +1,16 @@
|
||||
|
||||
import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
|
||||
import 'package:model/model.dart';
|
||||
|
||||
abstract class HtmlDataSource {
|
||||
Future<EmailContent> transformEmailContent(
|
||||
EmailContent emailContent,
|
||||
Map<String, String> mapUrlDownloadCID,
|
||||
{bool draftsEmail = false}
|
||||
Map<String, String> mapCidImageDownloadUrl,
|
||||
TransformConfiguration transformConfiguration
|
||||
);
|
||||
|
||||
Future<EmailContent> addTooltipWhenHoverOnLink(EmailContent emailContent);
|
||||
Future<String> transformHtmlEmailContent(
|
||||
String htmlContent,
|
||||
TransformConfiguration configuration
|
||||
);
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
|
||||
import 'package:model/email/email_content.dart';
|
||||
import 'package:tmail_ui_user/features/email/data/datasource/html_datasource.dart';
|
||||
import 'package:tmail_ui_user/features/email/data/local/html_analyzer.dart';
|
||||
@@ -13,22 +14,25 @@ class HtmlDataSourceImpl extends HtmlDataSource {
|
||||
@override
|
||||
Future<EmailContent> transformEmailContent(
|
||||
EmailContent emailContent,
|
||||
Map<String, String>? mapUrlDownloadCID,
|
||||
{bool draftsEmail = false}
|
||||
Map<String, String> mapCidImageDownloadUrl,
|
||||
TransformConfiguration transformConfiguration
|
||||
) {
|
||||
return Future.sync(() async {
|
||||
return await _htmlAnalyzer.transformEmailContent(
|
||||
emailContent,
|
||||
mapUrlDownloadCID,
|
||||
draftsEmail: draftsEmail
|
||||
mapCidImageDownloadUrl,
|
||||
transformConfiguration
|
||||
);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<EmailContent> addTooltipWhenHoverOnLink(EmailContent emailContent) {
|
||||
Future<String> transformHtmlEmailContent(String htmlContent, TransformConfiguration configuration) {
|
||||
return Future.sync(() async {
|
||||
return await _htmlAnalyzer.addTooltipWhenHoverOnLink(emailContent);
|
||||
return await _htmlAnalyzer.transformHtmlEmailContent(
|
||||
htmlContent,
|
||||
configuration
|
||||
);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,5 @@
|
||||
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:collection/collection.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/sanitize_autolink_html_transformers.dart';
|
||||
import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
|
||||
import 'package:html/parser.dart';
|
||||
import 'package:model/email/email_content.dart';
|
||||
@@ -14,32 +8,27 @@ import 'package:model/email/email_content_type.dart';
|
||||
class HtmlAnalyzer {
|
||||
|
||||
final HtmlTransform _htmlTransform;
|
||||
final HtmlEscape _htmlEscape;
|
||||
|
||||
HtmlAnalyzer(this._htmlTransform, this._htmlEscape);
|
||||
HtmlAnalyzer(this._htmlTransform);
|
||||
|
||||
Future<EmailContent> transformEmailContent(
|
||||
EmailContent emailContent,
|
||||
Map<String, String>? mapUrlDownloadCID,
|
||||
{bool draftsEmail = false}
|
||||
Map<String, String> mapCidImageDownloadUrl,
|
||||
TransformConfiguration transformConfiguration
|
||||
) async {
|
||||
switch(emailContent.type) {
|
||||
case EmailContentType.textHtml:
|
||||
final htmlContent = await _htmlTransform.transformToHtml(
|
||||
contentHtml: emailContent.content,
|
||||
mapUrlDownloadCID: mapUrlDownloadCID,
|
||||
transformConfiguration: draftsEmail
|
||||
? TransformConfiguration.create(customDomTransformers: TransformConfiguration.domTransformersForDraftEmail)
|
||||
: null
|
||||
htmlContent: emailContent.content,
|
||||
mapCidImageDownloadUrl: mapCidImageDownloadUrl,
|
||||
transformConfiguration: transformConfiguration
|
||||
);
|
||||
|
||||
return EmailContent(emailContent.type, htmlContent);
|
||||
case EmailContentType.textPlain:
|
||||
final message = _htmlTransform.transformToTextPlain(
|
||||
content: emailContent.content,
|
||||
transformConfiguration: TransformConfiguration.create(
|
||||
customTextTransformers: [SanitizeAutolinkHtmlTransformers(_htmlEscape)]
|
||||
)
|
||||
transformConfiguration: transformConfiguration
|
||||
);
|
||||
return EmailContent(emailContent.type, message);
|
||||
default:
|
||||
@@ -47,21 +36,6 @@ class HtmlAnalyzer {
|
||||
}
|
||||
}
|
||||
|
||||
Future<EmailContent> addTooltipWhenHoverOnLink(EmailContent emailContent) async {
|
||||
switch(emailContent.type) {
|
||||
case EmailContentType.textHtml:
|
||||
final htmlContent = await _htmlTransform.transformToHtml(
|
||||
contentHtml: emailContent.content,
|
||||
transformConfiguration: TransformConfiguration.create(
|
||||
customDomTransformers: [const AddTooltipLinkTransformer()]
|
||||
)
|
||||
);
|
||||
return EmailContent(emailContent.type, htmlContent);
|
||||
default:
|
||||
return emailContent;
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<String>> getListLinkCalendarEvent(String emailContents) async {
|
||||
final document = parse(emailContents);
|
||||
final linkElements = document.querySelectorAll('a.part-button');
|
||||
@@ -71,4 +45,15 @@ class HtmlAnalyzer {
|
||||
.toList();
|
||||
return listLink;
|
||||
}
|
||||
|
||||
Future<String> transformHtmlEmailContent(
|
||||
String htmlContent,
|
||||
TransformConfiguration configuration
|
||||
) async {
|
||||
final htmlContentTransformed = await _htmlTransform.transformToHtml(
|
||||
htmlContent: htmlContent,
|
||||
transformConfiguration: configuration
|
||||
);
|
||||
return htmlContentTransformed;
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import 'package:core/data/model/source_type/data_source_type.dart';
|
||||
import 'package:core/data/network/download/downloaded_response.dart';
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
@@ -109,22 +110,16 @@ class EmailRepositoryImpl extends EmailRepository {
|
||||
|
||||
@override
|
||||
Future<List<EmailContent>> transformEmailContent(
|
||||
List<EmailContent> emailContents,
|
||||
List<Attachment> attachmentInlines,
|
||||
String? baseUrlDownload,
|
||||
AccountId accountId,
|
||||
{bool draftsEmail = false}
|
||||
) async {
|
||||
final mapUrlDownloadCID = {
|
||||
for (var attachment in attachmentInlines)
|
||||
attachment.cid! : attachment.getDownloadUrl(baseUrlDownload!, accountId)
|
||||
};
|
||||
List<EmailContent> emailContents,
|
||||
Map<String, String> mapCidImageDownloadUrl,
|
||||
TransformConfiguration transformConfiguration
|
||||
) async {
|
||||
return await Future.wait(emailContents
|
||||
.map((emailContent) async {
|
||||
return await _htmlDataSource.transformEmailContent(
|
||||
emailContent,
|
||||
mapUrlDownloadCID,
|
||||
draftsEmail: draftsEmail
|
||||
mapCidImageDownloadUrl,
|
||||
transformConfiguration,
|
||||
);
|
||||
})
|
||||
.toList());
|
||||
@@ -173,13 +168,6 @@ class EmailRepositoryImpl extends EmailRepository {
|
||||
return emailDataSource[DataSourceType.network]!.deleteEmailPermanently(session, accountId, emailId);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<List<EmailContent>> addTooltipWhenHoverOnLink(List<EmailContent> emailContents) {
|
||||
return Future.wait(emailContents
|
||||
.map((emailContent) => _htmlDataSource.addTooltipWhenHoverOnLink(emailContent))
|
||||
.toList());
|
||||
}
|
||||
|
||||
@override
|
||||
Future<jmap.State?> getEmailState(Session session, AccountId accountId) {
|
||||
return _stateDataSource.getState(accountId, session.username, StateType.email);
|
||||
@@ -219,4 +207,9 @@ class EmailRepositoryImpl extends EmailRepository {
|
||||
Future<DetailedEmail> getStoredNewEmail(Session session, AccountId accountId, EmailId emailId) {
|
||||
return emailDataSource[DataSourceType.hiveCache]!.getStoredNewEmail(session, accountId, emailId);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<String> transformHtmlEmailContent(String htmlContent, TransformConfiguration configuration) {
|
||||
return _htmlDataSource.transformHtmlEmailContent(htmlContent, configuration);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user