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.
79 lines
2.2 KiB
Ruby
79 lines
2.2 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: macros
|
|
#
|
|
# id :bigint not null, primary key
|
|
# actions :jsonb not null
|
|
# name :string not null
|
|
# visibility :integer default("personal")
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# account_id :bigint not null
|
|
# created_by_id :bigint
|
|
# updated_by_id :bigint
|
|
#
|
|
# Indexes
|
|
#
|
|
# index_macros_on_account_id (account_id)
|
|
#
|
|
class Macro < ApplicationRecord
|
|
include Rails.application.routes.url_helpers
|
|
|
|
belongs_to :account
|
|
belongs_to :created_by,
|
|
class_name: :User, optional: true, inverse_of: :macros
|
|
belongs_to :updated_by,
|
|
class_name: :User, optional: true
|
|
has_many_attached :files
|
|
|
|
enum visibility: { personal: 0, global: 1 }
|
|
|
|
validate :json_actions_format
|
|
|
|
ACTIONS_ATTRS = %w[send_message add_label assign_team assign_agent mute_conversation change_status remove_label remove_assigned_agent
|
|
remove_assigned_team resolve_conversation snooze_conversation change_priority send_email_transcript
|
|
send_attachment add_private_note send_webhook_event].freeze
|
|
|
|
def set_visibility(user, params)
|
|
self.visibility = params[:visibility]
|
|
self.visibility = :personal if user.agent?
|
|
end
|
|
|
|
def self.with_visibility(user, _params)
|
|
records = Current.account.macros.global
|
|
records = records.or(personal.where(created_by_id: user.id, account_id: Current.account.id))
|
|
records.order(:id)
|
|
end
|
|
|
|
def self.current_page(params)
|
|
params[:page] || 1
|
|
end
|
|
|
|
def file_base_data
|
|
files.map do |file|
|
|
{
|
|
id: file.id,
|
|
macro_id: id,
|
|
file_type: file.content_type,
|
|
account_id: account_id,
|
|
file_url: url_for(file),
|
|
blob_id: file.blob_id,
|
|
filename: file.filename.to_s
|
|
}
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def json_actions_format
|
|
return if actions.blank?
|
|
|
|
attributes = actions.map { |obj, _| obj['action_name'] }
|
|
actions = attributes - ACTIONS_ATTRS
|
|
|
|
errors.add(:actions, "Macro execution actions #{actions.join(',')} not supported.") if actions.any?
|
|
end
|
|
end
|
|
|
|
Macro.include_mod_with('Audit::Macro')
|