KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Handle rendering HTML only email in UI (#1987)

Browse source
This commit is contained in:
Pranav Raj S 2021-03-27 13:29:04 +05:30 • committed by GitHub
parent 8612f307b3
commit 8285f5df15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/javascript/dashboard/components/widgets/conversation/Message.vue
View file

@ -107,11 +107,23 @@ export default {
this.contentAttributes,
this.$t('CONVERSATION.NO_RESPONSE')
);
let messageContent =
this.formatMessage(this.data.content, this.isATweet) +
botMessageContent;
return messageContent;
const {
email: { html_content: { full: fullHTMLContent } = {} } = {},
} = this.contentAttributes;
if (fullHTMLContent && this.isIncoming) {
let parsedContent = new DOMParser().parseFromString(
fullHTMLContent || '',
'text/html'
);
if (!parsedContent.getElementsByTagName('parsererror').length) {
return parsedContent.body.innerHTML;
}
}
return (
this.formatMessage(this.data.content, this.isATweet) + botMessageContent
);
},
contentAttributes() {
return this.data.content_attributes || {};
@ -261,4 +273,10 @@ export default {
margin-left: var(--space-smaller);
}
}
// This is a hack to hide quoted content from GMAIL
// Replace this with actual content parser
.gmail_quote {
display: none;
}
</style>