A platform for community discussion. Free, open, simple.
FIX: Suggested topic links to nested replies topics (#40302)
Mark VanLandingham0a9ac164bd40
diff --git a/app/serializers/suggested_topic_serializer.rb b/app/serializers/suggested_topic_serializer.rbindex d752a928a37..4efff4472cf 100644--- a/app/serializers/suggested_topic_serializer.rb+++ b/app/serializers/suggested_topic_serializer.rb@@ -16,6 +16,7 @@ class SuggestedTopicSerializer < ListableTopicSerializer:category_id,:featured_link,:featured_link_root_domain,+ :is_nested_view,:op_like_counthas_many :posters, serializer: SuggestedPosterSerializer, embed: :objects@@ -38,4 +39,12 @@ class SuggestedTopicSerializer < ListableTopicSerializerdef include_featured_link_root_domain?SiteSetting.topic_featured_link_enabled && object.featured_linkend++ def is_nested_view+ true+ end++ def include_is_nested_view?+ object.nested_view?+ endenddiff --git a/lib/suggested_topics_builder.rb b/lib/suggested_topics_builder.rbindex d3abda4e3be..5f4511c3230 100644--- a/lib/suggested_topics_builder.rb+++ b/lib/suggested_topics_builder.rb@@ -22,6 +22,7 @@ class SuggestedTopicsBuilderresults = results.where(category_id: @category_id)end+ results = results.includes(:nested_topic) if SiteSetting.nested_replies_enabledresults = results.to_aresults.reject! { |topic| @category_topic_ids.include?(topic.id) }diff --git a/spec/serializers/suggested_topic_serializer_spec.rb b/spec/serializers/suggested_topic_serializer_spec.rbindex 7c9a8d8ba5b..dc07ce0b5a9 100644--- a/spec/serializers/suggested_topic_serializer_spec.rb+++ b/spec/serializers/suggested_topic_serializer_spec.rb@@ -77,4 +77,23 @@ RSpec.describe SuggestedTopicSerializer doexpect(json[:op_like_count]).to eq(5)endend++ describe "#is_nested_view" do+ before { SiteSetting.nested_replies_enabled = true }++ it "returns true when the topic uses nested replies" do+ topic = Fabricate(:topic)+ Fabricate(:nested_topic, topic: topic)++ json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json+ expect(json[:is_nested_view]).to eq(true)+ end++ it "omits the attribute when the topic uses the flat view" do+ topic = Fabricate(:topic)++ json = SuggestedTopicSerializer.new(topic, scope: Guardian.new(user), root: false).as_json+ expect(json).not_to have_key(:is_nested_view)+ end+ endend