mirror of
https://github.com/lingble/chatwoot.git
synced 2026-01-11 14:55:35 +00:00
# Pull Request Template
## Description
This PR fixes the following error:
`I18n::MissingInterpolationArgument: missing interpolation argument
:assignee_name in "Asignado a %{assignee_name} por %{user_name}"
({user_name: "Marketing Telpronet"} given)
(I18n::MissingInterpolationArgument)`
**Issue**
In the Spanish locale, an `I18n::MissingInterpolationArgument` error
occurred during bulk assignee operations.
This happened because `assignee&.name` was returning `nil`, and the
`.compact` method removed the `assignee_name` key entirely from the
params.
<img width="1744" height="164" alt="image"
src="https://github.com/user-attachments/assets/3c15ed77-48c0-4938-a7fd-356bdb07da39"
/>
**Solution**
* Always include the `assignee_name` key with an empty string (`''`)
when its value is `nil`.
* Removed the `.compact` method call to ensure the interpolation key is
always present.
Fixes
https://linear.app/chatwoot/issue/CW-5747/i18nmissinginterpolationargument-missing-interpolation-argument
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
131 lines
4.0 KiB
Ruby
131 lines
4.0 KiB
Ruby
module ActivityMessageHandler
|
|
extend ActiveSupport::Concern
|
|
|
|
include PriorityActivityMessageHandler
|
|
include LabelActivityMessageHandler
|
|
include SlaActivityMessageHandler
|
|
include TeamActivityMessageHandler
|
|
|
|
private
|
|
|
|
def create_activity
|
|
user_name = determine_user_name
|
|
|
|
handle_status_change(user_name)
|
|
handle_priority_change(user_name)
|
|
handle_label_change(user_name)
|
|
handle_sla_policy_change(user_name)
|
|
end
|
|
|
|
def determine_user_name
|
|
Current.user&.name
|
|
end
|
|
|
|
def handle_status_change(user_name)
|
|
return unless saved_change_to_status?
|
|
|
|
status_change_activity(user_name)
|
|
end
|
|
|
|
def handle_priority_change(user_name)
|
|
return unless saved_change_to_priority?
|
|
|
|
priority_change_activity(user_name)
|
|
end
|
|
|
|
def handle_label_change(user_name)
|
|
return unless saved_change_to_label_list?
|
|
|
|
create_label_change(activity_message_owner(user_name))
|
|
end
|
|
|
|
def handle_sla_policy_change(user_name)
|
|
return unless saved_change_to_sla_policy_id?
|
|
|
|
sla_change_type = determine_sla_change_type
|
|
create_sla_change_activity(sla_change_type, activity_message_owner(user_name))
|
|
end
|
|
|
|
def status_change_activity(user_name)
|
|
content = if Current.executed_by.present?
|
|
automation_status_change_activity_content
|
|
else
|
|
user_status_change_activity_content(user_name)
|
|
end
|
|
|
|
::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
|
|
end
|
|
|
|
def auto_resolve_message_key(minutes)
|
|
if minutes >= 1440 && (minutes % 1440).zero?
|
|
{ key: 'auto_resolved_days', count: minutes / 1440 }
|
|
elsif minutes >= 60 && (minutes % 60).zero?
|
|
{ key: 'auto_resolved_hours', count: minutes / 60 }
|
|
else
|
|
{ key: 'auto_resolved_minutes', count: minutes }
|
|
end
|
|
end
|
|
|
|
def user_status_change_activity_content(user_name)
|
|
if user_name
|
|
I18n.t("conversations.activity.status.#{status}", user_name: user_name)
|
|
elsif Current.contact.present? && resolved?
|
|
I18n.t('conversations.activity.status.contact_resolved', contact_name: Current.contact.name.capitalize)
|
|
elsif resolved?
|
|
message_data = auto_resolve_message_key(auto_resolve_after || 0)
|
|
I18n.t("conversations.activity.status.#{message_data[:key]}", count: message_data[:count])
|
|
end
|
|
end
|
|
|
|
def automation_status_change_activity_content
|
|
if Current.executed_by.instance_of?(AutomationRule)
|
|
I18n.t("conversations.activity.status.#{status}", user_name: I18n.t('automation.system_name'))
|
|
elsif Current.executed_by.instance_of?(Contact)
|
|
Current.executed_by = nil
|
|
I18n.t('conversations.activity.status.system_auto_open')
|
|
end
|
|
end
|
|
|
|
def activity_message_params(content)
|
|
{ account_id: account_id, inbox_id: inbox_id, message_type: :activity, content: content }
|
|
end
|
|
|
|
def create_muted_message
|
|
create_mute_change_activity('muted')
|
|
end
|
|
|
|
def create_unmuted_message
|
|
create_mute_change_activity('unmuted')
|
|
end
|
|
|
|
def create_mute_change_activity(change_type)
|
|
return unless Current.user
|
|
|
|
content = I18n.t("conversations.activity.#{change_type}", user_name: Current.user.name)
|
|
::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
|
|
end
|
|
|
|
def generate_assignee_change_activity_content(user_name)
|
|
params = { assignee_name: assignee&.name || '', user_name: user_name }
|
|
key = assignee_id ? 'assigned' : 'removed'
|
|
key = 'self_assigned' if self_assign? assignee_id
|
|
I18n.t("conversations.activity.assignee.#{key}", **params)
|
|
end
|
|
|
|
def create_assignee_change_activity(user_name)
|
|
user_name = activity_message_owner(user_name)
|
|
|
|
return unless user_name
|
|
|
|
content = generate_assignee_change_activity_content(user_name)
|
|
::Conversations::ActivityMessageJob.perform_later(self, activity_message_params(content)) if content
|
|
end
|
|
|
|
def activity_message_owner(user_name)
|
|
user_name = I18n.t('automation.system_name') if !user_name && Current.executed_by.present?
|
|
user_name
|
|
end
|
|
end
|
|
|
|
ActivityMessageHandler.prepend_mod_with('ActivityMessageHandler')
|