-
+
+
@@ -33,7 +33,7 @@ export default {
Spinner,
},
props: {
- groupedMessages: Object,
+ groupedMessages: Array,
},
data() {
return {
@@ -48,9 +48,6 @@ export default {
isFetchingList: 'conversation/getIsFetchingList',
conversationSize: 'conversation/getConversationSize',
}),
- conversationDates() {
- return Object.keys(this.groupedMessages);
- },
},
watch: {
allMessagesLoaded() {
diff --git a/app/javascript/widget/components/UserMessage.vue b/app/javascript/widget/components/UserMessage.vue
index e6cebc8e2..cf59feab0 100755
--- a/app/javascript/widget/components/UserMessage.vue
+++ b/app/javascript/widget/components/UserMessage.vue
@@ -43,12 +43,6 @@ export default {
.chat-bubble {
border-top-right-radius: $space-smaller;
}
- .user-avatar {
- visibility: hidden;
- }
- .agent-name {
- display: none;
- }
}
& + .agent-message {
margin-top: $space-normal;
diff --git a/app/javascript/widget/store/modules/conversation.js b/app/javascript/widget/store/modules/conversation.js
index 8a334e4a4..c38f52471 100755
--- a/app/javascript/widget/store/modules/conversation.js
+++ b/app/javascript/widget/store/modules/conversation.js
@@ -45,9 +45,33 @@ export const getters = {
return {};
},
getGroupedConversation: _state => {
- return groupBy(Object.values(_state.conversations), message =>
- new DateHelper(message.created_at).format()
+ const conversationGroupedByDate = groupBy(
+ Object.values(_state.conversations),
+ message => new DateHelper(message.created_at).format()
);
+
+ return Object.keys(conversationGroupedByDate).map(date => {
+ const messages = conversationGroupedByDate[date].map((message, index) => {
+ let showAvatar = false;
+ if (index === conversationGroupedByDate[date].length - 1) {
+ showAvatar = true;
+ } else {
+ const nextMessage = conversationGroupedByDate[date][index + 1];
+ const currentSender = message.sender ? message.sender.name : '';
+ const nextSender = nextMessage.sender ? nextMessage.sender.name : '';
+ showAvatar = currentSender !== nextSender;
+ }
+ return {
+ showAvatar,
+ ...message,
+ };
+ });
+
+ return {
+ date,
+ messages,
+ };
+ });
},
getIsFetchingList: _state => _state.uiFlags.isFetchingList,
};
diff --git a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
index 2efd3b185..57efafa19 100644
--- a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
@@ -79,31 +79,41 @@ describe('#getters', () => {
},
},
};
- expect(getters.getGroupedConversation(state)).toEqual({
- 'Nov 18, 2019': [
- {
- id: 1,
- content: 'Thanks for the help',
- created_at: 1574075964,
- },
- {
- id: 2,
- content: 'Yes, It makes sense',
- created_at: 1574092218,
- },
- ],
- 'Dec 14, 2019': [
- {
- id: 3,
- content: 'Hey',
- created_at: 1576340623,
- },
- {
- id: 4,
- content: 'How may I help you',
- created_at: 1576340626,
- },
- ],
- });
+ expect(getters.getGroupedConversation(state)).toEqual([
+ {
+ date: 'Nov 18, 2019',
+ messages: [
+ {
+ id: 1,
+ content: 'Thanks for the help',
+ created_at: 1574075964,
+ showAvatar: false,
+ },
+ {
+ id: 2,
+ content: 'Yes, It makes sense',
+ created_at: 1574092218,
+ showAvatar: true,
+ },
+ ],
+ },
+ {
+ date: 'Dec 14, 2019',
+ messages: [
+ {
+ id: 3,
+ content: 'Hey',
+ created_at: 1576340623,
+ showAvatar: false,
+ },
+ {
+ id: 4,
+ content: 'How may I help you',
+ created_at: 1576340626,
+ showAvatar: true,
+ },
+ ],
+ },
+ ]);
});
});
diff --git a/app/models/user.rb b/app/models/user.rb
index 376be9567..75a73a479 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -47,6 +47,7 @@ class User < ApplicationRecord
include DeviseTokenAuth::Concerns::User
include Events::Types
include Pubsubable
+ include Rails.application.routes.url_helpers
devise :database_authenticatable,
:registerable,
@@ -103,9 +104,18 @@ class User < ApplicationRecord
Rails.configuration.dispatcher.dispatch(AGENT_REMOVED, Time.zone.now, account: account)
end
+ def avatar_url
+ if avatar.attached? && avatar.representable?
+ url_for(avatar.representation(resize: '250x250'))
+ else
+ ''
+ end
+ end
+
def push_event_data
{
- name: name
+ name: name,
+ avatar_url: avatar_url
}
end
end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 798264da8..6e70ff0b2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -40,6 +40,8 @@ Rails.application.configure do
config.action_mailer.delivery_method = :letter_opener
config.action_mailer.perform_deliveries = true
+ Rails.application.routes.default_url_options = { host: 'localhost', port: 3000 }
+
# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log
@@ -67,7 +69,6 @@ Rails.application.configure do
# Disable host check during development
config.hosts = nil
-
# Bullet configuration to fix the N+1 queries
config.after_initialize do
Bullet.enable = true
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5ce971b5a..d88c78c1b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -56,16 +56,18 @@ Rails.application.configure do
# config.active_job.queue_name_prefix = "chatwoot_production"
config.action_mailer.perform_caching = false
- config.action_mailer.default_url_options = { :host => ENV['FRONTEND_URL'] }
+ config.action_mailer.default_url_options = { host: ENV['FRONTEND_URL'] }
config.action_mailer.smtp_settings = {
- :address => ENV['SMTP_ADDRESS'],
- :port => 587,
- :user_name => ENV["SMTP_USERNAME"],
- :password => ENV["SMTP_PASSWORD"],
- :authentication => :login,
- :enable_starttls_auto => true
+ address: ENV['SMTP_ADDRESS'],
+ port: 587,
+ user_name: ENV['SMTP_USERNAME'],
+ password: ENV['SMTP_PASSWORD'],
+ authentication: :login,
+ enable_starttls_auto: true
}
+ Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
+
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 24023448b..61e262c32 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -66,6 +66,8 @@ Rails.application.configure do
enable_starttls_auto: true
}
+ Rails.application.routes.default_url_options = { host: ENV['FRONTEND_URL'] }
+
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 24ba068af..d34f78668 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -21,6 +21,7 @@ Rails.application.configure do
'Cache-Control' => "public, max-age=#{1.hour.to_i}"
}
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+ Rails.application.routes.default_url_options = { host: 'localhost', port: 3000 }
# Show full error reports and disable caching.
config.consider_all_requests_local = true