aee979ee0b
This updates macros and automations so agents can explicitly remove assigned agents or teams, while keeping the existing `Assign -> None` flow working for backward compatibility. Fixes: #7551 Closes: #7551 ## Why The original macro change exposed unassignment only through `Assign -> None`, which made macros behave differently from automations and left the explicit remove actions inconsistent across the product. This keeps the lower-risk compatibility path and adds the explicit remove actions requested in review. ## What this change does - Adds `Remove Assigned Agent` and `Remove Assigned Team` as explicit actions in macros. - Adds the same explicit remove actions in automations. - Keeps `Assign Agent -> None` and `Assign Team -> None` working for existing behavior and stored payloads. - Preserves backward compatibility for existing macro and automation execution payloads. - Downmerges the latest `develop` and resolves the conflicts while keeping both the new remove actions and current `develop` behavior. ## Validation - Verified both remove actions are available and selectable in the macro editor. - Verified both remove actions are available and selectable in the automation builder. - Applied a disposable macro with `Remove Assigned Agent` and `Remove Assigned Team` on a real conversation and confirmed both fields were cleared. - Applied a disposable macro with `Assign Agent -> None` and `Assign Team -> None` on a real conversation and confirmed both fields were still cleared.
117 lines
2.9 KiB
Ruby
117 lines
2.9 KiB
Ruby
class ActionService
|
|
include EmailHelper
|
|
|
|
def initialize(conversation)
|
|
@conversation = conversation.reload
|
|
@account = @conversation.account
|
|
end
|
|
|
|
def mute_conversation(_params)
|
|
@conversation.mute!
|
|
end
|
|
|
|
def snooze_conversation(_params)
|
|
@conversation.snoozed!
|
|
end
|
|
|
|
def resolve_conversation(_params)
|
|
@conversation.resolved!
|
|
end
|
|
|
|
def open_conversation(_params)
|
|
@conversation.open!
|
|
end
|
|
|
|
def pending_conversation(_params)
|
|
@conversation.pending!
|
|
end
|
|
|
|
def change_status(status)
|
|
@conversation.update!(status: status[0])
|
|
end
|
|
|
|
def change_priority(priority)
|
|
@conversation.update!(priority: (priority[0] == 'nil' ? nil : priority[0]))
|
|
end
|
|
|
|
def add_label(labels)
|
|
return if labels.empty?
|
|
|
|
@conversation.reload.add_labels(labels)
|
|
end
|
|
|
|
def assign_agent(agent_ids = [])
|
|
return @conversation.update!(assignee_id: nil) if agent_ids[0] == 'nil'
|
|
|
|
return unless agent_belongs_to_inbox?(agent_ids)
|
|
|
|
@agent = @account.users.find_by(id: agent_ids)
|
|
|
|
return unless @agent.present? && @agent.confirmed?
|
|
|
|
@conversation.update!(assignee_id: @agent.id)
|
|
end
|
|
|
|
def remove_label(labels)
|
|
return if labels.empty?
|
|
|
|
labels = @conversation.label_list - labels
|
|
@conversation.update(label_list: labels)
|
|
end
|
|
|
|
def assign_team(team_ids = [])
|
|
# Keep nil/0 handling for existing automation and macro payloads.
|
|
should_unassign = team_ids.blank? || %w[nil 0].include?(team_ids[0].to_s)
|
|
return @conversation.update!(team_id: nil) if should_unassign
|
|
|
|
# check if team belongs to account only if team_id is present
|
|
# if team_id is nil, then it means that the team is being unassigned
|
|
return unless !team_ids[0].nil? && team_belongs_to_account?(team_ids)
|
|
|
|
@conversation.update!(team_id: team_ids[0])
|
|
end
|
|
|
|
def remove_assigned_agent(_params)
|
|
@conversation.update!(assignee_id: nil)
|
|
end
|
|
|
|
def remove_assigned_team(_params)
|
|
@conversation.update!(team_id: nil)
|
|
end
|
|
|
|
def send_email_transcript(emails)
|
|
return unless @account.email_transcript_enabled?
|
|
|
|
emails = emails[0].gsub(/\s+/, '').split(',')
|
|
|
|
emails.each do |email|
|
|
break unless @account.within_email_rate_limit?
|
|
|
|
email = parse_email_variables(@conversation, email)
|
|
ConversationReplyMailer.with(account: @conversation.account).conversation_transcript(@conversation, email)&.deliver_later
|
|
@account.increment_email_sent_count
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def agent_belongs_to_inbox?(agent_ids)
|
|
member_ids = @conversation.inbox.members.pluck(:user_id)
|
|
assignable_agent_ids = member_ids + @account.administrators.ids
|
|
|
|
assignable_agent_ids.include?(agent_ids[0])
|
|
end
|
|
|
|
def team_belongs_to_account?(team_ids)
|
|
@account.team_ids.include?(team_ids[0])
|
|
end
|
|
|
|
def conversation_a_tweet?
|
|
return false if @conversation.additional_attributes.blank?
|
|
|
|
@conversation.additional_attributes['type'] == 'tweet'
|
|
end
|
|
end
|
|
|
|
ActionService.include_mod_with('ActionService')
|