akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge feature/cw-7513 into feature/cw-7513-specs

Browse Source
This commit is contained in:
Tanmay Deep Sharma
2026-07-20 17:48:34 +05:30
parent 927e6573c9 174630bec1
commit bdee98d965
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/dashboard/routes/dashboard/settings/automation/AutomationRuleForm.vue
+2 -1
View File
@@ -219,7 +219,8 @@ const allowsDelayedExecution = computed(() =>
isCloudFeatureEnabled(FEATURE_FLAGS.DELAYED_AUTOMATIONS)
);
// Mirrors the backend's execution_delay validations so we never offer an unsupported delay.
// The UI curates delayed rules to the supported shapes (DELAYED_EVENT_ATTRS) plus the backend's
// no-attribute_changed rule; anything outside that resets to a supported default.
const delayRestrictionReason = computed(() => {
const conditions = automation.value?.conditions || [];
if (
app/models/automation_rule.rb
+8 -15
View File
@@ -23,13 +23,9 @@ class AutomationRule < ApplicationRecord
include Reauthorizable
EXECUTION_DELAY_RANGE = (10..43_200) # minutes: 10 min to 30 days
# The only valid delayed (wait) rule shapes: each supported event maps to the conditions that
# stay meaningful across the wait — status / message_type re-checked at fire time, plus the
# immutable inbox for scoping. Every other event or condition is rejected for delayed rules.
DELAYED_EVENT_ATTRIBUTES = {
'conversation_updated' => %w[status inbox_id],
'message_created' => %w[message_type inbox_id]
}.freeze
# Conversation-level delayed rules key their episode on status; only status and attributes
# that never change after the delay (inbox) are safe to also filter on.
DELAYED_CONVERSATION_ATTRIBUTES = %w[status inbox_id].freeze
belongs_to :account
has_many :pending_executions, class_name: 'AutomationRulePendingExecution', dependent: :delete_all
@@ -120,16 +116,13 @@ class AutomationRule < ApplicationRecord
errors.add(:execution_delay, 'cannot be used with attribute_changed conditions.')
end
# Delayed rules are limited to the shapes whose episode keys stay meaningful across the wait:
# conversation_updated on status/inbox, and message_created on message_type/inbox.
# Conversation-level episodes key on status_changed_at alone. Mutable attributes would collapse
# distinct periods into one episode, so only status and immutable filters (inbox) are allowed.
def execution_delay_supported_event
return if execution_delay.blank?
return if execution_delay.blank? || conditions.blank? || event_name == 'message_created'
return if conditions.all? { |obj| DELAYED_CONVERSATION_ATTRIBUTES.include?(obj['attribute_key']) }
allowed = DELAYED_EVENT_ATTRIBUTES[event_name]
return errors.add(:execution_delay, 'is only supported for conversation_updated and message_created events.') if allowed.nil?
return if conditions.blank? || conditions.all? { |obj| allowed.include?(obj['attribute_key']) }
errors.add(:execution_delay, "only supports #{allowed.join(' and ')} conditions for #{event_name} events.")
errors.add(:execution_delay, 'only supports status and inbox conditions for conversation-level events.')
end
def execution_config_changed?