Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3421: Webhook action should display hint in Scheduler and Trigger.

Browse source
This commit is contained in:
Bola Ahmed Buari 2021-03-15 08:55:33 +00:00 committed by Thorsten Eckel
parent 07c9541350
commit b1ec8941d4
2 changed files with 5 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee
View file

@ -94,8 +94,7 @@ class App.UiElement.ticket_perform_action
item.on('change', '.js-attributeSelector select', (e) => item.on('change', '.js-attributeSelector select', (e) =>
elementRow = $(e.target).closest('.js-filterElement') elementRow = $(e.target).closest('.js-filterElement')
groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value') groupAndAttribute = elementRow.find('.js-attributeSelector option:selected').attr('value')
meta = params[attribute.name] && params[attribute.name][groupAndAttribute] || {} @rebuildAttributeSelectors(item, elementRow, groupAndAttribute, elements, {}, attribute)
@rebuildAttributeSelectors(item, elementRow, groupAndAttribute, elements, meta, attribute)
@updateAttributeSelectors(item) @updateAttributeSelectors(item)
) )
@ -426,6 +425,7 @@ class App.UiElement.ticket_perform_action
relation: 'Webhook' relation: 'Webhook'
value: meta.webhook_id value: meta.webhook_id
translate: false translate: false
nulloption: true
) )
else else
webhookSelection = App.view('generic/ticket_perform_action/webhook_not_available')( attribute: attribute ) webhookSelection = App.view('generic/ticket_perform_action/webhook_not_available')( attribute: attribute )

72
public/assets/tests/form_ticket_perform_action.js
View file

@ -692,74 +692,8 @@ test( "ticket_perform_action check when there's an available webhook", function(
var testNoticeMessage = 'No available webhook, please create a new one or activate an existing one at "Manage > Webhook"' var testNoticeMessage = 'No available webhook, please create a new one or activate an existing one at "Manage > Webhook"'
var noticeMessage = el.find('.controls.js-webhooks').text() var noticeMessage = el.find('.controls.js-webhooks').text()
notEqual(noticeMessage, testNoticeMessage, 'form shows message when webhook is not available') notEqual(noticeMessage, testNoticeMessage, 'form does not show notice message when webhook is available')
var noticeMessage = el.find('.controls.js-webhooks select option').first().text() var noticeMessage = el.find('.controls.js-webhooks select option').eq(1).text()
equal(noticeMessage, 'Webhook test (https://target.example.com/webhook)', 'form shows message when webhook is not available') equal(noticeMessage, 'Webhook test (https://target.example.com/webhook)', 'form shows available webhook when webhook is available')
});
test( "ticket_perform_action check when there's no available webhook but an inactive is already selected", function() {
$('#forms').append('<hr><h1>ticket_perform_action check when there\'s an available webhook</h1><form id="form8"></form>')
var el = $('#form8')
var defaults = {
ticket_perform_action8: {
'notification.webhook': {
webhook_id: 'c-2'
}
}
}
App.Webhook.refresh([
{
name: 'Webhook test',
endpoint: 'https://target.example.com/webhook',
active: false,
id: 'c-2'
}
], { clear: true })
new App.ControllerForm({
el: el,
model: {
configure_attributes: [
{
name: 'ticket_perform_action8',
display: 'TicketPerformAction8',
tag: 'ticket_perform_action',
null: true,
notification: true,
},
]
},
params: defaults,
autofocus: true
})
var params = App.ControllerForm.params(el)
var test_params = {
'ticket_perform_action8': {
'notification.webhook': {
'webhook_id': 'c-2'
}
}
}
deepEqual(params, test_params, 'form param check')
var testNoticeMessage = 'No available webhook, please create a new one or activate an existing one at "Manage > Webhook"'
var noticeMessage = el.find('.controls.js-webhooks div').text()
notEqual(noticeMessage, testNoticeMessage, 'form does not show notice message when inactive webhook is previously selected')
var noticeMessage = el.find('.controls.js-webhooks select option').first().text()
equal(noticeMessage, 'Webhook test (https://target.example.com/webhook) (inactive)', 'form shows previously selected inactive webhook')
// when other option are changed
el.find('select:first').val('notification.email').trigger('change')
el.find('select:first').val('notification.webhook').trigger('change')
var noticeMessage = el.find('.controls.js-webhooks div').text()
notEqual(noticeMessage, testNoticeMessage, 'form does not show notice message when inactive webhook is previously selected')
var noticeMessage = el.find('.controls.js-webhooks select option').first().text()
equal(noticeMessage, 'Webhook test (https://target.example.com/webhook) (inactive)', 'form shows previously selected inactive webhook')
}); });