A platform for community discussion. Free, open, simple.
FIX: Honor `house_ads_after_nth_root` in the nested replies view (#40742)
Rafael dos Santos Silva23a5a3182d5b
diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjsindex 25ddefd6a32..193196b2bc9 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs@@ -37,58 +37,34 @@ export default class HouseAd extends AdComponent {return this.showAd ? `house-${this.placement}` : "";}- @computed(- "showToGroups",- "showAfterPost",- "showAfterTopicListItem",- "showAfterNestedRoot",- "showOnCurrentPage"- )+ @computed("showToGroups", "showAfterPlacement", "showOnCurrentPage")get showAd() {return (- this.showToGroups &&- (this.showAfterPost ||- this.showAfterTopicListItem ||- this.showAfterNestedRoot) &&- this.showOnCurrentPage+ this.showToGroups && this.showAfterPlacement && this.showOnCurrentPage);}- @computed("postNumber", "placement")- get showAfterPost() {- if (- !this.postNumber &&- this.placement !== "topic-list-between" &&- this.placement !== "nested-roots-between"- ) {- return true;+ @computed("placement", "postNumber", "indexNumber")+ get showAfterPlacement() {+ if (this.placement === "topic-list-between") {+ return this.isNthTopicListItem(+ parseInt(this.site.get("house_creatives.settings.after_nth_topic"), 10)+ );}- return this.isNthPost(- parseInt(this.site.get("house_creatives.settings.after_nth_post"), 10)- );- }-- @computed("placement")- get showAfterTopicListItem() {- if (this.placement !== "topic-list-between") {- return true;+ if (this.placement === "nested-roots-between") {+ return this.isNthTopicListItem(+ parseInt(this.site.get("house_creatives.settings.after_nth_root"), 10)+ );}- return this.isNthTopicListItem(- parseInt(this.site.get("house_creatives.settings.after_nth_topic"), 10)- );- }-- @computed("placement")- get showAfterNestedRoot() {- if (this.placement !== "nested-roots-between") {- return true;+ if (this.postNumber) {+ return this.isNthPost(+ parseInt(this.site.get("house_creatives.settings.after_nth_post"), 10)+ );}- return this.isNthTopicListItem(- parseInt(this.site.get("house_creatives.settings.after_nth_root"), 10)- );+ return true;}chooseAdHtml() {diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/nested-root-ad.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/nested-root-ad.gjsindex 83c01c512aa..d43b3dde298 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/nested-root-ad.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/nested-root-ad.gjs@@ -1,11 +1,26 @@-import AdSlot from "./ad-slot";+import Component from "@glimmer/component";+import AdSlot, { slotContenders } from "./ad-slot";-const NestedRootAd = <template>- <AdSlot- @placement="nested-roots-between"- @category={{@topic.category.slug}}- @indexNumber={{@index}}- />-</template>;+export default class NestedRootAd extends Component {+ static shouldRender(args, context) {+ return (+ args.index &&+ slotContenders(+ context.site,+ context.siteSettings,+ "nested-roots-between",+ args.index+ ).length > 0+ );+ }-export default NestedRootAd;+ <template>+ <div class="ad-connector ad-connector--nested-root">+ <AdSlot+ @placement="nested-roots-between"+ @category={{@topic.category.slug}}+ @indexNumber={{@index}}+ />+ </div>+ </template>+}diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/initializers/initialize-ad-plugin.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/initializers/initialize-ad-plugin.gjsindex 49298d01605..83f91d6b41e 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/initializers/initialize-ad-plugin.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/initializers/initialize-ad-plugin.gjs@@ -35,12 +35,5 @@ function customizePost(api) {</template>);- api.renderInOutlet(- "nested-roots-between",- <template>- <div class="ad-connector ad-connector--nested-root">- <NestedRootAd @index={{@index}} @topic={{@topic}} />- </div>- </template>- );+ api.renderInOutlet("nested-roots-between", NestedRootAd);}diff --git a/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rb b/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rbnew file mode 100644index 00000000000..517e512601d--- /dev/null+++ b/plugins/discourse-adplugin/spec/system/house_ads_nested_view_spec.rb@@ -0,0 +1,47 @@+# frozen_string_literal: true++describe "House ads in nested replies view" do+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:topic)+ fab!(:op) { Fabricate(:post, topic: topic) }+ fab!(:root_replies) { Fabricate.times(7, :post, topic: topic) }+ fab!(:house_ad)++ let(:nested_view) { PageObjects::Pages::NestedView.new }+ let(:nested_root_ads) { PageObjects::Components::NestedRootAds.new }++ before do+ enable_current_plugin+ SiteSetting.nested_replies_enabled = true+ SiteSetting.nested_replies_default_sort = "old"+ SiteSetting.house_ads_after_nth_root = 3+ SiteSetting.house_ads_after_nth_post = 2++ PluginStoreRow.create!(+ plugin_name: "discourse-adplugin",+ key: "ad-setting:nested_roots_between",+ type_name: "JSON",+ value: house_ad.name,+ )++ PluginStoreRow.create!(+ plugin_name: "discourse-adplugin",+ key: "ad-setting:post_bottom",+ type_name: "JSON",+ value: house_ad.name,+ )++ sign_in(user)+ end++ it "shows the user an ad after every nth root reply and no post-bottom ads" do+ nested_view.visit_nested(topic)++ expect(nested_view).to have_root_post(root_replies.first)+ expect(nested_root_ads).to have_ads(count: 2)+ expect(nested_root_ads).to have_ad_after(root_replies[2])+ expect(nested_root_ads).to have_ad_after(root_replies[5])+ expect(nested_root_ads).to have_no_ad_after(root_replies[0])+ expect(nested_root_ads).to have_no_post_bottom_ads+ end+enddiff --git a/plugins/discourse-adplugin/spec/system/page_objects/components/nested_root_ads.rb b/plugins/discourse-adplugin/spec/system/page_objects/components/nested_root_ads.rbnew file mode 100644index 00000000000..dbf791fc0af--- /dev/null+++ b/plugins/discourse-adplugin/spec/system/page_objects/components/nested_root_ads.rb@@ -0,0 +1,32 @@+# frozen_string_literal: true++module PageObjects+ module Components+ class NestedRootAds < PageObjects::Components::Base+ def has_ads?(count:)+ has_css?(+ ".ad-connector--nested-root .house-creative.house-nested-roots-between",+ count: count,+ )+ end++ def has_ad_after?(post)+ has_css?(ad_after_selector(post))+ end++ def has_no_ad_after?(post)+ has_no_css?(ad_after_selector(post))+ end++ def has_no_post_bottom_ads?+ has_no_css?(".house-creative.house-post-bottom")+ end++ private++ def ad_after_selector(post)+ ".nested-post:has([data-post-number='#{post.post_number}']) + .ad-connector--nested-root"+ end+ end+ end+end