Fixes #3014 - Fullquote Header for forwarded mails. Thanks to @drbw ❤️

This commit is contained in:
Mantas Masalskis 2020-04-28 00:53:06 +03:00 committed by Thorsten Eckel
parent 5d51eb68f6
commit 9b459556cd
2 changed files with 124 additions and 7 deletions

View file

@ -148,12 +148,7 @@ class EmailReply extends App.Controller
selected = App.Utils.text2html(selected) selected = App.Utils.text2html(selected)
if selected if selected
quote_header = '' quote_header = @fullQuoteHeader(article)
if App.Config.get('ui_ticket_zoom_article_email_full_quote_header')
date = @date_format(article.created_at)
name = article.updated_by.displayName()
email = article.updated_by.email
quote_header = App.i18n.translateInline('On %s, %s wrote:', date, name) + '<br><br>'
selected = "<div><br><br/></div><div><blockquote type=\'cite\'>#{quote_header}#{selected}<br></blockquote></div><div><br></div>" selected = "<div><br><br/></div><div><blockquote type=\'cite\'>#{quote_header}#{selected}<br></blockquote></div><div><br></div>"
@ -201,7 +196,9 @@ class EmailReply extends App.Controller
body = App.Utils.textCleanup(article.body) body = App.Utils.textCleanup(article.body)
body = App.Utils.text2html(body) body = App.Utils.text2html(body)
body = "<br/><div>---Begin forwarded message:---<br/><br/></div><div><blockquote type=\"cite\">#{body}</blockquote></div><div><br></div>" quote_header = @fullQuoteHeader(article)
body = "<br/><div>---Begin forwarded message:---<br/><br/></div><div><blockquote type=\"cite\">#{quote_header}#{body}</blockquote></div><div><br></div>"
articleNew = {} articleNew = {}
articleNew.body = body articleNew.body = body
@ -342,4 +339,13 @@ class EmailReply extends App.Controller
true true
@fullQuoteHeader: (article) ->
if !App.Config.get('ui_ticket_zoom_article_email_full_quote_header')
return ''
date = @date_format(article.created_at)
name = article.updated_by.displayName()
App.i18n.translateInline('On %s, %s wrote:', date, name) + '<br><br>'
App.Config.set('200-EmailReply', EmailReply, 'TicketZoomArticleAction') App.Config.set('200-EmailReply', EmailReply, 'TicketZoomArticleAction')

View file

@ -0,0 +1,111 @@
require 'rails_helper'
RSpec.describe 'Ticket > Update > Full Quote Header', type: :system, time_zone: 'Europe/London' do
let(:group) { Group.find_by(name: 'Users') }
let(:ticket) { create(:ticket, group: group) }
let(:ticket_article) { create(:ticket_article, ticket: ticket, from: 'Example Name <asdf1@example.com>') }
let(:customer) { create(:customer) }
prepend_before do
Setting.set 'ui_ticket_zoom_article_email_full_quote_header', full_quote_header_setting
end
before do
UserInfo.current_user_id = customer.id
visit "ticket/zoom/#{ticket_article.ticket.id}"
end
context 'when "ui_ticket_zoom_article_email_full_quote_header" is enabled' do
let(:full_quote_header_setting) { true }
it 'includes OP when forwarding' do
within(:active_content) do
click_forward
within(:richtext) do
expect(page).to contain_full_quote(ticket_article)
end
end
end
it 'includes OP when replying' do
within(:active_content) do
highlight_and_click_reply
within(:richtext) do
expect(page).to contain_full_quote(ticket_article)
end
end
end
end
context 'when "ui_ticket_zoom_article_email_full_quote_header" is disabled' do
let(:full_quote_header_setting) { false }
it 'does not include OP when forwarding' do
within(:active_content) do
click_forward
within(:richtext) do
expect(page).not_to contain_full_quote(ticket_article)
end
end
end
it 'does not include OP when replying' do
within(:active_content) do
highlight_and_click_reply
within(:richtext) do
expect(page).not_to contain_full_quote(ticket_article)
end
end
end
end
def click_forward
click '.js-ArticleAction[data-type=emailForward]'
end
def highlight_and_click_reply
find('.ticket-article-item .textBubble')
.execute_script <<~JAVASCRIPT
window.getSelection().removeAllRanges()
var range = window.document.createRange()
range.setStart(this, 0)
range.setEnd(this.nextSibling, 0)
window.getSelection().addRange(range)
JAVASCRIPT
click '.js-ArticleAction[data-type=emailReply]'
end
define :contain_full_quote do
match do
citation.has_text?(name) && citation.has_no_text?(email) && citation.has_text?(timestamp)
end
match_when_negated do
citation.has_no_text?(name) && citation.has_no_text?(email) && citation.has_no_text?(timestamp)
end
def citation
actual.first('blockquote[type=cite]')
end
def name
expected.created_by.fullname
end
def email
expected.created_by.email
end
def timestamp
expected
.created_at
.in_time_zone('Europe/London')
.strftime('%A, %B %1d, %Y, %1I:%M:%S %p')
end
end
end