-
id="<%= @attribute.id %>"<% end %>
- name="<%= @attribute.name %>"
- <%= @attribute.required %>
- <%= @attribute.autofocus %>
- value="<%= @attribute.value %>"
- tabindex="-1"
- <% if @attribute.disabled: %> disabled<% end %>
- >
-
"
- placeholder="<%= @attribute.placeholder %>"
- value="<%= @attribute.valueName %>"
- autocomplete="off"
- <%= @attribute.required %>
- <% if @attribute.disabled: %> disabled<% end %>
- >
+
diff --git a/public/assets/tests/qunit/form_extended.js b/public/assets/tests/qunit/form_extended.js
index cd7026252..f06136cc1 100644
--- a/public/assets/tests/qunit/form_extended.js
+++ b/public/assets/tests/qunit/form_extended.js
@@ -531,17 +531,18 @@ QUnit.test('form checks', assert => {
operator: 'is not',
pre_condition: 'specific',
value: '12',
+ value_completion: '',
},
'ticket.owner_id': {
operator: 'is',
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith
',
+ value_completion: '',
},
'ticket.created_by_id': {
operator: 'is',
pre_condition: 'current_user.id',
- value: '',
+ value: null,
value_completion: ''
},
},
@@ -552,7 +553,7 @@ QUnit.test('form checks', assert => {
'ticket.owner_id': {
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith '
+ value_completion: ''
},
'ticket.priority_id': {
value: '3',
@@ -596,17 +597,18 @@ QUnit.test('form checks', assert => {
operator: 'is not',
pre_condition: 'specific',
value: '12',
+ value_completion: '',
},
'ticket.owner_id': {
operator: 'is',
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith ',
+ value_completion: '',
},
'ticket.created_by_id': {
operator: 'is',
pre_condition: 'current_user.id',
- value: '',
+ value: null,
value_completion: ''
},
},
@@ -617,7 +619,7 @@ QUnit.test('form checks', assert => {
'ticket.owner_id': {
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith '
+ value_completion: ''
},
'ticket.tags': {
operator: 'remove',
@@ -657,17 +659,18 @@ QUnit.test('form checks', assert => {
operator: 'is not',
pre_condition: 'specific',
value: '12',
+ value_completion: '',
},
'ticket.owner_id': {
operator: 'is',
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith ',
+ value_completion: '',
},
'ticket.created_by_id': {
operator: 'is',
pre_condition: 'current_user.id',
- value: '',
+ value: null,
value_completion: ''
},
},
@@ -678,7 +681,7 @@ QUnit.test('form checks', assert => {
'ticket.owner_id': {
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith '
+ value_completion: ''
},
'ticket.tags': {
operator: 'remove',
@@ -714,17 +717,18 @@ QUnit.test('form checks', assert => {
operator: 'is not',
pre_condition: 'specific',
value: '12',
+ value_completion: '',
},
'ticket.owner_id': {
operator: 'is',
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith ',
+ value_completion: '',
},
'ticket.created_by_id': {
operator: 'is',
pre_condition: 'current_user.id',
- value: '',
+ value: null,
value_completion: ''
},
},
@@ -735,7 +739,7 @@ QUnit.test('form checks', assert => {
'ticket.owner_id': {
pre_condition: 'specific',
value: '47',
- value_completion: 'Bob Smith '
+ value_completion: ''
},
'notification.email': {
recipient: 'ticket_owner',
@@ -849,4 +853,167 @@ QUnit.test('form checks', assert => {
},
}
assert.deepEqual(params, test_params, 'form article body param check')
+
+ App.User.refresh([
+ {
+ id: 44,
+ login: 'bod@example.com',
+ email: 'bod@example.com',
+ firstname: 'Bob',
+ lastname: 'Smith',
+ active: true,
+ created_at: '2014-06-10T11:17:34.000Z',
+ },
+ {
+ id: 45,
+ login: 'john@example.com',
+ email: 'john@example.com',
+ firstname: 'John',
+ lastname: 'Doe',
+ active: true,
+ created_at: '2014-07-10T11:17:34.000Z',
+ },
+ {
+ id: 46,
+ login: 'sam@example.com',
+ email: 'sam@example.com',
+ firstname: 'Sam',
+ lastname: 'Bond',
+ active: true,
+ created_at: '2014-08-10T11:17:34.000Z',
+ },
+ {
+ id: 30,
+ login: 'clark@example.com',
+ email: 'clark@example.com',
+ firstname: 'Clark',
+ lastname: 'Olsen',
+ active: true,
+ created_at: '2016-02-10T11:17:34.000Z',
+ },
+ {
+ id: 31,
+ login: 'james@example.com',
+ email: 'james@example.com',
+ firstname: 'James',
+ lastname: 'Puth',
+ active: true,
+ created_at: '2016-03-10T11:17:34.000Z',
+ },
+ {
+ id: 32,
+ login: 'charles@example.com',
+ email: 'charles@example.com',
+ firstname: 'Charles',
+ lastname: 'Kent',
+ active: true,
+ created_at: '2016-04-10T11:17:34.000Z',
+ },
+ ])
+
+ App.Organization.refresh([
+ {
+ id: 9,
+ name: 'Org 1',
+ active: true,
+ created_at: '2018-06-10T11:19:34.000Z',
+ },
+ {
+ id: 10,
+ name: 'Org 2',
+ active: true,
+ created_at: '2018-06-10T11:19:34.000Z',
+ },
+ {
+ id: 11,
+ name: 'Org 3',
+ active: true,
+ created_at: '2018-06-10T11:19:34.000Z',
+ },
+ ])
+
+ /* with params or defaults */
+ $('#forms').append('form condition check for multiple user and organisation selection ')
+ var el = $('#form6')
+ var defaults = {
+ condition: {
+ 'ticket.title': {
+ operator: 'contains',
+ value: 'some title',
+ },
+ 'ticket.organization_id': {
+ operator: 'is',
+ pre_condition: 'specific',
+ value: [9, 10, 11],
+ },
+ 'ticket.owner_id': {
+ operator: 'is not',
+ pre_condition: 'specific',
+ value: [44, 45, 46],
+ },
+ 'ticket.customer_id': {
+ operator: 'is',
+ pre_condition: 'specific',
+ value: [30, 31, 32],
+ },
+ },
+ executions: {
+ 'ticket.title': {
+ value: 'some title new',
+ },
+ 'ticket.owner_id': {
+ pre_condition: 'specific',
+ value: [44, 46],
+ },
+ },
+ }
+ new App.ControllerForm({
+ el: el,
+ model: {
+ configure_attributes: [
+ { name: 'condition', display: 'Conditions', tag: 'ticket_selector', null: true },
+ { name: 'executions', display: 'Executions', tag: 'ticket_perform_action', null: true, notification: true },
+ ]
+ },
+ params: defaults,
+ autofocus: true
+ })
+ var params = App.ControllerForm.params(el)
+ var test_params = {
+ condition: {
+ 'ticket.title': {
+ operator: 'contains',
+ value: 'some title',
+ },
+ 'ticket.organization_id': {
+ operator: 'is',
+ pre_condition: 'specific',
+ value: ['9', '10', '11'],
+ value_completion: ''
+ },
+ 'ticket.owner_id': {
+ operator: 'is not',
+ pre_condition: 'specific',
+ value: ['44', '45', '46'],
+ value_completion: ''
+ },
+ 'ticket.customer_id': {
+ operator: 'is',
+ pre_condition: 'specific',
+ value: ['30', '31', '32'],
+ value_completion: ''
+ },
+ },
+ executions: {
+ 'ticket.title': {
+ value: 'some title new',
+ },
+ 'ticket.owner_id': {
+ pre_condition: 'specific',
+ value: ['44', '46'],
+ value_completion: ''
+ },
+ },
+ }
+ assert.deepEqual(params, test_params, 'form param condition check for multiple users and organisation')
});
diff --git a/public/assets/tests/qunit/form_ticket_perform_action.js b/public/assets/tests/qunit/form_ticket_perform_action.js
index 737e31387..7e7d8b490 100644
--- a/public/assets/tests/qunit/form_ticket_perform_action.js
+++ b/public/assets/tests/qunit/form_ticket_perform_action.js
@@ -595,7 +595,7 @@ QUnit.test( "ticket_perform_action check possible owner selection", assert => {
ticket_perform_action5: {
'ticket.owner_id': {
pre_condition: 'not_set',
- value: '',
+ value: null,
value_completion: ''
}
}
@@ -610,7 +610,7 @@ QUnit.test( "ticket_perform_action check possible owner selection", assert => {
ticket_perform_action5: {
'ticket.owner_id': {
pre_condition: 'specific',
- value: '',
+ value: null,
value_completion: ''
}
}
diff --git a/spec/system/manage/overviews_spec.rb b/spec/system/manage/overviews_spec.rb
new file mode 100644
index 000000000..4b3ba5072
--- /dev/null
+++ b/spec/system/manage/overviews_spec.rb
@@ -0,0 +1,370 @@
+# Copyright (C) 2012-2022 Zammad Foundation, https://zammad-foundation.org/
+
+require 'rails_helper'
+
+RSpec.describe 'Manage > Overviews', type: :system do
+ let(:group) { create(:group) }
+
+ let(:owner_one) { create(:agent, groups: [group]) }
+ let(:owner_two) { create(:agent, groups: [group]) }
+ let(:owner_three) { create(:agent, groups: [group]) }
+
+ let(:customer_one) { create(:customer, organization_id: organization_one.id, groups: [group]) }
+ let(:customer_two) { create(:customer, organization_id: organization_two.id, groups: [group]) }
+ let(:customer_three) { create(:customer, organization_id: organization_three.id, groups: [group]) }
+
+ let(:organization_one) { create(:organization, name: 'Test Org One') }
+ let(:organization_two) { create(:organization, name: 'Test Org Two') }
+ let(:organization_three) { create(:organization, name: 'Test Org Three') }
+
+ let!(:ticket_one) do
+ create(:ticket,
+ title: 'Test Ticket One',
+ group: group,
+ owner_id: owner_one.id,
+ customer_id: customer_one.id)
+ end
+
+ let!(:ticket_two) do
+ create(:ticket,
+ title: 'Test Ticket Two',
+ group: group,
+ owner_id: owner_two.id,
+ customer_id: customer_two.id)
+ end
+
+ let!(:ticket_three) do
+ create(:ticket,
+ title: 'Test Ticket Three',
+ group: group,
+ owner_id: owner_three.id,
+ customer_id: customer_three.id)
+ end
+
+ let(:overview) { create(:overview, condition: condition) }
+
+ shared_examples 'previewing the correct ticket for single selected object' do
+ context "with 'is' operator" do
+ let(:operator) { 'is' }
+
+ it 'shows selected customer ticket' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_selector('tr.item', text: ticket_one.title)
+ end
+ end
+
+ it 'does not show customer ticket that is not selected' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_no_selector('tr.item', text: ticket_two.title)
+ expect(page).to have_no_selector('tr.item', text: ticket_three.title)
+ end
+ end
+ end
+
+ context "with 'is not' operator" do
+ let(:operator) { 'is not' }
+
+ it 'does not show selected customer ticket' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_no_selector('tr.item', text: ticket_one.title)
+ end
+ end
+
+ it 'does not show customer ticket that is not selected' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_selector('tr.item', text: ticket_two.title)
+ expect(page).to have_selector('tr.item', text: ticket_three.title)
+ end
+ end
+ end
+ end
+
+ shared_examples 'previewing the correct ticket for multiple selected objects' do
+ context "with 'is' operator" do
+ let(:operator) { 'is' }
+
+ it 'shows selected customer ticket' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_selector('tr.item', text: ticket_one.title)
+ expect(page).to have_selector('tr.item', text: ticket_two.title)
+ end
+ end
+
+ it 'does not show customer ticket that is not selected' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_no_selector('tr.item', text: ticket_three.title)
+ end
+ end
+ end
+
+ context "with 'is not' operator" do
+ let(:operator) { 'is not' }
+
+ it 'does not show selected customer ticket' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_no_selector('tr.item', text: ticket_one.title)
+ expect(page).to have_no_selector('tr.item', text: ticket_two.title)
+ end
+ end
+
+ it 'does not show customer ticket that is not selected' do
+ within '.js-preview .js-tableBody' do
+ expect(page).to have_selector('tr.item', text: ticket_three.title)
+ end
+ end
+ end
+ end
+
+ context 'conditions for shown tickets' do
+ context 'for customer' do
+ context 'for new overview' do
+ before do
+ visit '/#manage/overviews'
+ click_on 'New Overview'
+
+ modal_ready
+
+ within '.ticket_selector' do
+ ticket_select = find('.js-attributeSelector select .js-ticket')
+ ticket_select.select 'Customer'
+ select operator, from: 'condition::ticket.customer_id::operator'
+ select 'specific', from: 'condition::ticket.customer_id::pre_condition'
+ end
+ end
+
+ context 'when single customer is selected' do
+ before do
+ within '.ticket_selector' do
+ fill_in 'condition::ticket.customer_id::value_completion', with: customer_one.firstname
+
+ find("[data-object-id='#{customer_one.id}'].js-object").click
+ end
+ end
+
+ it_behaves_like 'previewing the correct ticket for single selected object'
+ end
+
+ context 'when multiple customer is selected' do
+ before do
+ within '.ticket_selector' do
+ fill_in 'condition::ticket.customer_id::value_completion', with: customer_one.firstname
+ find("[data-object-id='#{customer_one.id}'].js-object").click
+
+ fill_in 'condition::ticket.customer_id::value_completion', with: customer_two.firstname
+ find("[data-object-id='#{customer_two.id}'].js-object").click
+ end
+ end
+
+ it_behaves_like 'previewing the correct ticket for multiple selected objects'
+ end
+ end
+
+ context 'for existing overview' do
+ let(:condition) do
+ { 'ticket.customer_id' => {
+ operator: operator,
+ pre_condition: 'specific',
+ value: condition_value
+ } }
+ end
+
+ before do
+ overview
+
+ visit '/#manage/overviews'
+
+ within '.table-overview .js-tableBody' do
+ find("tr[data-id='#{overview.id}'] td.table-draggable").click
+ end
+
+ within '.ticket_selector' do
+ # trigger the preview
+ fill_in 'condition::ticket.customer_id::value_completion', with: customer_one.firstname
+ end
+ end
+
+ context 'when single customer exists' do
+ let(:condition_value) { customer_one.id }
+
+ it_behaves_like 'previewing the correct ticket for single selected object'
+ end
+
+ context 'when multiple customer exists' do
+ let(:condition_value) { [customer_one.id, customer_two.id] }
+
+ it_behaves_like 'previewing the correct ticket for multiple selected objects'
+ end
+ end
+ end
+
+ context 'for owner' do
+ context 'for new overview' do
+ before do
+ visit '/#manage/overviews'
+ click_on 'New Overview'
+
+ modal_ready
+
+ within '.ticket_selector' do
+ ticket_select = find('.js-attributeSelector select .js-ticket')
+ ticket_select.select 'Owner'
+ select operator, from: 'condition::ticket.owner_id::operator'
+ select 'specific', from: 'condition::ticket.owner_id::pre_condition'
+ end
+ end
+
+ context 'when single owner is selected' do
+ before do
+ within '.ticket_selector' do
+ fill_in 'condition::ticket.owner_id::value_completion', with: owner_one.firstname
+
+ first('.recipientList-entry.js-object').click
+ end
+ end
+
+ it_behaves_like 'previewing the correct ticket for single selected object'
+ end
+
+ context 'when multiple owner is selected' do
+ before do
+ within '.ticket_selector' do
+ fill_in 'condition::ticket.owner_id::value_completion', with: owner_one.firstname
+ find("[data-object-id='#{owner_one.id}'].js-object").click
+
+ fill_in 'condition::ticket.owner_id::value_completion', with: owner_two.firstname
+ find("[data-object-id='#{owner_two.id}'].js-object").click
+ end
+ end
+
+ it_behaves_like 'previewing the correct ticket for multiple selected objects'
+ end
+ end
+
+ context 'for existing overview' do
+ let(:condition) do
+ { 'ticket.owner_id' => {
+ operator: operator,
+ pre_condition: 'specific',
+ value: condition_value
+ } }
+ end
+
+ before do
+ overview
+
+ visit '/#manage/overviews'
+
+ within '.table-overview .js-tableBody' do
+ find("tr[data-id='#{overview.id}'] td.table-draggable").click
+ end
+
+ within '.ticket_selector' do
+ # trigger the preview
+ fill_in 'condition::ticket.owner_id::value_completion', with: owner_one.firstname
+ end
+ end
+
+ context 'when single owner exists' do
+ let(:condition_value) { owner_one.id }
+
+ it_behaves_like 'previewing the correct ticket for single selected object'
+ end
+
+ context 'when multiple owner exists' do
+ let(:condition_value) { [owner_one.id, owner_two.id] }
+
+ it_behaves_like 'previewing the correct ticket for multiple selected objects'
+ end
+ end
+ end
+
+ context 'for organization' do
+ # let(:condition) do
+ # { 'ticket.organization_id' => {
+ # operator: operator,
+ # pre_condition: 'specific',
+ # value: [101, 102, 103]
+ # } }
+ # end
+
+ context 'for new overview' do
+ before do
+ visit '/#manage/overviews'
+ click_on 'New Overview'
+
+ modal_ready
+
+ within '.ticket_selector' do
+ ticket_select = find('.js-attributeSelector select .js-ticket')
+ ticket_select.select 'Organization'
+ select operator, from: 'condition::ticket.organization_id::operator'
+ select 'specific', from: 'condition::ticket.organization_id::pre_condition'
+ end
+ end
+
+ context 'when single organization is selected' do
+ before do
+ within '.ticket_selector' do
+ fill_in 'condition::ticket.organization_id::value_completion', with: organization_one.name
+
+ find(".js-optionsList [data-value='#{organization_one.id}'].js-option").click
+ end
+ end
+
+ it_behaves_like 'previewing the correct ticket for single selected object'
+ end
+
+ context 'when multiple organization is selected' do
+ before do
+ within '.ticket_selector' do
+ fill_in 'condition::ticket.organization_id::value_completion', with: organization_one.name
+ find(".js-optionsList [data-value='#{organization_one.id}'].js-option").click
+
+ fill_in 'condition::ticket.organization_id::value_completion', with: organization_two.name
+ find(".js-optionsList [data-value='#{organization_two.id}'].js-option").click
+ end
+ end
+
+ it_behaves_like 'previewing the correct ticket for multiple selected objects'
+ end
+ end
+
+ context 'for existing overview' do
+ let(:condition) do
+ { 'ticket.organization_id' => {
+ operator: operator,
+ pre_condition: 'specific',
+ value: condition_value
+ } }
+ end
+
+ before do
+ overview
+
+ visit '/#manage/overviews'
+
+ within '.table-overview .js-tableBody' do
+ find("tr[data-id='#{overview.id}'] td.table-draggable").click
+ end
+
+ within '.ticket_selector' do
+ # trigger the preview
+ fill_in 'condition::ticket.organization_id::value_completion', with: organization_one.name
+ end
+ end
+
+ context 'when single organization exists' do
+ let(:condition_value) { organization_one.id }
+
+ it_behaves_like 'previewing the correct ticket for single selected object'
+ end
+
+ context 'when multiple organization exists' do
+ let(:condition_value) { [organization_one.id, organization_two.id] }
+
+ it_behaves_like 'previewing the correct ticket for multiple selected objects'
+ end
+ end
+ end
+ end
+end