<%= render_field attribute, f: f %>
diff --git a/app/views/super_admin/application/_navigation.html.erb b/app/views/super_admin/application/_navigation.html.erb
index 005bd8cb8..6ecc5bd90 100644
--- a/app/views/super_admin/application/_navigation.html.erb
+++ b/app/views/super_admin/application/_navigation.html.erb
@@ -30,7 +30,7 @@ as defined by the routes in the `admin/` namespace
<%= link_to "Dashboard", super_admin_root_url %>
<% Administrate::Namespace.new(namespace).resources.each do |resource| %>
- <% next if ["account_users", "dashboard", "devise/sessions"].include? resource.resource %>
+ <% next if ["account_users", "agent_bots","dashboard", "devise/sessions"].include? resource.resource %>
<%= link_to(
diff --git a/app/views/super_admin/users/show.html.erb b/app/views/super_admin/users/show.html.erb
index 645fdfe19..a428d797e 100644
--- a/app/views/super_admin/users/show.html.erb
+++ b/app/views/super_admin/users/show.html.erb
@@ -72,7 +72,6 @@ as well as a link to its edit page.
<% account_user_page.attributes.each do |attribute| -%>
<% if attribute.name == "user" %>
<%= f.hidden_field('user_id', value: page.resource.id) %>
- <%= f.hidden_field('redirect_to', value: 'user') %>
<% else %>
<%= render_field attribute, f: f %>
diff --git a/app/views/widget_tests/index.html.erb b/app/views/widget_tests/index.html.erb
index 4642d88bf..51ede71bd 100644
--- a/app/views/widget_tests/index.html.erb
+++ b/app/views/widget_tests/index.html.erb
@@ -5,7 +5,7 @@
window.chatwootSettings = {
hideMessageBubble: false,
position: 'left',
- locale: 'fr',
+ locale: 'en',
};
(function(d,t) {
diff --git a/config/features.yml b/config/features.yml
index c04941427..0ce1518a1 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -1,5 +1,8 @@
# DO NOT change the order of features EVER
- name: inbound_emails
enabled: false
-- name: test
+- name: channel_email
enabled: false
+- name: channel_facebook
+ enabled: true
+
diff --git a/config/routes.rb b/config/routes.rb
index 31f90084e..60b5c9736 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -176,13 +176,17 @@ Rails.application.routes.draw do
devise_scope :super_admin do
get 'super_admin/logout', to: 'super_admin/devise/sessions#destroy'
namespace :super_admin do
+ root to: 'dashboard#index'
+
+ # order of resources affect the order of sidebar navigation in super admin
resources :accounts
- resources :account_users, only: [:new, :create, :destroy]
- resources :users
+ resources :users, only: [:index, :new, :create, :show, :edit, :update]
resources :super_admins
resources :access_tokens, only: [:index, :show]
- root to: 'dashboard#index'
+ # resources that doesn't appear in primary navigation in super admin
+ resources :account_users, only: [:new, :create, :destroy]
+ resources :agent_bots, only: [:index, :new, :create, :show, :edit, :update]
end
authenticated :super_admin do
mount Sidekiq::Web => '/monitoring/sidekiq'
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 49717b057..9ea04c78c 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -119,6 +119,18 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(conversation.reload.status).to eq('open')
end
+
+ it 'toggles the conversation status to specific status when parameter is passed' do
+ expect(conversation.status).to eq('open')
+
+ post "/api/v1/accounts/#{account.id}/conversations/#{conversation.display_id}/toggle_status",
+ headers: agent.create_new_auth_token,
+ params: { status: 'bot' },
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(conversation.reload.status).to eq('bot')
+ end
end
end
diff --git a/spec/controllers/super_admin/agent_bots_controller_spec.rb b/spec/controllers/super_admin/agent_bots_controller_spec.rb
new file mode 100644
index 000000000..39aa3cfe4
--- /dev/null
+++ b/spec/controllers/super_admin/agent_bots_controller_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+RSpec.describe 'Super Admin agent-bots API', type: :request do
+ let(:super_admin) { create(:super_admin) }
+
+ describe 'GET /super_admin/agent_bots' do
+ context 'when it is an unauthenticated super admin' do
+ it 'returns unauthorized' do
+ get '/super_admin/agent_bots'
+ expect(response).to have_http_status(:redirect)
+ end
+ end
+
+ context 'when it is an authenticated super admin' do
+ let!(:agent_bot) { create(:agent_bot) }
+
+ it 'shows the list of users' do
+ sign_in super_admin
+ get '/super_admin/agent_bots'
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include(agent_bot.name)
+ end
+ end
+ end
+end
diff --git a/spec/finders/message_finder_spec.rb b/spec/finders/message_finder_spec.rb
index 333322d47..e51c7c406 100644
--- a/spec/finders/message_finder_spec.rb
+++ b/spec/finders/message_finder_spec.rb
@@ -15,6 +15,7 @@ describe ::MessageFinder do
create(:message, account: account, inbox: inbox, conversation: conversation)
create(:message, message_type: 'activity', account: account, inbox: inbox, conversation: conversation)
create(:message, message_type: 'activity', account: account, inbox: inbox, conversation: conversation)
+ # this outgoing message creates 3 additional messages because of the hook execution service
create(:message, message_type: 'outgoing', account: account, inbox: inbox, conversation: conversation)
end
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index 8868e59c3..61c3c8f98 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -4,7 +4,8 @@ require 'rails_helper'
RSpec.describe ConversationReplyMailer, type: :mailer do
describe 'reply_with_summary' do
- let(:agent) { create(:user, email: 'agent1@example.com') }
+ let!(:account) { create(:account) }
+ let!(:agent) { create(:user, email: 'agent1@example.com', account: account) }
let(:class_instance) { described_class.new }
before do
@@ -33,8 +34,10 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
end
context 'when custom domain and email is not enabled' do
- let(:conversation) { create(:conversation, assignee: agent) }
- let(:message) { create(:message, conversation: conversation) }
+ let(:inbox) { create(:inbox, account: account) }
+ let(:inbox_member) { create(:inbox_member, user: agent, inbox: inbox) }
+ let(:conversation) { create(:conversation, assignee: agent, inbox: inbox_member.inbox, account: account) }
+ let!(:message) { create(:message, conversation: conversation, account: account) }
let(:mail) { described_class.reply_with_summary(message.conversation, Time.zone.now).deliver_now }
it 'renders the receiver email' do
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 73fb5800b..c92ed10d1 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -17,7 +17,32 @@ RSpec.describe Conversation, type: :model do
it 'creates a UUID for every conversation automatically' do
uuid_pattern = /[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}$/i
- expect(conversation.uuid).to match(uuid_pattern)
+ expect(conversation.uuid).to match(uuid_pattern)
+ end
+ end
+
+ describe '.after_create' do
+ let(:account) { create(:account) }
+ let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
+ let(:inbox) { create(:inbox, account: account) }
+ let(:conversation) do
+ create(
+ :conversation,
+ account: account,
+ contact: create(:contact, account: account),
+ inbox: inbox,
+ assignee: nil
+ )
+ end
+
+ before do
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+ end
+
+ it 'runs after_create callbacks' do
+ # send_events
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch)
+ .with(described_class::CONVERSATION_CREATED, kind_of(Time), conversation: conversation)
end
end
@@ -68,7 +93,7 @@ RSpec.describe Conversation, type: :model do
end
end
- describe '.after_create' do
+ describe '#round robin' do
let(:account) { create(:account) }
let(:agent) { create(:user, email: 'agent1@example.com', account: account) }
let(:inbox) { create(:inbox, account: account) }
@@ -83,15 +108,10 @@ RSpec.describe Conversation, type: :model do
end
before do
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent.id)
end
- it 'runs after_create callbacks' do
- # send_events
- expect(Rails.configuration.dispatcher).to have_received(:dispatch)
- .with(described_class::CONVERSATION_CREATED, kind_of(Time), conversation: conversation)
-
+ it 'runs round robin on after_save callbacks' do
# run_round_robin
expect(conversation.reload.assignee).to eq(agent)
end
@@ -99,13 +119,36 @@ RSpec.describe Conversation, type: :model do
it 'will not auto assign agent if enable_auto_assignment is false' do
inbox.update(enable_auto_assignment: false)
- # send_events
- expect(Rails.configuration.dispatcher).to have_received(:dispatch)
- .with(described_class::CONVERSATION_CREATED, kind_of(Time), conversation: conversation)
+ # run_round_robin
+ expect(conversation.reload.assignee).to eq(nil)
+ end
+
+ it 'will not auto assign agent if its a bot conversation' do
+ conversation = create(
+ :conversation,
+ account: account,
+ contact: create(:contact, account: account),
+ inbox: inbox,
+ status: 'bot',
+ assignee: nil
+ )
# run_round_robin
expect(conversation.reload.assignee).to eq(nil)
end
+
+ it 'gets triggered on update only when status changes to open' do
+ conversation.status = 'resolved'
+ conversation.save!
+ expect(conversation.reload.assignee).to eq(agent)
+
+ # round robin changes assignee in this case since agent doesn't have access to inbox
+ agent2 = create(:user, email: 'agent2@example.com', account: account)
+ allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
+ conversation.status = 'open'
+ conversation.save!
+ expect(conversation.reload.assignee).to eq(agent2)
+ end
end
describe '#update_assignee' do
diff --git a/swagger/paths/conversation/toggle_status.yml b/swagger/paths/conversation/toggle_status.yml
index 5c934dde9..e9b6be822 100644
--- a/swagger/paths/conversation/toggle_status.yml
+++ b/swagger/paths/conversation/toggle_status.yml
@@ -18,7 +18,7 @@ post:
properties:
status:
type: string
- enum: ["open", "resolved"]
+ enum: ["open", "resolved", "bot"]
required: true
description: The status of the conversation
responses: