Fixes #3822 - If selected value is not part of the restriction of set_fixed_to it should recalculate it with the new value.
This commit is contained in:
parent
c7f7af1199
commit
937f17e1a3
4 changed files with 53 additions and 9 deletions
|
@ -35,7 +35,12 @@ class CoreWorkflow::Result
|
||||||
|
|
||||||
# restrict init defaults to make sure param values to removed if not allowed
|
# restrict init defaults to make sure param values to removed if not allowed
|
||||||
attributes.restrict_values_default.each do |field, values|
|
attributes.restrict_values_default.each do |field, values|
|
||||||
run_backend_value('set_fixed_to', field, values)
|
|
||||||
|
# skip initial rerun to improve performance
|
||||||
|
# priority e.g. would trigger a rerun because its not set yet
|
||||||
|
# but we skip rerun here because the initial values have no logic which
|
||||||
|
# are dependent on form changes
|
||||||
|
run_backend_value('set_fixed_to', field, values, skip_rerun: true)
|
||||||
end
|
end
|
||||||
|
|
||||||
set_default_only_shown_if_selectable
|
set_default_only_shown_if_selectable
|
||||||
|
@ -89,21 +94,21 @@ class CoreWorkflow::Result
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def run_backend(field, perform_config)
|
def run_backend(field, perform_config, skip_rerun: false)
|
||||||
result = []
|
result = []
|
||||||
Array(perform_config['operator']).each do |backend|
|
Array(perform_config['operator']).each do |backend|
|
||||||
result << "CoreWorkflow::Result::#{backend.classify}".constantize.new(result_object: self, field: field, perform_config: perform_config).run
|
result << "CoreWorkflow::Result::#{backend.classify}".constantize.new(result_object: self, field: field, perform_config: perform_config, skip_rerun: skip_rerun).run
|
||||||
end
|
end
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|
||||||
def run_backend_value(backend, field, value)
|
def run_backend_value(backend, field, value, skip_rerun: false)
|
||||||
perform_config = {
|
perform_config = {
|
||||||
'operator' => backend,
|
'operator' => backend,
|
||||||
backend => value,
|
backend => value,
|
||||||
}
|
}
|
||||||
|
|
||||||
run_backend(field, perform_config)
|
run_backend(field, perform_config, skip_rerun: skip_rerun)
|
||||||
end
|
end
|
||||||
|
|
||||||
def match_workflow(workflow)
|
def match_workflow(workflow)
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
|
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
|
||||||
|
|
||||||
class CoreWorkflow::Result::Backend
|
class CoreWorkflow::Result::Backend
|
||||||
def initialize(result_object:, field:, perform_config:)
|
def initialize(result_object:, field:, perform_config:, skip_rerun: false)
|
||||||
@result_object = result_object
|
@result_object = result_object
|
||||||
@field = field
|
@field = field
|
||||||
@perform_config = perform_config
|
@perform_config = perform_config
|
||||||
|
@skip_rerun = skip_rerun
|
||||||
end
|
end
|
||||||
|
|
||||||
def field
|
def field
|
||||||
|
@ -12,6 +13,8 @@ class CoreWorkflow::Result::Backend
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_rerun
|
def set_rerun
|
||||||
|
return if @skip_rerun
|
||||||
|
|
||||||
@result_object.rerun = true
|
@result_object.rerun = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
class CoreWorkflow::Result::BaseOption < CoreWorkflow::Result::Backend
|
class CoreWorkflow::Result::BaseOption < CoreWorkflow::Result::Backend
|
||||||
def remove_excluded_param_values
|
def remove_excluded_param_values
|
||||||
return if skip?
|
|
||||||
|
|
||||||
if @result_object.payload['params'][field].is_a?(Array)
|
if @result_object.payload['params'][field].is_a?(Array)
|
||||||
remove_array
|
remove_array
|
||||||
elsif excluded_by_restrict_values?(@result_object.payload['params'][field])
|
elsif excluded_by_restrict_values?(@result_object.payload['params'][field])
|
||||||
|
@ -26,7 +24,7 @@ class CoreWorkflow::Result::BaseOption < CoreWorkflow::Result::Backend
|
||||||
end
|
end
|
||||||
|
|
||||||
def remove_string
|
def remove_string
|
||||||
@result_object.payload['params'][field] = nil
|
@result_object.payload['params'][field] = @result_object.result[:restrict_values][field]&.first
|
||||||
set_rerun
|
set_rerun
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1752,4 +1752,42 @@ RSpec.describe CoreWorkflow, type: :model do
|
||||||
expect(result[:restrict_values]['owner_id']).to eq([''])
|
expect(result[:restrict_values]['owner_id']).to eq([''])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'If selected value is not part of the restriction of set_fixed_to it should recalculate it with the new value #3822', db_strategy: :reset do
|
||||||
|
let(:field_name1) { SecureRandom.uuid }
|
||||||
|
let(:screens) do
|
||||||
|
{
|
||||||
|
'create_middle' => {
|
||||||
|
'ticket.agent' => {
|
||||||
|
'shown' => false,
|
||||||
|
'required' => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
let!(:workflow1) do
|
||||||
|
create(:core_workflow,
|
||||||
|
object: 'Ticket',
|
||||||
|
perform: { "ticket.#{field_name1}" => { 'operator' => 'set_fixed_to', 'set_fixed_to' => ['key_3'] } })
|
||||||
|
end
|
||||||
|
let!(:workflow2) do
|
||||||
|
create(:core_workflow,
|
||||||
|
object: 'Ticket',
|
||||||
|
condition_selected: {
|
||||||
|
"ticket.#{field_name1}": {
|
||||||
|
operator: 'is',
|
||||||
|
value: 'key_3',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
create :object_manager_attribute_select, name: field_name1, display: field_name1, screens: screens
|
||||||
|
ObjectManager::Attribute.migration_execute
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does select key_3 as new param value and based on this executes workflow 2' do
|
||||||
|
expect(result[:matched_workflows]).to include(workflow1.id, workflow2.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue