Fixes #3129 - Deactivation of signature does not clear it from groups

This commit is contained in:
Romit Choudhary 2021-12-20 15:01:34 +01:00 committed by Mantas Masalskis
parent a5c728609d
commit 250d0bbd5e
7 changed files with 87 additions and 14 deletions

View file

@ -35,8 +35,43 @@ class App.UiElement.select extends App.UiElement.ApplicationUiElement
# filter attributes # filter attributes
@filterOption(attribute, params) @filterOption(attribute, params)
item = $( App.view('generic/select')(attribute: attribute) )
# bind event listeners
@bindEventListeners(item, attribute, params)
# return item # return item
$( App.view('generic/select')(attribute: attribute) ) item
@bindEventListeners: (item, attribute, params) ->
if attribute.display_warn
item.bind('change', (e) =>
@bindWarnDisplayListener(e.target.value, attribute, params, item)
)
# initialization for default selection
@bindWarnDisplayListener(attribute.value, attribute, params, item)
@bindWarnDisplayListener: (selectedVal, attribute, params, item) ->
warn_visible = @shouldDisplayWarn(selectedVal, attribute, params)
@toggleDisplayWarn(warn_visible, attribute, item)
@shouldDisplayWarn: (selectedVal, attribute, params) ->
return if !selectedVal
return if !params
params[attribute.name + '_is_display_warning'](selectedVal)
@toggleDisplayWarn: (warn_visible, attribute, item) ->
if !warn_visible
item.removeClass('display-warn')
item.find('.alert--warning').remove()
return
item.addClass('display-warn')
warn_elem = $('<div class="alert alert--warning" role="alert"></div>')
warn_elem.html(attribute.warn)
item.append(warn_elem)
# 1. If attribute.value is not among the current options, then search within historical options # 1. If attribute.value is not among the current options, then search within historical options
# 2. If attribute.value is not among current and historical options, then add the value itself as an option # 2. If attribute.value is not among current and historical options, then add the value itself as an option

View file

@ -11,7 +11,7 @@ class TicketCreateFormHandlerSignature
# check if signature needs to be added # check if signature needs to be added
type = ui.el.closest('.content').find('[name="formSenderType"]').val() type = ui.el.closest('.content').find('[name="formSenderType"]').val()
if signature && signature.body && type is 'email-out' if signature && signature.active && signature.body && type is 'email-out'
signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), config: App.Config.all() }) signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), config: App.Config.all() })
currentBody = ui.el.closest('.content').find('[data-name=body]') currentBody = ui.el.closest('.content').find('[data-name=body]')

View file

@ -339,7 +339,7 @@ class EmailReply extends App.Controller
signature = App.Signature.find(group.signature_id) signature = App.Signature.find(group.signature_id)
# add/replace signature # add/replace signature
if signature && signature.body if signature && signature.active && signature.body
# if signature has changed, remove it # if signature has changed, remove it
signature_id = ui.$('[data-signature=true]').data('signature-id') signature_id = ui.$('[data-signature=true]').data('signature-id')

View file

@ -9,7 +9,7 @@ class App.Group extends App.Model
{ name: 'follow_up_possible', display: __('Follow-up possible'),tag: 'select', default: 'yes', options: { yes: 'yes', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, null: false, note: __('Follow-up for closed ticket possible or not.'), translate: true }, { name: 'follow_up_possible', display: __('Follow-up possible'),tag: 'select', default: 'yes', options: { yes: 'yes', 'new_ticket': 'do not reopen Ticket but create new Ticket' }, null: false, note: __('Follow-up for closed ticket possible or not.'), translate: true },
{ name: 'follow_up_assignment', display: __('Assign follow-ups'), tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, null: false, note: __('Assign follow-up to latest agent again.'), translate: true }, { name: 'follow_up_assignment', display: __('Assign follow-ups'), tag: 'select', default: 'yes', options: { true: 'yes', false: 'no' }, null: false, note: __('Assign follow-up to latest agent again.'), translate: true },
{ name: 'email_address_id', display: __('Email'), tag: 'select', multiple: false, null: true, relation: 'EmailAddress', nulloption: true, do_not_log: true }, { name: 'email_address_id', display: __('Email'), tag: 'select', multiple: false, null: true, relation: 'EmailAddress', nulloption: true, do_not_log: true },
{ name: 'signature_id', display: __('Signature'), tag: 'select', multiple: false, null: true, relation: 'Signature', nulloption: true, do_not_log: true }, { name: 'signature_id', display: __('Signature'), tag: 'select', multiple: false, null: true, relation: 'Signature', nulloption: true, do_not_log: true, display_warn: true, warn: __('This signature is inactive, it won\'t be included in the reply. Change state <a href="#channels/email">here</a>') },
{ name: 'note', display: __('Note'), tag: 'textarea', note: __('Notes are visible to agents only, never to customers.'), limit: 250, null: true }, { name: 'note', display: __('Note'), tag: 'textarea', note: __('Notes are visible to agents only, never to customers.'), limit: 250, null: true },
{ name: 'updated_at', display: __('Updated'), tag: 'datetime', readonly: 1 }, { name: 'updated_at', display: __('Updated'), tag: 'datetime', readonly: 1 },
{ name: 'active', display: __('Active'), tag: 'active', default: true }, { name: 'active', display: __('Active'), tag: 'active', default: true },
@ -43,3 +43,6 @@ class App.Group extends App.Model
change: 'Change' change: 'Change'
overview: 'Overview' overview: 'Overview'
full: 'Full' full: 'Full'
signature_id_is_display_warning: (signature_id) ->
!App.Signature.find(signature_id).active

View file

@ -1,4 +1,5 @@
<div class="controls controls--select"> <div class="controls controls--select">
<div class='relative'>
<select <% if @attribute.id: %>id="<%= @attribute.id %>"<% end %> class="form-control<%= " #{ @attribute.class }" if @attribute.class %>" name="<%= @attribute.name %>" <%= @attribute.multiple %> <%= @attribute.required %> <%= @attribute.autofocus %> <% if @attribute.disabled: %> disabled<% end %>> <select <% if @attribute.id: %>id="<%= @attribute.id %>"<% end %> class="form-control<%= " #{ @attribute.class }" if @attribute.class %>" name="<%= @attribute.name %>" <%= @attribute.multiple %> <%= @attribute.required %> <%= @attribute.autofocus %> <% if @attribute.disabled: %> disabled<% end %>>
<% if @attribute.options: %> <% if @attribute.options: %>
<% for row in @attribute.options: %> <% for row in @attribute.options: %>
@ -10,3 +11,4 @@
<%- @Icon('arrow-down') %> <%- @Icon('arrow-down') %>
<% end %> <% end %>
</div> </div>
</div>

View file

@ -9016,6 +9016,10 @@ msgstr ""
msgid "This service shows you contacts of incoming calls and a caller list in realtime." msgid "This service shows you contacts of incoming calls and a caller list in realtime."
msgstr "" msgstr ""
#: app/assets/javascripts/app/models/group.coffee
msgid "This signature is inactive, it won't be included in the reply. Change state <a href=\"#channels/email\">here</a>"
msgstr ""
#: app/assets/javascripts/app/controllers/_application_controller/generic_history.coffee #: app/assets/javascripts/app/controllers/_application_controller/generic_history.coffee
msgid "This ticket was merged into" msgid "This ticket was merged into"
msgstr "" msgstr ""

View file

@ -9,6 +9,35 @@ RSpec.describe 'Manage > Groups', type: :system do
include_examples 'pagination', model: :group, klass: Group, path: 'manage/groups' include_examples 'pagination', model: :group, klass: Group, path: 'manage/groups'
end end
# Fixes GitHub Issue#3129 - Deactivation of signature does not clear it from groups
describe 'When active status of signature assigned to a group is changed', authenticated_as: -> { user } do
let(:user) { create(:admin, groups: [group]) }
let(:group) { create(:group, signature_id: signature.id) }
let(:signature) { create(:signature) }
it 'does not display warning, when signature is active' do
visit '#manage/groups'
click "tr[data-id='#{group.id}']"
expect(page).to have_select('signature_id', selected: signature.name)
.and have_no_css('.alert--warning')
end
context 'When signature is marked inactive' do
let(:signature) { create(:signature, active: false) }
it 'displays warning' do
visit '#manage/groups'
click "tr[data-id='#{group.id}']"
expect(page).to have_select('signature_id', selected: signature.name)
.and have_css('.alert--warning')
end
end
end
describe 'Core Workflow' do describe 'Core Workflow' do
include_examples 'core workflow' do include_examples 'core workflow' do
let(:object_name) { 'Group' } let(:object_name) { 'Group' }