maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename display ads vars in the views (#19877)

Browse source 
* Renamed display_ads vars to billboards

* Rename local vars in the feed view

* Renamed display-ad in the comment

Co-authored-by: Rajat Talesra <rajattalesra4914@gmail.com>

* Renamed variables in the views

---------

Co-authored-by: Rajat Talesra <rajattalesra4914@gmail.com>
This commit is contained in:
Anna Buianova 2023-08-03 13:28:23 +03:00 • committed by GitHub
parent 0150887926
commit b3c993410b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/articles/__tests__/Feed.test.jsx
View file

@ -210,7 +210,7 @@ describe('<Feed /> component', () => {
const lastCallbackResult =
callback.mock.calls[callback.mock.calls.length - 1][0];
expect(lastCallbackResult.feedItems[0]).toEqual(firstBillboard);
// there is no second bilboard so podcasts get rendered in 4th place
// there is no second billboard so podcasts get rendered in 4th place
expect(lastCallbackResult.feedItems[3]).toEqual(podcastEpisodes);
expect(lastCallbackResult.feedItems[8]).toEqual(thirdBillboard);
});
@ -249,7 +249,7 @@ describe('<Feed /> component', () => {
const pinnedItem = feedPosts.find((o) => o.pinned === true);
// there is no first billboard
expect(lastCallbackResult.feedItems[0]).toEqual(pinnedItem);
// there is no second bilboard so podcasts get rendered in 3rd place
// there is no second billboard so podcasts get rendered in 3rd place
expect(lastCallbackResult.feedItems[2]).toEqual(podcastEpisodes);
expect(lastCallbackResult.feedItems[7]).toEqual(thirdBillboard);
});

2
app/views/articles/index.html.erb
View file

@ -27,7 +27,7 @@
<%= javascript_packs_with_chunks_tag "homePage", defer: true %>
<% cache(release_adjusted_cache_key("main-stories-index-#{params}-#{user_signed_in?}"), expires_in: 90.seconds) do %>
<% if @hero_billboard && FeatureFlag.enabled?(:hero_billboard) %>
<%= render partial: "shared/display_ad", locals: { display_ad: @hero_billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<%= render partial: "shared/billboard", locals: { billboard: @hero_billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% end %>
<div class="crayons-layout crayons-layout--3-cols crayons-layout--3-cols--drop-right-left" id="index-container"
data-params="<%= params.merge(sort_by: "hotness_score", sort_direction: "desc").to_json(only: %i[tag username q sort_by sort_direction]) %>" data-which="<%= @list_of %>"

4
app/views/billboards/show.html.erb
View file

@ -1,9 +1,9 @@
<% if @billboard %>
<% if user_signed_in? %>
<%= render partial: "shared/display_ad", locals: { display_ad: @billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_ARTICLE } %>
<%= render partial: "shared/billboard", locals: { billboard: @billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_ARTICLE } %>
<% else %>
<% cache([params[:username], params[:slug], params[:placement_area]], expires_in: 15.minutes) do %>
<%= render partial: "shared/display_ad", locals: { display_ad: @billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_ARTICLE } %>
<%= render partial: "shared/billboard", locals: { billboard: @billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_ARTICLE } %>
<% end %>
<% end %>
<% end %>

28
app/views/shared/_display_ad.html.erb → app/views/shared/_billboard.html.erb
View file

@ -1,43 +1,43 @@
<% if display_ad.placement_area.start_with?("feed_") %>
<% if billboard.placement_area.start_with?("feed_") %>
<div class="crayons-story crayons-story__display-ad billboard"
data-display-unit data-id="<%= display_ad.id %>"
data-display-unit data-id="<%= billboard.id %>"
data-category-click="<%= BillboardEvent::CATEGORY_CLICK %>"
data-category-impression="<%= BillboardEvent::CATEGORY_IMPRESSION %>"
data-context-type="<%= data_context_type %>"
data-type-of="<%= display_ad.type_of %>">
data-type-of="<%= billboard.type_of %>">
<div class="crayons-story__body">
<div class="crayons-story__top">
<%= render partial: "shared/display_ad_header", locals: { display_ad: display_ad } %>
<%= render partial: "shared/billboard_header", locals: { billboard: billboard } %>
</div>
<div class="crayons-story__indention-display-ad">
<div class="text-styles text-styles--display-ad">
<%= display_ad.processed_html.html_safe %>
<%= billboard.processed_html.html_safe %>
</div>
</div>
</div>
</div>
<% elsif display_ad.placement_area == "home_hero" %>
<% elsif billboard.placement_area == "home_hero" %>
<div class="crayons-card crayons-card--secondary crayons-sponsorship crayons-story__display-ad hero-billboard"
data-display-unit data-id="<%= display_ad.id %>"
data-display-unit data-id="<%= billboard.id %>"
data-category-click="<%= BillboardEvent::CATEGORY_CLICK %>"
data-category-impression="<%= BillboardEvent::CATEGORY_IMPRESSION %>"
data-context-type="<%= data_context_type %>"
data-type-of="<%= display_ad.type_of %>">
<%= render partial: "shared/display_ad_header", locals: { display_ad: display_ad } %>
data-type-of="<%= billboard.type_of %>">
<%= render partial: "shared/billboard_header", locals: { billboard: billboard } %>
<div class="p-1 text-styles text-styles--display-ad">
<%= display_ad.processed_html.html_safe %>
<%= billboard.processed_html.html_safe %>
</div>
</div>
<% else %>
<div class="crayons-card crayons-card--secondary crayons-sponsorship billboard"
data-display-unit data-id="<%= display_ad.id %>"
data-display-unit data-id="<%= billboard.id %>"
data-category-click="<%= BillboardEvent::CATEGORY_CLICK %>"
data-category-impression="<%= BillboardEvent::CATEGORY_IMPRESSION %>"
data-context-type="<%= data_context_type %>"
data-type-of="<%= display_ad.type_of %>">
<%= render partial: "shared/display_ad_header", locals: { display_ad: display_ad } %>
data-type-of="<%= billboard.type_of %>">
<%= render partial: "shared/billboard_header", locals: { billboard: billboard } %>
<div class="p-1 pt-3 text-styles text-styles--display-ad">
<%= display_ad.processed_html.html_safe %>
<%= billboard.processed_html.html_safe %>
</div>
</div>
<% end %>

16
app/views/shared/_display_ad_header.html.erb → app/views/shared/_billboard_header.html.erb
View file

@ -1,11 +1,11 @@
<div class="crayons-sponsorship__header relative">
<% if display_ad.organization_id? && (display_ad.type_of == "community" || display_ad.type_of == "external") %>
<% if billboard.organization_id? && (billboard.type_of == "community" || billboard.type_of == "external") %>
<div class="flex">
<a href="<%= display_ad.organization.path %>" target="_blank" rel="noopener" class="flex">
<img width="24" height="24" class="radius-default crayons-sponsorship__image" src="<%= display_ad.organization.profile_image_url_for(length: 64) %>" alt="profile" loading="lazy" />
<div class="crayons-sponsorship__title ml-2 fs-s fw-medium"><%= display_ad.organization.name %></div>
<a href="<%= billboard.organization.path %>" target="_blank" rel="noopener" class="flex">
<img width="24" height="24" class="radius-default crayons-sponsorship__image" src="<%= billboard.organization.profile_image_url_for(length: 64) %>" alt="profile" loading="lazy" />
<div class="crayons-sponsorship__title ml-2 fs-s fw-medium"><%= billboard.organization.name %></div>
</a>
<% if display_ad.type_of == "external" %>
<% if billboard.type_of == "external" %>
<span class="crayons-sponsorship__indicator c-indicator c-indicator--subtle c-indicator--round fs-2xs fw-medium ml-2 py-1 px-2"><%= I18n.t("display_ad.promoted") %></span>
<% end %>
</div>
@ -13,13 +13,13 @@
<div class="crayons-sponsorship__title"><%= Settings::Community.community_name %></div>
<% end %>
<button id="sponsorship-dropdown-trigger-<%= display_ad.id %>" aria-controls="sponsorship-dropdown-<%= display_ad.id %>" aria-expanded="false" aria-haspopup="true"
<button id="sponsorship-dropdown-trigger-<%= billboard.id %>" aria-controls="sponsorship-dropdown-<%= billboard.id %>" aria-expanded="false" aria-haspopup="true"
class="dropBtn crayons-sponsorship__dropdown crayons-btn crayons-btn--s crayons-btn--ghost crayons-btn--icon"
aria-label="<%= t("display_ad.menu.aria_label") %>">
<%= crayons_icon_tag("small-overflow-horizontal", class: "pointer-events-none", title: t("display_ad.menu.icon")) %>
</button>
<div id="sponsorship-dropdown-<%= display_ad.id %>" class="crayons-dropdown sponsorship-dropdown right-0">
<div id="sponsorship-dropdown-<%= billboard.id %>" class="crayons-dropdown sponsorship-dropdown right-0">
<ul class="list-none m-0">
<li>
<a class="crayons-link crayons-link--block" href='/billboards'>
@ -35,7 +35,7 @@
</li>
<hr />
<li>
<a class="crayons-link crayons-link--block" href="/report-abuse?billboard=<%= display_ad.id %>">
<a class="crayons-link crayons-link--block" href="/report-abuse?billboard=<%= billboard.id %>">
<%= crayons_icon_tag("flag", width: 16, height: 16, aria_hidden: true, class: "c-btn__icon") %>
<%= I18n.t("display_ad.menu.report_billboard") %>
</a>

6
app/views/sidebars/_homepage_content.html.erb
View file

@ -1,8 +1,8 @@
<aside class="side-bar sidebar-additional showing grid gap-4" id="sidebar-additional">
<% cache(release_adjusted_cache_key("main-article-right-sidebar-discussions-#{params[:timeframe]}-#{user_signed_in?}"), expires_in: (params[:timeframe].blank? ? 120 : 360).seconds) do %>
<% @sidebar_ad = DisplayAd.for_display(area: "sidebar_right", user_signed_in: user_signed_in?) %>
<% if @sidebar_ad %>
<%= render partial: "shared/display_ad", locals: { display_ad: @sidebar_ad, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% @sidebar_billboard = DisplayAd.for_display(area: "sidebar_right", user_signed_in: user_signed_in?) %>
<% if @sidebar_billboard %>
<%= render partial: "shared/billboard", locals: { billboard: @sidebar_billboard, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% end %>
<%= render "articles/sidebar_campaign" if Campaign.current.show_in_sidebar? %>

36
app/views/stories/_main_stories_feed.html.erb
View file

@ -8,50 +8,50 @@
<% end %>
<% if !user_signed_in? %>
<% @sidebar_ad_first = DisplayAd.for_display(area: "feed_first", user_signed_in: user_signed_in?) %>
<% if @sidebar_ad_first %>
<%= render partial: "shared/display_ad", locals: { display_ad: @sidebar_ad_first, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% @sidebar_billboard_first = DisplayAd.for_display(area: "feed_first", user_signed_in: user_signed_in?) %>
<% if @sidebar_billboard_first %>
<%= render partial: "shared/billboard", locals: { billboard: @sidebar_billboard_first, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% end %>
<% end %>
<%# This second-display-ad should be shown between 2nd and 3rd article. %>
<% second_display_ad_position = 2 %>
<%# This second-billboard should be shown between 2nd and 3rd article. %>
<% second_billboard_position = 2 %>
<% if @pinned_article %>
<% second_display_ad_position -= 1 %>
<% second_billboard_position -= 1 %>
<%= render partial: "articles/single_story", locals: { story: @pinned_article, pinned: true, featured: @pinned_article.id == @featured_story.id } %>
<% end %>
<% if @featured_story.id && @pinned_article&.id != @featured_story.id %>
<% second_display_ad_position -= 1 %>
<% second_billboard_position -= 1 %>
<%= render partial: "articles/single_story", locals: { story: @featured_story, featured: true, pinned: false } %>
<% end %>
<div id="article-index-podcast-div"></div>
<%# This third-display-ad should be shown between 7th and 8th article. %>
<% third_display_ad_position = second_display_ad_position + 5 %>
<%# This third-billboard should be shown between 7th and 8th article. %>
<% third_billboard_position = second_billboard_position + 5 %>
<div class="substories" id="substories">
<% if @stories.any? %>
<% @stories.each_with_index do |story, i| %>
<% if !user_signed_in? && i == second_display_ad_position %>
<% @sidebar_ad_second = DisplayAd.for_display(area: "feed_second", user_signed_in: user_signed_in?) %>
<% if @sidebar_ad_second %>
<%= render partial: "shared/display_ad", locals: { display_ad: @sidebar_ad_second, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% if !user_signed_in? && i == second_billboard_position %>
<% @sidebar_billboard_second = DisplayAd.for_display(area: "feed_second", user_signed_in: user_signed_in?) %>
<% if @sidebar_billboard_second %>
<%= render partial: "shared/billboard", locals: { billboard: @sidebar_billboard_second, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% end %>
<% end %>
<% if !user_signed_in? && i == third_display_ad_position %>
<% @sidebar_ad_third = DisplayAd.for_display(area: "feed_third", user_signed_in: user_signed_in?) %>
<% if @sidebar_ad_third %>
<%= render partial: "shared/display_ad", locals: { display_ad: @sidebar_ad_third, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% if !user_signed_in? && i == third_billboard_position %>
<% @sidebar_billboard_third = DisplayAd.for_display(area: "feed_third", user_signed_in: user_signed_in?) %>
<% if @sidebar_billboard_third %>
<%= render partial: "shared/billboard", locals: { billboard: @sidebar_billboard_third, data_context_type: BillboardEvent::CONTEXT_TYPE_HOME } %>
<% end %>
<% end %>
<% if story.id != @featured_story.id && story.id != @pinned_article&.id %>
<%= render partial: "articles/single_story", locals: { story: story, featured: false, pinned: false } %>
<% else %>
<% third_display_ad_position += 1 %>
<% third_billboard_position += 1 %>
<% end %>
<% end %>
<% if @stories.size > 1 %>