diff --git a/app/assets/javascripts/app/views/customer_chat/chat_window_info.jst.eco b/app/assets/javascripts/app/views/customer_chat/chat_window_info.jst.eco
deleted file mode 100644
index a7c3b1ff3..000000000
--- a/app/assets/javascripts/app/views/customer_chat/chat_window_info.jst.eco
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-<% if @session: %>
-- <%- @T('Created at') %>: <%- @Ttimestamp(@session.created_at) %>
-<% end %>
-<% if @session && @session.preferences: %>
- <% if @session.preferences.geo_ip: %>
-
- GeoIP: <%= @session.preferences.geo_ip.country_name %> <%= @session.preferences.geo_ip.city_name %>
- <% end %>
- <% if @session.preferences.remote_ip: %>
-
- IP: <%= @session.preferences.remote_ip %>
- <% end %>
- <% if @session.preferences.dns_name: %>
-
- DNS: <%= @session.preferences.dns_name %>
- <% end %>
-<% end %>
-
\ No newline at end of file
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 1ec9c76f8..fad61f23c 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -33,9 +33,10 @@ class SearchController < ApplicationController
objects_in_order = []
objects_in_order_hash = {}
objects.each do |object|
- preferences = object.constantize.search_preferences(current_user)
+ local_class = object.constantize
+ preferences = local_class.search_preferences(current_user)
next if !preferences
- objects_in_order_hash[preferences[:prio]] = object
+ objects_in_order_hash[preferences[:prio]] = local_class
end
objects_in_order_hash.keys.sort.reverse_each do |prio|
objects_in_order.push objects_in_order_hash[prio]
@@ -64,16 +65,18 @@ class SearchController < ApplicationController
items = SearchIndexBackend.search(query, limit, objects_with_direct_search_index)
items.each do |item|
require item[:type].to_filename
- record = Kernel.const_get(item[:type]).lookup(id: item[:id])
+ local_class = Kernel.const_get(item[:type])
+ record = local_class.lookup(id: item[:id])
next if !record
assets = record.assets(assets)
+ item[:type] = local_class.to_app_model.to_s
result.push item
end
end
# e. g. do ticket query by Ticket class to handle ticket permissions
objects_without_direct_search_index.each do |object|
- object_result = search_generic_backend(object, query, limit, current_user, assets)
+ object_result = search_generic_backend(object.constantize, query, limit, current_user, assets)
if object_result.present?
result = result.concat(object_result)
end
@@ -83,7 +86,7 @@ class SearchController < ApplicationController
result_in_order = []
objects_in_order.each do |object|
result.each do |item|
- next if item[:type] != object
+ next if item[:type] != object.to_app_model.to_s
item[:id] = item[:id].to_i
result_in_order.push item
end
@@ -110,7 +113,7 @@ class SearchController < ApplicationController
private
def search_generic_backend(object, query, limit, current_user, assets)
- found_objects = object.constantize.search(
+ found_objects = object.search(
query: query,
limit: limit,
current_user: current_user,
@@ -119,7 +122,7 @@ class SearchController < ApplicationController
found_objects.each do |found_object|
item = {
id: found_object.id,
- type: found_object.class.to_s
+ type: found_object.class.to_app_model.to_s
}
result.push item
assets = found_object.assets(assets)
diff --git a/app/models/chat/session.rb b/app/models/chat/session.rb
index 70cd0d818..cf83beea4 100644
--- a/app/models/chat/session.rb
+++ b/app/models/chat/session.rb
@@ -1,4 +1,15 @@
class Chat::Session < ApplicationModel
+ include HasSearchIndexBackend
+ include HasTags
+
+ extend Chat::Session::Search
+ load 'chat/session/search_index.rb'
+ include Chat::Session::SearchIndex
+ load 'chat/session/assets.rb'
+ include Chat::Session::Assets
+
+ has_many :messages, class_name: 'Chat::Message', foreign_key: 'chat_session_id'
+
before_create :generate_session_id
store :preferences
diff --git a/app/models/chat/session/assets.rb b/app/models/chat/session/assets.rb
new file mode 100644
index 000000000..6410e2692
--- /dev/null
+++ b/app/models/chat/session/assets.rb
@@ -0,0 +1,56 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+module Chat::Session::Assets
+
+=begin
+
+get all assets / related models for this chat
+
+ chat = Chat::Session.find(123)
+ result = Chat::Session.assets(assets_if_exists)
+
+returns
+
+ result = {
+ users: {
+ 123: user_model_123,
+ 1234: user_model_1234,
+ },
+ chat_sessions: [ chat_session_model1 ]
+ }
+
+=end
+
+ def assets(data)
+
+ app_model_chat_session = Chat::Session.to_app_model
+ app_model_chat = Chat.to_app_model
+ app_model_user = User.to_app_model
+
+ data[ app_model_chat_session ] ||= {}
+
+ if !data[ app_model_chat_session ][ id ]
+ data[ app_model_chat_session ][ id ] = attributes_with_association_ids
+ data[ app_model_chat_session ][ id ]['messages'] = []
+ messages.each do |message|
+ data[ app_model_chat_session ][ id ]['messages'].push message.attributes
+ end
+ data[ app_model_chat_session ][ id ]['tags'] = tag_list
+ end
+
+ if !data[ app_model_chat ] || !data[ app_model_chat ][ chat_id ]
+ chat = Chat.lookup(id: chat_id)
+ if chat
+ data = chat.assets(data)
+ end
+ end
+
+ %w[created_by_id updated_by_id].each do |local_user_id|
+ next if !self[ local_user_id ]
+ next if data[ app_model_user ] && data[ app_model_user ][ self[ local_user_id ] ]
+ user = User.lookup(id: self[ local_user_id ])
+ next if !user
+ data = user.assets(data)
+ end
+ data
+ end
+end
diff --git a/app/models/chat/session/search.rb b/app/models/chat/session/search.rb
new file mode 100644
index 000000000..87d12f1c9
--- /dev/null
+++ b/app/models/chat/session/search.rb
@@ -0,0 +1,80 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Chat::Session
+ module Search
+
+=begin
+
+search organizations preferences
+
+ result = Chat::Session.search_preferences(user_model)
+
+returns if user has permissions to search
+
+ result = {
+ prio: 1000,
+ direct_search_index: true
+ }
+
+returns if user has no permissions to search
+
+ result = false
+
+=end
+
+ def search_preferences(current_user)
+ return false if Setting.get('chat') != true || !current_user.permissions?('chat.agent')
+ {
+ prio: 900,
+ direct_search_index: true,
+ }
+ end
+
+=begin
+
+search organizations
+
+ result = Chat::Session.search(
+ current_user: User.find(123),
+ query: 'search something',
+ limit: 15,
+ )
+
+returns
+
+ result = [organization_model1, organization_model2]
+
+=end
+
+ def search(params)
+
+ # get params
+ query = params[:query]
+ limit = params[:limit] || 10
+ current_user = params[:current_user]
+
+ # enable search only for agents and admins
+ return [] if !search_preferences(current_user)
+
+ # try search index backend
+ if SearchIndexBackend.enabled?
+ items = SearchIndexBackend.search(query, limit, 'Chat::Session')
+ chat_sessions = []
+ items.each do |item|
+ chat_session = Chat::Session.lookup(id: item[:id])
+ next if !chat_session
+ chat_sessions.push chat_session
+ end
+ return chat_sessions
+ end
+
+ # fallback do sql query
+ # - stip out * we already search for *query* -
+ query.delete! '*'
+ chat_sessions = Chat::Session.where(
+ 'name LIKE ?', "%#{query}%"
+ ).order('name').limit(limit).to_a
+ chat_sessions
+ end
+ end
+end
diff --git a/app/models/chat/session/search_index.rb b/app/models/chat/session/search_index.rb
new file mode 100644
index 000000000..b81196722
--- /dev/null
+++ b/app/models/chat/session/search_index.rb
@@ -0,0 +1,36 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+module Chat::Session::SearchIndex
+
+=begin
+
+lookup name of ref. objects
+
+ chat_session = Chat::Session.find(123)
+ result = chat_session.search_index_attribute_lookup
+
+returns
+
+ attributes # object with lookup data
+
+=end
+
+ def search_index_attribute_lookup
+ attributes = super
+ return if !attributes
+
+ attributes[:tag] = tag_list
+
+ messages = Chat::Message.where(chat_session_id: id)
+ attributes['messages'] = []
+ messages.each do |message|
+
+ # lookup attributes of ref. objects (normally name and note)
+ message_attributes = message.search_index_attribute_lookup
+
+ attributes['messages'].push message_attributes
+ end
+
+ attributes
+ end
+
+end
diff --git a/lib/report/ticket_generic_time.rb b/lib/report/ticket_generic_time.rb
index 5372f1166..3869f4e79 100644
--- a/lib/report/ticket_generic_time.rb
+++ b/lib/report/ticket_generic_time.rb
@@ -30,7 +30,7 @@ returns
}
selector = params[:selector].clone
- if params[:params] && params[:params][:selector]
+ if params[:params].present? && params[:params][:selector].present?
selector = selector.merge(params[:params][:selector])
end
diff --git a/lib/search_index_backend.rb b/lib/search_index_backend.rb
index d909b8ed6..b5887c512 100644
--- a/lib/search_index_backend.rb
+++ b/lib/search_index_backend.rb
@@ -74,6 +74,7 @@ update processors
)
Rails.logger.info "# #{response.code}"
next if response.success?
+ next if response.code.to_s == '404'
raise "Unable to process DELETE at #{url}\n#{response.inspect}"
end
Rails.logger.info "# curl -X PUT \"#{url}\" \\"
@@ -133,7 +134,7 @@ create/update/delete index
def self.index(data)
url = build_url(data[:name])
- return if !url
+ return if url.blank?
if data[:action] && data[:action] == 'delete'
return SearchIndexBackend.remove(data[:name])
@@ -169,7 +170,7 @@ add new object to search index
def self.add(type, data)
url = build_url(type, data['id'])
- return if !url
+ return if url.blank?
Rails.logger.info "# curl -X POST \"#{url}\" \\"
Rails.logger.debug "-d '#{data.to_json}'"
@@ -202,7 +203,7 @@ remove whole data from index
def self.remove(type, o_id = nil)
url = build_url(type, o_id)
- return if !url
+ return if url.blank?
Rails.logger.info "# curl -X DELETE \"#{url}\""
@@ -217,7 +218,8 @@ remove whole data from index
)
Rails.logger.info "# #{response.code}"
return true if response.success?
- #Rails.logger.info "NOTICE: can't delete index #{url}: " + response.inspect
+ return true if response.code.to_s == '400'
+ Rails.logger.info "NOTICE: can't delete index #{url}: " + response.inspect
false
end
@@ -247,7 +249,7 @@ return search result
=end
def self.search(query, limit = 10, index = nil, query_extention = {})
- return [] if !query
+ return [] if query.blank?
if index.class == Array
ids = []
index.each do |local_index|
@@ -260,10 +262,10 @@ return search result
end
def self.search_by_index(query, limit = 10, index = nil, query_extention = {})
- return [] if !query
+ return [] if query.blank?
url = build_url
- return if !url
+ return if url.blank?
url += if index
if index.class == Array
"/#{index.join(',')}/_search"
@@ -287,12 +289,8 @@ return search result
]
data['query'] = query_extention || {}
- if !data['query']['bool']
- data['query']['bool'] = {}
- end
- if !data['query']['bool']['must']
- data['query']['bool']['must'] = []
- end
+ data['query']['bool'] ||= {}
+ data['query']['bool']['must'] ||= []
# add * on simple query like "somephrase23" or "attribute: somephrase23"
if query.present?
@@ -391,7 +389,7 @@ get count of tickets and tickets which match on selector
raise 'no selectors given' if !selectors
url = build_url
- return if !url
+ return if url.blank?
url += if index
if index.class == Array
"/#{index.join(',')}/_search"
@@ -425,7 +423,7 @@ get count of tickets and tickets which match on selector
end
Rails.logger.debug response.data.to_json
- if !aggs_interval || !aggs_interval[:interval]
+ if aggs_interval.blank? || aggs_interval[:interval].blank?
ticket_ids = []
response.data['hits']['hits'].each do |item|
ticket_ids.push item['_id']
@@ -471,8 +469,8 @@ get count of tickets and tickets which match on selector
}
# add aggs to filter
- if aggs_interval
- if aggs_interval[:interval]
+ if aggs_interval.present?
+ if aggs_interval[:interval].present?
data[:size] = 0
data[:aggs] = {
time_buckets: {
@@ -492,9 +490,7 @@ get count of tickets and tickets which match on selector
query_must.push r
end
- if !data[:query][:bool]
- data[:query][:bool] = {}
- end
+ data[:query][:bool] ||= {}
if query_must.present?
data[:query][:bool][:must] = query_must
@@ -504,7 +500,7 @@ get count of tickets and tickets which match on selector
end
# add sort
- if aggs_interval && aggs_interval[:field] && !aggs_interval[:interval]
+ if aggs_interval.present? && aggs_interval[:field].present? && aggs_interval[:interval].blank?
sort = []
sort[0] = {}
sort[0][aggs_interval[:field]] = {
diff --git a/lib/sessions/event/base.rb b/lib/sessions/event/base.rb
index 5c1b659f2..1b02e6bfe 100644
--- a/lib/sessions/event/base.rb
+++ b/lib/sessions/event/base.rb
@@ -49,7 +49,7 @@ class Sessions::Event::Base
true
end
- def permission_check(key, event)
+ def current_user_id
if !@session
error = {
event: "#{event}_error",
@@ -60,7 +60,7 @@ class Sessions::Event::Base
Sessions.send(@client_id, error)
return
end
- if !@session['id']
+ if @session['id'].blank?
error = {
event: "#{event}_error",
data: {
@@ -70,7 +70,13 @@ class Sessions::Event::Base
Sessions.send(@client_id, error)
return
end
- user = User.lookup(id: @session['id'])
+ @session['id']
+ end
+
+ def current_user
+ user_id = current_user_id
+ return if !user_id
+ user = User.find_by(id: user_id)
if !user
error = {
event: "#{event}_error",
@@ -81,6 +87,12 @@ class Sessions::Event::Base
Sessions.send(@client_id, error)
return
end
+ user
+ end
+
+ def permission_check(key, event)
+ user = current_user
+ return if !user
if !user.permissions?(key)
error = {
event: "#{event}_error",
diff --git a/lib/sessions/event/chat_session_update.rb b/lib/sessions/event/chat_session_update.rb
new file mode 100644
index 000000000..0f93dfc31
--- /dev/null
+++ b/lib/sessions/event/chat_session_update.rb
@@ -0,0 +1,35 @@
+class Sessions::Event::ChatSessionUpdate < Sessions::Event::ChatBase
+
+ def run
+ return super if super
+ return if !check_chat_session_exists
+ return if !permission_check('chat.agent', 'chat')
+ chat_session = current_chat_session
+
+ if @payload['data']['name'] != chat_session.name
+ chat_session.name = @payload['data']['name']
+ chat_session.save!
+ end
+
+ if @payload['data']['tags']
+ new_tags = @payload['data']['tags'].split(',')
+
+ new_tags.each(&:strip!)
+
+ tags = chat_session.tag_list
+ new_tags.each do |new_tag|
+ next if new_tag.blank?
+ next if tags.include?(new_tag)
+ chat_session.tag_add(new_tag, current_user_id)
+ end
+
+ tags.each do |tag|
+ next if new_tags.include?(tag)
+ chat_session.tag_remove(tag, current_user_id)
+ end
+ end
+
+ nil
+ end
+
+end
diff --git a/lib/tasks/search_index_es.rake b/lib/tasks/search_index_es.rake
index 7a68ab5c6..5014ac0bf 100644
--- a/lib/tasks/search_index_es.rake
+++ b/lib/tasks/search_index_es.rake
@@ -5,15 +5,17 @@ namespace :searchindex do
task :drop, [:opts] => :environment do |_t, _args|
# drop indexes
- puts 'drop indexes...'
+ print 'drop indexes...'
SearchIndexBackend.index(
action: 'delete',
)
+ puts 'done'
+ Rake::Task['searchindex:drop_pipeline'].execute
end
task :create, [:opts] => :environment do |_t, _args|
- puts 'create indexes...'
+ print 'create indexes...'
# es with mapper-attachments plugin
info = SearchIndexBackend.info
@@ -45,6 +47,7 @@ namespace :searchindex do
}
}
)
+ puts 'done'
Setting.set('es_pipeline', '')
# es with ingest-attachment plugin
@@ -61,44 +64,86 @@ namespace :searchindex do
}
}
)
+ puts 'done'
+ end
- # update processors
- pipeline = 'zammad-attachment'
+ Rake::Task['searchindex:create_pipeline'].execute
+ end
+
+ task :create_pipeline, [:opts] => :environment do |_t, _args|
+
+ # es with mapper-attachments plugin
+ info = SearchIndexBackend.info
+ number = nil
+ if info.present?
+ number = info['version']['number'].to_s
+ end
+ next if number.blank? || number =~ /^[2-4]\./ || number =~ /^5\.[0-5]\./
+
+ # update processors
+ pipeline = Setting.get('es_pipeline')
+ if pipeline.blank?
+ pipeline = "zammad#{rand(999_999_999_999)}"
Setting.set('es_pipeline', pipeline)
- SearchIndexBackend.processors(
- "_ingest/pipeline/#{pipeline}": [
- {
- action: 'delete',
- },
- {
- action: 'create',
- description: 'Extract zammad-attachment information from arrays',
- processors: [
- {
- foreach: {
- field: 'article',
- ignore_failure: true,
- processor: {
- foreach: {
- field: '_ingest._value.attachment',
- ignore_failure: true,
- processor: {
- attachment: {
- target_field: '_ingest._value',
- field: '_ingest._value._content',
- ignore_failure: true,
- }
+ end
+ print 'create pipeline (pipeline)... '
+ SearchIndexBackend.processors(
+ "_ingest/pipeline/#{pipeline}": [
+ {
+ action: 'delete',
+ },
+ {
+ action: 'create',
+ description: 'Extract zammad-attachment information from arrays',
+ processors: [
+ {
+ foreach: {
+ field: 'article',
+ ignore_failure: true,
+ processor: {
+ foreach: {
+ field: '_ingest._value.attachment',
+ ignore_failure: true,
+ processor: {
+ attachment: {
+ target_field: '_ingest._value',
+ field: '_ingest._value._content',
+ ignore_failure: true,
}
}
}
}
}
- ]
- }
- ]
- )
- end
+ }
+ ]
+ }
+ ]
+ )
+ puts 'done'
+ end
+ task :drop_pipeline, [:opts] => :environment do |_t, _args|
+
+ # es with mapper-attachments plugin
+ info = SearchIndexBackend.info
+ number = nil
+ if info.present?
+ number = info['version']['number'].to_s
+ end
+ next if number.blank? || number =~ /^[2-4]\./ || number =~ /^5\.[0-5]\./
+
+ # update processors
+ pipeline = Setting.get('es_pipeline')
+ next if pipeline.blank?
+ print 'delete pipeline (pipeline)... '
+ SearchIndexBackend.processors(
+ "_ingest/pipeline/#{pipeline}": [
+ {
+ action: 'delete',
+ },
+ ]
+ )
+ puts 'done'
end
task :reload, [:opts] => :environment do |_t, _args|
diff --git a/public/assets/chat/chat.css b/public/assets/chat/chat.css
index 255fa5b7a..81d219049 100644
--- a/public/assets/chat/chat.css
+++ b/public/assets/chat/chat.css
@@ -71,8 +71,11 @@
height: 100%;
width: 3.4em;
text-align: center;
- line-height: 3.5em;
+ line-height: 3.4em;
cursor: pointer; }
+ .zammad-chat-header-icon:before {
+ content: "";
+ display: inline-block; }
.zammad-chat-header-icon-open,
.zammad-chat-header-icon-close {
@@ -107,7 +110,7 @@
font-weight: bold; }
.zammad-chat-agent-status {
- margin: 0 1em;
+ margin: 0.25em 1em;
display: inline-block;
line-height: 2em;
padding: 0 .7em;
diff --git a/public/assets/chat/chat.scss b/public/assets/chat/chat.scss
index 64f0c4cca..2c85d78fc 100644
--- a/public/assets/chat/chat.scss
+++ b/public/assets/chat/chat.scss
@@ -80,8 +80,13 @@
height: 100%;
width: 3.4em;
text-align: center;
- line-height: 3.5em;
+ line-height: 3.4em;
cursor: pointer;
+
+ &:before { // force the icon to align to center
+ content: "";
+ display: inline-block;
+ }
}
.zammad-chat-header-icon-open,
@@ -125,7 +130,7 @@
}
.zammad-chat-agent-status {
- margin: 0 1em;
+ margin: 0.25em 1em;
display: inline-block;
line-height: 2em;
padding: 0 .7em;
diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb
index 9c5431539..d31e69fbb 100644
--- a/test/unit/model_test.rb
+++ b/test/unit/model_test.rb
@@ -243,8 +243,8 @@ class ModelTest < ActiveSupport::TestCase
assert(searchable.include?(Ticket))
assert(searchable.include?(User))
assert(searchable.include?(Organization))
- assert_equal(3, searchable.count)
-
+ assert(searchable.include?(Chat::Session))
+ assert_equal(4, searchable.count)
end
end