A platform for community discussion. Free, open, simple.
FIX: Fail the topic node on a filter query it cannot parse
Régis Hanolc72f72855cb1
diff --git a/plugins/discourse-workflows/config/locales/server.en.yml b/plugins/discourse-workflows/config/locales/server.en.ymlindex 52f1f3d309b..cad0cd59e3a 100644--- a/plugins/discourse-workflows/config/locales/server.en.yml+++ b/plugins/discourse-workflows/config/locales/server.en.yml@@ -85,10 +85,11 @@ en:topic:create_failed: "Failed to create topic."bump_failed: "Failed to bump topic."+ invalid_filter: "Invalid topic filter: %{fragments}."post:topic_closed_or_archived: "Cannot create a post in a closed or archived topic."edit_failed: "Failed to edit post."- invalid_filter: "Invalid post filter fragment: %{fragments}."+ invalid_filter: "Invalid post filter: %{fragments}."flag_post:unknown_flag_type: "Unknown flag type: %{flag_type}."actor_not_staff: "The acting user must be a staff member to flag posts."diff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/topic/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/topic/v1.rbindex 6dec3561809..4ace230f293 100644--- a/plugins/discourse-workflows/lib/discourse_workflows/nodes/topic/v1.rb+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/topic/v1.rb@@ -345,12 +345,23 @@ module DiscourseWorkflows)topic_list = topic_query.list_filter- topics = topic_list.topics.slice(offset, limit) || []- posts = topics.map(&:first_post).compact- if posts.any?- ActiveRecord::Associations::Preloader.new(records: posts, associations: :user).call+ if topic_query.invalid_filters.present?+ raise_node_error!(+ I18n.t(+ "discourse_workflows.errors.topic.invalid_filter",+ fragments: topic_query.invalid_filters.join(" "),+ ),+ )end+ topics = topic_list.topics.slice(offset, limit) || []+ ActiveRecord::Associations::Preloader.new(+ records: topics,+ associations: {+ first_post: :user,+ },+ ).call+custom_field_names = config["custom_field_names"]::Topic.preload_custom_fields(topics, custom_field_names) if custom_field_names.present?diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_spec.rbindex 239fed8ff83..407b2d4f995 100644--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_spec.rb+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_spec.rb@@ -843,7 +843,7 @@ RSpec.describe DiscourseWorkflows::Nodes::Post::V1 do},item: item,)- end.to raise_error(DiscourseWorkflows::NodeError, /Invalid post filter fragment/)+ end.to raise_error(DiscourseWorkflows::NodeError, /Invalid post filter/)endendenddiff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_spec.rbindex aa88f9ed34e..de2154aa437 100644--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_spec.rb+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/topic_spec.rb@@ -438,6 +438,18 @@ RSpec.describe DiscourseWorkflows::Nodes::Topic::V1 do)end+ it "raises when the query contains a fragment it cannot parse" do+ expect {+ execute_list(+ configuration: {+ "operation" => "list",+ "query" => "status:nonsense",+ "limit" => "10",+ },+ )+ }.to raise_error(DiscourseWorkflows::NodeError, "Invalid topic filter: status:nonsense.")+ end+it "returns topics when query is not provided" doresult = execute_list(configuration: { "operation" => "list", "limit" => "10" })