From 7f9c477cf480ce4c056b5ae06a4c84b68912f28d Mon Sep 17 00:00:00 2001 From: Dominik Klein Date: Wed, 28 Jul 2021 16:21:23 +0200 Subject: [PATCH] Fixes #3302 - Representation of inactive customers and orgnizations. --- .../controllers/organization_profile.coffee | 7 ++- .../app/controllers/user_profile.coffee | 7 ++- .../app/lib/app_post/global_search.coffee | 1 - .../_single_object_popover_provider.coffee | 5 +- .../app/lib/app_post/searchable_select.coffee | 9 ++-- .../javascripts/app/lib/app_post/utils.coffee | 8 +++ .../app_post/z_searchable_ajax_select.coffee | 3 +- .../app/models/organization.coffee | 11 +++- app/assets/javascripts/app/models/user.coffee | 11 +++- .../generic/object_search/item_object.jst.eco | 6 +-- .../object_search/item_organization.jst.eco | 4 +- .../generic/searchable_select_option.jst.eco | 7 ++- .../app/views/navigation/result.jst.eco | 2 +- .../views/organization_profile/index.jst.eco | 8 ++- .../app/views/popover/organization.jst.eco | 2 +- .../app/views/popover/user.jst.eco | 2 +- .../app/views/widget/organization.jst.eco | 6 ++- .../app/views/widget/task_item.jst.eco | 2 +- app/assets/stylesheets/zammad.scss | 54 +++++++++++++++++++ app/controllers/users_controller.rb | 2 +- spec/requests/user_spec.rb | 38 +++++++++---- spec/system/manage/users_spec.rb | 19 ++++++- spec/system/search_spec.rb | 33 ++++++++++++ spec/system/ticket/create_spec.rb | 17 ++++++ spec/system/ticket/zoom_spec.rb | 25 ++++++++- 25 files changed, 248 insertions(+), 41 deletions(-) diff --git a/app/assets/javascripts/app/controllers/organization_profile.coffee b/app/assets/javascripts/app/controllers/organization_profile.coffee index f3ffc80a9..61e8e6ce2 100644 --- a/app/assets/javascripts/app/controllers/organization_profile.coffee +++ b/app/assets/javascripts/app/controllers/organization_profile.coffee @@ -14,10 +14,15 @@ class App.OrganizationProfile extends App.Controller if App.Organization.exists(@organization_id) organization = App.Organization.find(@organization_id) + icon = organization.icon() + + if organization.active is false + icon = 'inactive-' + icon meta.head = organization.displayName() meta.title = organization.displayName() - meta.iconClass = organization.icon() + meta.iconClass = icon + meta.active = organization.active meta url: => diff --git a/app/assets/javascripts/app/controllers/user_profile.coffee b/app/assets/javascripts/app/controllers/user_profile.coffee index 3b3ed3ee7..43f11effb 100644 --- a/app/assets/javascripts/app/controllers/user_profile.coffee +++ b/app/assets/javascripts/app/controllers/user_profile.coffee @@ -15,10 +15,15 @@ class App.UserProfile extends App.Controller if App.User.exists(@user_id) user = App.User.find(@user_id) + icon = user.icon() + + if user.active is false + icon = 'inactive-' + icon meta.head = user.displayName() meta.title = user.displayName() - meta.iconClass = user.icon() + meta.iconClass = icon + meta.active = user.active meta url: => diff --git a/app/assets/javascripts/app/lib/app_post/global_search.coffee b/app/assets/javascripts/app/lib/app_post/global_search.coffee index ff8bf69dd..0ce040a4d 100644 --- a/app/assets/javascripts/app/lib/app_post/global_search.coffee +++ b/app/assets/javascripts/app/lib/app_post/global_search.coffee @@ -9,7 +9,6 @@ class App.GlobalSearch extends App.Controller search: (params) => query = params.query - # use cache for search result currentTime = new Date if @searchResultCache[query] && @searchResultCache[query].time > currentTime.setSeconds(currentTime.getSeconds() - 20) diff --git a/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee b/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee index 0bb7d24c7..b8df9112d 100644 --- a/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee +++ b/app/assets/javascripts/app/lib/app_post/popover_provider/_single_object_popover_provider.coffee @@ -20,7 +20,10 @@ class App.SingleObjectPopoverProvider extends App.PopoverProvider buildTitleFor: (elem) -> object = @constructor.klass.find(@objectIdFor(elem)) - App.Utils.htmlEscape(@displayTitleUsing(object)) + title = App.Utils.htmlEscape(@displayTitleUsing(object)) + if object.active is false + title = '' + title + '' + title buildContentFor: (elem) -> id = @objectIdFor(elem) diff --git a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee index 31646f8b3..d3cb7225d 100644 --- a/app/assets/javascripts/app/lib/app_post/searchable_select.coffee +++ b/app/assets/javascripts/app/lib/app_post/searchable_select.coffee @@ -240,8 +240,9 @@ class App.SearchableSelect extends Spine.Controller @invisiblePart.text('') selectItem: (event) -> - return if !event.currentTarget.textContent - @input.val event.currentTarget.textContent.trim() + currentText = event.currentTarget.querySelector('span.searchableSelect-option-text').textContent.trim() + return if !currentText + @input.val currentText @input.trigger('change') @shadowInput.val event.currentTarget.getAttribute('data-value') @shadowInput.trigger('change') @@ -351,7 +352,7 @@ class App.SearchableSelect extends Spine.Controller event.preventDefault() if @currentItem || !@attribute.unknown - valueName = @currentItem.text().trim() + valueName = @currentItem.children('span.searchableSelect-option-text').text().trim() value = @currentItem.attr('data-value') @input.val valueName @shadowInput.val value @@ -427,7 +428,7 @@ class App.SearchableSelect extends Spine.Controller @currentItem.addClass 'is-active' if autocomplete - @autocomplete @currentItem.attr('data-value'), @currentItem.text().trim() + @autocomplete @currentItem.attr('data-value'), @currentItem.children('span.searchableSelect-option-text').text().trim() highlightItem: (event) => @unhighlightCurrentItem() diff --git a/app/assets/javascripts/app/lib/app_post/utils.coffee b/app/assets/javascripts/app/lib/app_post/utils.coffee index 39b8105d8..617df5219 100644 --- a/app/assets/javascripts/app/lib/app_post/utils.coffee +++ b/app/assets/javascripts/app/lib/app_post/utils.coffee @@ -1311,6 +1311,14 @@ class App.Utils autocomplete: { source: source minLength: 2 + create: -> + $(@).data('ui-autocomplete')._renderItem = (ul, item) -> + option_html = App.Utils.htmlEscape(item.label) + additional_class = '' + if item.inactive + option_html += '' + App.i18n.translateContent('inactive') + '' + additional_class = 'is-inactive' + return $('
  • ').addClass(additional_class).append(option_html).appendTo(ul) }, ).on('tokenfield:createtoken', (e) -> if type is 'email' && !e.attrs.value.match(/@/) || e.attrs.value.match(/\s/) diff --git a/app/assets/javascripts/app/lib/app_post/z_searchable_ajax_select.coffee b/app/assets/javascripts/app/lib/app_post/z_searchable_ajax_select.coffee index b8c078407..4513a0a3d 100644 --- a/app/assets/javascripts/app/lib/app_post/z_searchable_ajax_select.coffee +++ b/app/assets/javascripts/app/lib/app_post/z_searchable_ajax_select.coffee @@ -38,7 +38,6 @@ class App.SearchableAjaxSelect extends App.SearchableSelect success: (data, status, xhr) => # cache search result @searchResultCache[cacheKey] = data - @renderResponse(data, query) # if delegate is given and provides getAjaxAttributes method, try to extend ajax call @@ -81,7 +80,6 @@ class App.SearchableAjaxSelect extends App.SearchableSelect category = undefined if result.type is 'KnowledgeBase::Answer::Translation' && result.subtitle category = result.subtitle - if result { category: category @@ -103,6 +101,7 @@ class App.SearchableAjaxSelect extends App.SearchableSelect { name: name value: object.id + inactive: object.active == false } showLoader: => diff --git a/app/assets/javascripts/app/models/organization.coffee b/app/assets/javascripts/app/models/organization.coffee index 969091f13..c0d91e42e 100644 --- a/app/assets/javascripts/app/models/organization.coffee +++ b/app/assets/javascripts/app/models/organization.coffee @@ -41,11 +41,18 @@ Using **Organisations** you can **group** customers. This has among others two i data searchResultAttributes: -> + classList = ['organization', 'organization-popover' ] + icon = 'organization' + + if @active is false + classList.push 'is-inactive' + icon = 'inactive-' + icon + display: "#{@displayName()}" id: @id - class: 'organization organization-popover' + class: classList.join(' ') url: @uiUrl() - icon: 'organization' + icon: icon activityMessage: (item) -> return if !item diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index 8ff31425c..8f1f6aff8 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -156,11 +156,18 @@ class App.User extends App.Model data searchResultAttributes: -> + classList = ['user', 'user-popover'] + icon = 'user' + + if @active is false + classList.push 'is-inactive' + icon = 'inactive-' + icon + display: "#{@displayName()}" id: @id - class: 'user user-popover' + class: classList.join(' ') url: @uiUrl() - icon: 'user' + icon: icon activityMessage: (item) -> return if !item diff --git a/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco b/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco index 53bb48d4b..c55a32771 100644 --- a/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco +++ b/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco @@ -1,4 +1,4 @@ -
  • +
  • <%- @Icon(@icon, 'recipientList-icon') %>
    @@ -9,10 +9,10 @@ <%= @object.displayName() %> <% end %> <% if @object.organization: %> - - <%= @object.organization.displayName() %> + - <%= @object.organization.displayName() %> <% end %> <% if @object.active is false: %>
    <%- @Ti('inactive') %>
    <% end %> -
    • \ No newline at end of file + diff --git a/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco b/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco index 7f9e13d9a..cc2fe25cc 100644 --- a/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco +++ b/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco @@ -1,4 +1,4 @@ -
  • +
  • <% if @organization.active is false: %> <%- @Icon('inactive-organization', 'recipientList-icon') %> @@ -14,4 +14,4 @@
    <%- @Ti('inactive') %>
    <% end %> <%- @Icon('arrow-right', 'recipientList-arrow') %> -
    • \ No newline at end of file + diff --git a/app/assets/javascripts/app/views/generic/searchable_select_option.jst.eco b/app/assets/javascripts/app/views/generic/searchable_select_option.jst.eco index 8ec9a7e09..4343f64c7 100644 --- a/app/assets/javascripts/app/views/generic/searchable_select_option.jst.eco +++ b/app/assets/javascripts/app/views/generic/searchable_select_option.jst.eco @@ -1,9 +1,14 @@ diff --git a/app/assets/javascripts/app/views/navigation/result.jst.eco b/app/assets/javascripts/app/views/navigation/result.jst.eco index af4749fc0..e9394b908 100644 --- a/app/assets/javascripts/app/views/navigation/result.jst.eco +++ b/app/assets/javascripts/app/views/navigation/result.jst.eco @@ -11,4 +11,4 @@ <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/assets/javascripts/app/views/organization_profile/index.jst.eco b/app/assets/javascripts/app/views/organization_profile/index.jst.eco index f8bb2fda5..c3b372716 100644 --- a/app/assets/javascripts/app/views/organization_profile/index.jst.eco +++ b/app/assets/javascripts/app/views/organization_profile/index.jst.eco @@ -3,11 +3,15 @@
    - <%- @Icon('organization') %> + <% if @organization.active is true: %> + <%- @Icon('organization') %> + <% else: %> + <%- @Icon('inactive-organization') %> + <% end %>

    - \ No newline at end of file + diff --git a/app/assets/javascripts/app/views/popover/organization.jst.eco b/app/assets/javascripts/app/views/popover/organization.jst.eco index 9f6bbef46..7bfcd1d5e 100644 --- a/app/assets/javascripts/app/views/popover/organization.jst.eco +++ b/app/assets/javascripts/app/views/popover/organization.jst.eco @@ -5,7 +5,7 @@
    <% for user in @object.members: %> -
    <%= user.displayName() %>
    +
    <%= user.displayName() %>
    <% end %>
    <% end %> diff --git a/app/assets/javascripts/app/views/popover/user.jst.eco b/app/assets/javascripts/app/views/popover/user.jst.eco index b2bc622c7..8094a401d 100644 --- a/app/assets/javascripts/app/views/popover/user.jst.eco +++ b/app/assets/javascripts/app/views/popover/user.jst.eco @@ -1,5 +1,5 @@ <% if @object['organization']: %> -
    <%= @object.organization.displayName() %>
    +
    <%= @object.organization.displayName() %>
    <% end %> <%- @V('popover/single_object_generic', object: @object, attributes: @attributes) %> diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco index 1e315d651..37a6d4629 100644 --- a/app/assets/javascripts/app/views/widget/organization.jst.eco +++ b/app/assets/javascripts/app/views/widget/organization.jst.eco @@ -1,7 +1,11 @@
    - <%- @Icon('organization') %> + <% if @organization.active is true: %> + <%- @Icon('organization') %> + <% else: %> + <%- @Icon('inactive-organization') %> + <% end %>

    <%= @organization.displayName() %>

    diff --git a/app/assets/javascripts/app/views/widget/task_item.jst.eco b/app/assets/javascripts/app/views/widget/task_item.jst.eco index 6852cc567..969b306e6 100644 --- a/app/assets/javascripts/app/views/widget/task_item.jst.eco +++ b/app/assets/javascripts/app/views/widget/task_item.jst.eco @@ -11,7 +11,7 @@ <%- @Icon(@item.meta.iconClass) %> <% end %>
    -
    <%= @item.meta.head %>
    +
    <%= @item.meta.head %>
    <%- @Icon('diagonal-cross') %> diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 82b143649..97b867b27 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -4285,6 +4285,12 @@ footer { .navigation .nav-tab-name { text-align: start; + + + &.is-inactive { + text-decoration: line-through; + opacity: .73; + } } .tasks-navigation .nav-tab-icon .error { @@ -4314,6 +4320,11 @@ footer { .nav-tab.nav-tab--search { height: 30px; padding-top: 9px; + + &.is-inactive { + text-decoration: line-through; + opacity: .73; + } } .nav-tab-icon { @@ -5353,6 +5364,11 @@ footer { border: none; background: none; padding: 21px 17px 4px; + + .is-inactive { + text-decoration: line-through; + color: #ccc; + } } .popover-content { @@ -5411,10 +5427,22 @@ footer { color: #a1a4a7; } + .popover .person { + &.is-inactive { + text-decoration: line-through; + color: #ccc; + } + } + .popover .user-organization { @extend .u-textTruncate; margin-bottom: 8px; margin-top: -4px; + + &.is-inactive { + text-decoration: line-through; + color: #ccc; + } } .popover-block { @@ -5555,6 +5583,11 @@ footer { top: 0; } + .user-popover.is-inactive { + text-decoration: line-through; + opacity: .73; + } + .btn.js-newTicket { position: absolute; right: 0; @@ -7996,6 +8029,11 @@ footer { padding: 9px 15px; list-style-image: none; + &.is-inactive { + text-decoration: line-through; + opacity: .73; + } + &:not(:first-child) { box-shadow: 0 1px rgba(255,255,255,.13) inset; } @@ -8566,6 +8604,13 @@ footer { display: flex; align-items: center; @extend .u-clickable; + + &.is-inactive { + .recipientList-name { + text-decoration: line-through; + opacity: .73; + } + } } .recipientList-entry .recipientList-iconSpacer { @@ -8620,6 +8665,10 @@ footer { .recipientList-detail { opacity: 0.5; + + &.is-inactive > span { + text-decoration: line-through; + } } .recipientList-icon.plus { @@ -10354,6 +10403,11 @@ output { & + .icon { @include bidi-style(margin-left, 10px, margin-right, 0); } + + &.is-inactive { + opacity: .73; + text-decoration: line-through; + } } &.dropdown li { diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b0cff0c23..bfe1e4b7b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -282,7 +282,7 @@ class UsersController < ApplicationController realname = "#{realname} <#{user.email}>" end a = if params[:term] - { id: user.id, label: realname, value: user.email } + { id: user.id, label: realname, value: user.email, inactive: !user.active } else { id: user.id, label: realname, value: realname } end diff --git a/spec/requests/user_spec.rb b/spec/requests/user_spec.rb index af925f855..a402e6fdb 100644 --- a/spec/requests/user_spec.rb +++ b/spec/requests/user_spec.rb @@ -65,6 +65,18 @@ RSpec.describe 'User', type: :request do ) end + let!(:customer_inactive) do + create( + :customer, + organization: organization, + login: 'rest-customer_inactive@example.com', + firstname: 'Rest', + lastname: 'CustomerInactive', + email: 'rest-customer_inactive@example.com', + active: false, + ) + end + before do configure_elasticsearch(rebuild: true) end @@ -224,7 +236,7 @@ RSpec.describe 'User', type: :request do get '/api/v1/users/me', params: {}, as: :json expect(response).to have_http_status(:ok) expect(json_response).to be_truthy - expect('rest-admin@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-admin@example.com') # index get '/api/v1/users', params: {}, as: :json @@ -243,13 +255,13 @@ RSpec.describe 'User', type: :request do expect(response).to have_http_status(:ok) expect(json_response).to be_truthy expect(Hash).to eq(json_response.class) - expect('rest-agent@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-agent@example.com') get "/api/v1/users/#{customer.id}", params: {}, as: :json expect(response).to have_http_status(:ok) expect(json_response).to be_truthy expect(Hash).to eq(json_response.class) - expect('rest-customer1@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-customer1@example.com') # create user with admin role role = Role.lookup(name: 'Admin') @@ -332,7 +344,7 @@ RSpec.describe 'User', type: :request do get '/api/v1/users/me', params: {}, as: :json expect(response).to have_http_status(:ok) expect(json_response).to be_truthy - expect('rest-agent@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-agent@example.com') # index get '/api/v1/users', params: {}, as: :json @@ -442,9 +454,15 @@ RSpec.describe 'User', type: :request do expect(json_response[0]['id']).to eq(json_response1['id']) expect(json_response[0]['label']).to eq("Customer#{firstname} Customer Last ") expect(json_response[0]['value']).to eq('new_customer_by_agent@example.com') + expect(json_response[0]['inactive']).to eq(false) expect(json_response[0]['role_ids']).to be_falsey expect(json_response[0]['roles']).to be_falsey + get "/api/v1/users/search?term=#{CGI.escape('CustomerInactive')}", params: {}, as: :json + expect(response).to have_http_status(:ok) + expect(json_response).to be_a_kind_of(Array) + expect(json_response[0]['inactive']).to eq(true) + # Regression test for issue #2539 - search pagination broken in users_controller.rb # Get the total number of users N, then search with one result per page, so there should N pages with one result each get '/api/v1/users/search', params: { query: '*' }, as: :json @@ -494,19 +512,19 @@ RSpec.describe 'User', type: :request do get '/api/v1/users/me', params: {}, as: :json expect(response).to have_http_status(:ok) expect(json_response).to be_truthy - expect('rest-customer1@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-customer1@example.com') # index get '/api/v1/users', params: {}, as: :json expect(response).to have_http_status(:ok) expect(Array).to eq(json_response.class) - expect(1).to eq(json_response.length) + expect(json_response.length).to eq(1) # show/:id get "/api/v1/users/#{customer.id}", params: {}, as: :json expect(response).to have_http_status(:ok) expect(Hash).to eq(json_response.class) - expect('rest-customer1@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-customer1@example.com') get "/api/v1/users/#{customer2.id}", params: {}, as: :json expect(response).to have_http_status(:forbidden) @@ -536,19 +554,19 @@ RSpec.describe 'User', type: :request do get '/api/v1/users/me', params: {}, as: :json expect(response).to have_http_status(:ok) expect(json_response).to be_truthy - expect('rest-customer2@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-customer2@example.com') # index get '/api/v1/users', params: {}, as: :json expect(response).to have_http_status(:ok) expect(Array).to eq(json_response.class) - expect(1).to eq(json_response.length) + expect(json_response.length).to eq(1) # show/:id get "/api/v1/users/#{customer2.id}", params: {}, as: :json expect(response).to have_http_status(:ok) expect(Hash).to eq(json_response.class) - expect('rest-customer2@example.com').to eq(json_response['email']) + expect(json_response['email']).to eq('rest-customer2@example.com') get "/api/v1/users/#{customer.id}", params: {}, as: :json expect(response).to have_http_status(:forbidden) diff --git a/spec/system/manage/users_spec.rb b/spec/system/manage/users_spec.rb index d5f715239..807265796 100644 --- a/spec/system/manage/users_spec.rb +++ b/spec/system/manage/users_spec.rb @@ -69,8 +69,25 @@ RSpec.describe 'Manage > Users', type: :system do expect(page).to have_css('table.user-list td', text: 'NewTestUserFirstName') end - end + describe 'select an Organization' do + before do + create(:organization, name: 'Example Inc.', active: true) + create(:organization, name: 'Inactive Inc.', active: false) + end + + it 'check for inactive Organizations in Organization selection' do + visit '#manage/users' + + within(:active_content) do + find('[data-type=new]').click + + find('[name=organization_id] ~ .searchableSelect-main').fill_in with: '**' + expect(page).to have_css('ul.js-optionsList > li.js-option', minimum: 2) + expect(page).to have_css('ul.js-optionsList > li.js-option .is-inactive', count: 1) + end + end + end end end diff --git a/spec/system/search_spec.rb b/spec/system/search_spec.rb index 9b664f6db..df85a5759 100644 --- a/spec/system/search_spec.rb +++ b/spec/system/search_spec.rb @@ -16,4 +16,37 @@ RSpec.describe 'Search', type: :system, searchindex: true do expect(page).to have_text '"Welcome"' end end + + context 'inactive user and organizations' do + before do + create(:organization, name: 'Example Inc.', active: true) + create(:organization, name: 'Example Inactive Inc.', active: false) + create(:customer, firstname: 'Firstname', lastname: 'Active', active: true) + create(:customer, firstname: 'Firstname', lastname: 'Inactive', active: false) + + configure_elasticsearch(rebuild: true) + end + + it 'check that inactive organizations are marked correctly' do + fill_in id: 'global-search', with: '"Example"' + + expect(page).to have_css('.nav-tab--search.organization', minimum: 2) + expect(page).to have_css('.nav-tab--search.organization.is-inactive', count: 1) + end + + it 'check that inactive users are marked correctly' do + fill_in id: 'global-search', with: '"Firstname"' + + expect(page).to have_css('.nav-tab--search.user', minimum: 2) + expect(page).to have_css('.nav-tab--search.user.is-inactive', count: 1) + end + + it 'check that inactive users are also marked in the popover for the quick search result' do + fill_in id: 'global-search', with: '"Firstname"' + + popover_on_hover(find('.nav-tab--search.user.is-inactive')) + + expect(page).to have_css('.popover-title .is-inactive', count: 1) + end + end end diff --git a/spec/system/ticket/create_spec.rb b/spec/system/ticket/create_spec.rb index 6455d8b84..fc64636a7 100644 --- a/spec/system/ticket/create_spec.rb +++ b/spec/system/ticket/create_spec.rb @@ -456,4 +456,21 @@ RSpec.describe 'Ticket Create', type: :system do expect(page).to have_no_selector(:task_with, task_key) end end + + describe 'customer selection to check the field search' do + before do + create(:customer, active: true) + create(:customer, active: false) + end + + it 'check for inactive customer in customer/organization selection' do + visit 'ticket/create' + + within(:active_content) do + find('[name=customer_id] ~ .user-select.token-input').fill_in with: '**' + expect(page).to have_css('ul.recipientList > li.recipientList-entry', minimum: 2) + expect(page).to have_css('ul.recipientList > li.recipientList-entry.is-inactive', count: 1) + end + end + end end diff --git a/spec/system/ticket/zoom_spec.rb b/spec/system/ticket/zoom_spec.rb index eec68e6a4..14a8b2ed4 100644 --- a/spec/system/ticket/zoom_spec.rb +++ b/spec/system/ticket/zoom_spec.rb @@ -208,10 +208,14 @@ RSpec.describe 'Ticket zoom', type: :system do context 'to inbound phone call', current_user_id: -> { agent.id }, authenticated_as: -> { agent } do let(:agent) { create(:agent, groups: [Group.first]) } - let(:customer) { create(:agent) } + let(:customer) { create(:customer) } let(:ticket) { create(:ticket, customer: customer, group: agent.groups.first) } let!(:article) { create(:ticket_article, :inbound_phone, ticket: ticket) } + before do + create(:customer, active: false) + end + it 'goes to customer email' do visit "ticket/zoom/#{ticket.id}" @@ -225,11 +229,28 @@ RSpec.describe 'Ticket zoom', type: :system do end end end + + it 'check active and inactive user in TO-field' do + visit "ticket/zoom/#{ticket.id}" + + within :active_ticket_article, article do + click '.js-ArticleAction[data-type=emailReply]' + end + + within :active_content do + within '.article-new' do + find('[name=to] ~ .ui-autocomplete-input').fill_in with: '**' + end + end + + expect(page).to have_css('ul.ui-autocomplete > li.ui-menu-item', minimum: 2) + expect(page).to have_css('ul.ui-autocomplete > li.ui-menu-item.is-inactive', count: 1) + end end context 'to outbound phone call', current_user_id: -> { agent.id }, authenticated_as: -> { agent } do let(:agent) { create(:agent, groups: [Group.first]) } - let(:customer) { create(:agent) } + let(:customer) { create(:customer) } let(:ticket) { create(:ticket, customer: customer, group: agent.groups.first) } let!(:article) { create(:ticket_article, :outbound_phone, ticket: ticket) }