Skip to content

A platform for community discussion. Free, open, simple.

DEV: Simplify workflow button trigger services

Régis Hanol3cea2ea8e487
diff --git a/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb b/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb
index 734eb8951a8..0e5a84b11ed 100644
--- a/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb
+++ b/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_post_button.rb
@@ -28,17 +28,12 @@ module DiscourseWorkflows
DiscourseWorkflows::Workflow::Action::FindPublishedTriggers.call(
trigger_type: "trigger:post_button",
filter: ->(published_trigger) do
- published_trigger.trigger_node_id == params.trigger_node_id
+ published_trigger.trigger_node_id == params.trigger_node_id &&
+ (!params.workflow_id || published_trigger.workflow_id == params.workflow_id)
end,
)
- if params.workflow_id
- return(
- matches.find { |published_trigger| published_trigger.workflow_id == params.workflow_id }
- )
- end
-
- matches.one? ? matches.first : nil
+ matches.first if matches.one?
end
def can_use_post_button(published_trigger:, guardian:)
@@ -68,10 +63,9 @@ module DiscourseWorkflows
end
def enqueue_workflow(published_trigger:, post:, guardian:)
- trigger = DiscourseWorkflows::Nodes::PostButton::V1.new(post)
DiscourseWorkflows::TriggerDispatcher.enqueue(
published_trigger,
- trigger_data: trigger.output,
+ trigger_data: DiscourseWorkflows::Nodes::PostButton::V1.new(post).output,
user_id: guardian.user.id,
)
end
diff --git a/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_topic_admin_button.rb b/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_topic_admin_button.rb
index 74f3fbd7c72..233346d1d9d 100644
--- a/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_topic_admin_button.rb
+++ b/plugins/discourse-workflows/app/services/discourse_workflows/workflow/trigger_topic_admin_button.rb
@@ -33,10 +33,9 @@ module DiscourseWorkflows
end
def enqueue_workflow(published_trigger:, topic:, guardian:)
- trigger = DiscourseWorkflows::Nodes::TopicAdminButton::V1.new(topic)
DiscourseWorkflows::TriggerDispatcher.enqueue(
published_trigger,
- trigger_data: trigger.output,
+ trigger_data: DiscourseWorkflows::Nodes::TopicAdminButton::V1.new(topic).output,
user_id: guardian.user.id,
)
end