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

Rename Admin::DisplayAds controller to Billboards (#19687)

Browse source
This commit is contained in:
Anna Buianova 2023-07-07 15:11:35 +03:00 • committed by GitHub
parent cd9d5df963
commit 8cc6f37a2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 47 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/admin/display_ads_controller.rb → app/controllers/admin/billboards_controller.rb
View file

@ -1,5 +1,5 @@
module Admin
class DisplayAdsController < Admin::ApplicationController
class BillboardsController < Admin::ApplicationController
layout "admin"
after_action :bust_ad_caches, only: %i[create update destroy]
@ -26,8 +26,8 @@ module Admin
@display_ad.creator = current_user
if @display_ad.save
flash[:success] = I18n.t("admin.display_ads_controller.created")
redirect_to edit_admin_display_ad_path(@display_ad.id)
flash[:success] = I18n.t("admin.billboards_controller.created")
redirect_to edit_admin_billboard_path(@display_ad.id)
else
flash[:danger] = @display_ad.errors_as_sentence
render :new
@ -38,8 +38,8 @@ module Admin
@display_ad = DisplayAd.find(params[:id])
if @display_ad.update(display_ad_params)
flash[:success] = I18n.t("admin.display_ads_controller.updated")
redirect_to edit_admin_display_ad_path(params[:id])
flash[:success] = I18n.t("admin.billboards_controller.updated")
redirect_to edit_admin_billboard_path(params[:id])
else
flash[:danger] = @display_ad.errors_as_sentence
render :edit
@ -50,9 +50,9 @@ module Admin
@display_ad = DisplayAd.find(params[:id])
if @display_ad.destroy
render json: { message: I18n.t("admin.display_ads_controller.deleted") }, status: :ok
render json: { message: I18n.t("admin.billboards_controller.deleted") }, status: :ok
else
render json: { error: I18n.t("admin.display_ads_controller.wrong") }, status: :unprocessable_entity
render json: { error: I18n.t("admin.billboards_controller.wrong") }, status: :unprocessable_entity
end
end

2
app/controllers/pages_controller.rb
View file

@ -82,7 +82,7 @@ class PagesController < ApplicationController
end
def report_abuse
billboard_url = admin_display_ad_path(params[:billboard]) if params[:billboard].present?
billboard_url = admin_billboard_path(params[:billboard]) if params[:billboard].present?
reported_url = params[:reported_url] || params[:url] || request.referer.presence
@feedback_message = FeedbackMessage.new(
reported_url: billboard_url || reported_url&.chomp("?i=i"),

2
app/javascript/admin/controllers/confirmation_modal_controller.js
View file

@ -15,7 +15,7 @@ window.addEventListener('load', () => {
const nonRedirectEndpoints = [
'/admin/content_manager/badge_achievements',
'/admin/customization/display_ads',
'/admin/customization/billboards',
];
const redirectEndpoints = ['/admin/advanced/broadcasts'];

2
app/models/admin_menu.rb
View file

@ -26,7 +26,7 @@ class AdminMenu
scope :customization, "tools-line", [
item(name: "config"),
item(name: "html variants", controller: "html_variants"),
item(name: "display ads"),
item(name: "display ads", controller: "billboards"),
item(name: "navigation links"),
item(name: "pages"),
item(name: "profile fields"),

0
app/views/admin/display_ads/_form.html.erb → app/views/admin/billboards/_form.html.erb
View file

2
app/views/admin/display_ads/edit.html.erb → app/views/admin/billboards/edit.html.erb
View file

@ -1,7 +1,7 @@
<%= stylesheet_link_tag "minimal", media: "all" %>
<h1 class="crayons-title mb-6">Edit Display Ad:</h1>
<div class="crayons-card p-6">
<%= form_for([:admin, @display_ad], method: :patch) do %>
<%= form_for([:admin, @display_ad], url: admin_billboard_path(@display_ad), method: :patch) do %>
<%= render "form" %>
<%= submit_tag "Update Display Ad", class: "c-btn c-btn--primary" %>
<% end %>

10
app/views/admin/display_ads/index.html.erb → app/views/admin/billboards/index.html.erb
View file

@ -7,12 +7,12 @@
data-confirmation-modal-title-value="Confirm changes"
data-confirmation-modal-size-value="m">
<nav class="flex mb-4" aria-label="Display Ads navigation">
<%= form_tag(admin_display_ads_path, method: "get") do %>
<%= form_tag(admin_billboards_path, method: "get") do %>
<%= text_field_tag(:search, params[:search], aria: { label: "Search" }, class: "crayons-header--search-input crayons-textfield", placeholder: "Search", autocomplete: "off") %>
<% end %>
<div class="ml-auto">
<div class="justify-end">
<%= link_to "Make A New Display Ad", new_admin_display_ad_path, class: "crayons-btn" %>
<%= link_to "Make A New Display Ad", new_admin_billboard_path, class: "crayons-btn" %>
</div>
</div>
</nav>
@ -33,7 +33,7 @@
<tbody class="crayons-card">
<% @display_ads.each do |display_ad| %>
<tr data-row-id="<%= display_ad.id %>">
<td><%= link_to display_ad.name, edit_admin_display_ad_path(display_ad) %></td>
<td><%= link_to display_ad.name, edit_admin_billboard_path(display_ad) %></td>
<td><%= display_ad.human_readable_placement_area %></td>
<td><%= display_ad.display_to %></td>
<td><%= display_ad.type_of.titleize %></td>
@ -43,12 +43,12 @@
<td><span class="crayons-icon" role="img" aria-label="Ad is not published or approved">❌</span></td>
<% end %>
<td><%= display_ad.success_rate %></td>
<td><%= link_to "Edit", edit_admin_display_ad_path(display_ad), class: "crayons-btn" %></td>
<td><%= link_to "Edit", edit_admin_billboard_path(display_ad), class: "crayons-btn" %></td>
<td>
<button
class="crayons-btn crayons-btn--danger"
data-item-id="<%= display_ad.id %>"
data-endpoint="/admin/customization/display_ads"
data-endpoint="/admin/customization/billboards"
data-username="<%= current_user.username %>"
data-action="click->confirmation-modal#openModal">Destroy</button>
</td>

2
app/views/admin/display_ads/new.html.erb → app/views/admin/billboards/new.html.erb
View file

@ -1,6 +1,6 @@
<h1 class="crayons-title mb-4">Make a new Display Ad</h1>
<div class="crayons-card p-6">
<%= form_for([:admin, @display_ad], method: :post) do %>
<%= form_for([:admin, @display_ad], url: admin_billboards_path, method: :post) do %>
<%= render "form" %>
<%= submit_tag "Save Display Ad", class: "c-btn c-btn--primary" %>
<% end %>

2
config/locales/controllers/admin/en.yml
View file

@ -24,7 +24,7 @@ en:
deleted: '%{app} has been deleted!'
updated: '%{app} has been updated!'
wrong: Something went wrong with deleting %{app}.
display_ads_controller:
billboards_controller:
created: Display Ad has been created!
deleted: Display Ad has been deleted!
updated: Display Ad has been updated!

2
config/locales/controllers/admin/fr.yml
View file

@ -24,7 +24,7 @@ fr:
deleted: '%{app} a été supprimé !'
updated: '%{app} a été mis à jour !'
wrong: Quelque chose s'est mal passé en supprimant %{app}.
display_ads_controller:
billboards_controller:
created: L'annonce publicitaire a été créée !
deleted: L'annonce a été supprimée !
updated: L'annonce publicitaire a été mise à jour !

3
config/routes/admin.rb
View file

@ -102,7 +102,8 @@ namespace :admin do
scope :customization do
# We renamed the controller but don't want to change the route (yet)
resource :config, controller: "settings"
resources :display_ads, only: %i[index edit update new create destroy]
# resources :display_ads, only: %i[index edit update new create destroy]
resources :billboards, only: %i[index edit update new create destroy]
resources :html_variants, only: %i[index edit update new create show destroy]
resources :navigation_links, only: %i[index update create destroy]
resources :pages, only: %i[index new create edit update destroy]

2
cypress/e2e/seededFlows/adminFlows/displayAds/createDisplayAds.spec.js → cypress/e2e/seededFlows/adminFlows/billboards/createBillboards.spec.js
View file

@ -5,7 +5,7 @@ describe('Create Display Ads', () => {
cy.fixture('users/adminUser.json').as('user');
cy.get('@user').then((user) => {
cy.loginAndVisit(user, '/admin/customization/display_ads');
cy.loginAndVisit(user, '/admin/customization/billboards');
cy.findByRole('link', { name: 'Make A New Display Ad' }).click({
force: true,
});

4
cypress/e2e/seededFlows/adminFlows/displayAds/deleteDisplayAds.spec.js → cypress/e2e/seededFlows/adminFlows/billboards/deleteBillboards.spec.js
View file

@ -4,7 +4,7 @@ describe('Delete Display Ads', () => {
cy.fixture('users/adminUser.json').as('user');
cy.get('@user').then((user) => {
cy.loginAndVisit(user, '/admin/customization/display_ads');
cy.loginAndVisit(user, '/admin/customization/billboards');
cy.findByRole('table').within(() => {
cy.findByRole('button', { name: 'Destroy' }).click({ force: true });
@ -57,7 +57,7 @@ describe('Delete Display Ads', () => {
});
it('generates error message when remove action fails', () => {
cy.intercept('DELETE', '/admin/customization/display_ads/**', {
cy.intercept('DELETE', '/admin/customization/billboards/**', {
statusCode: 422,
body: {
error: 'Something went wrong with deleting the Display Ad.',

44
spec/requests/admin/display_ads_spec.rb → spec/requests/admin/billboards_spec.rb
View file

@ -1,14 +1,14 @@
require "rails_helper"
require "requests/shared_examples/internal_policy_dependant_request"
RSpec.describe "/admin/customization/display_ads" do
let(:get_resource) { get admin_display_ads_path }
RSpec.describe "/admin/customization/billboards" do
let(:get_resource) { get admin_billboards_path }
let(:org) { create(:organization) }
let(:params) do
{ organization_id: org.id, body_markdown: "[Click here!](https://example.com)", placement_area: "sidebar_left",
approved: true, published: true, priority: true }
end
let(:post_resource) { post admin_display_ads_path, params: params }
let(:post_resource) { post admin_billboards_path, params: params }
it_behaves_like "an InternalPolicy dependant request", DisplayAd do
let(:request) { get_resource }
@ -19,13 +19,13 @@ RSpec.describe "/admin/customization/display_ads" do
before { sign_in user }
describe "GET /admin/customization/display_ads" do
describe "GET /admin/customization/billboards" do
it "blocks the request" do
expect { get_resource }.to raise_error(Pundit::NotAuthorizedError)
end
end
describe "POST /admin/customization/display_ads" do
describe "POST /admin/customization/billboards" do
it "blocks the request" do
expect { post_resource }.to raise_error(Pundit::NotAuthorizedError)
end
@ -37,14 +37,14 @@ RSpec.describe "/admin/customization/display_ads" do
before { sign_in super_admin }
describe "GET /admin/customization/display_ads" do
describe "GET /admin/customization/billboards" do
it "allows the request" do
get_resource
expect(response).to have_http_status(:ok)
end
end
describe "POST /admin/customization/display_ads" do
describe "POST /admin/customization/billboards" do
it "creates a new display_ad" do
expect do
post_resource
@ -63,13 +63,13 @@ RSpec.describe "/admin/customization/display_ads" do
end
end
describe "PUT /admin/customization/display_ads" do
describe "PUT /admin/customization/billboards" do
let!(:display_ad) { create(:display_ad, approved: false) }
it "updates DisplayAd's approved value" do
Timecop.freeze(Time.current) do
expect do
put admin_display_ad_path(display_ad.id), params: params
put admin_billboard_path(display_ad.id), params: params
end.to change { display_ad.reload.approved }.from(false).to(true)
end
end
@ -77,23 +77,23 @@ RSpec.describe "/admin/customization/display_ads" do
it "updates DisplayAd's priority value" do
Timecop.freeze(Time.current) do
expect do
put admin_display_ad_path(display_ad.id), params: params
put admin_billboard_path(display_ad.id), params: params
end.to change { display_ad.reload.priority }.from(false).to(true)
end
end
it "redirects back to edit path" do
put admin_display_ad_path(display_ad.id), params: params
expect(response.body).to redirect_to edit_admin_display_ad_path(display_ad.id)
put admin_billboard_path(display_ad.id), params: params
expect(response.body).to redirect_to edit_admin_billboard_path(display_ad.id)
end
end
describe "DELETE /admin/display_ads/:id" do
describe "DELETE /admin/billboards/:id" do
let!(:display_ad) { create(:display_ad) }
it "deletes the Display Ad" do
expect do
delete admin_display_ad_path(display_ad.id)
delete admin_billboard_path(display_ad.id)
end.to change { DisplayAd.all.count }.by(-1)
end
end
@ -104,14 +104,14 @@ RSpec.describe "/admin/customization/display_ads" do
before { sign_in single_resource_admin }
describe "GET /admin/customization/display_ads" do
describe "GET /admin/customization/billboards" do
it "allows the request" do
get_resource
expect(response).to have_http_status(:ok)
end
end
describe "POST /admin/customization/display_ads" do
describe "POST /admin/customization/billboards" do
it "creates a new display_ad" do
expect do
post_resource
@ -124,24 +124,24 @@ RSpec.describe "/admin/customization/display_ads" do
end
end
describe "PUT /admin/customization/display_ads" do
describe "PUT /admin/customization/billboards" do
let!(:display_ad) { create(:display_ad, approved: false) }
it "updates DisplayAd's approved value" do
Timecop.freeze(Time.current) do
expect do
put admin_display_ad_path(display_ad.id), params: params
put admin_billboard_path(display_ad.id), params: params
end.to change { display_ad.reload.approved }.from(false).to(true)
end
end
end
describe "DELETE /admin/display_ads/:id" do
describe "DELETE /admin/billboards/:id" do
let!(:display_ad) { create(:display_ad) }
it "deletes the Display Ad" do
expect do
delete admin_display_ad_path(display_ad.id)
delete admin_billboard_path(display_ad.id)
end.to change { DisplayAd.all.count }.by(-1)
end
end
@ -152,13 +152,13 @@ RSpec.describe "/admin/customization/display_ads" do
before { sign_in single_resource_admin }
describe "GET /admin/customization/display_ads" do
describe "GET /admin/customization/billboards" do
it "blocks the request" do
expect { get_resource }.to raise_error(Pundit::NotAuthorizedError)
end
end
describe "POST /admin/customization/display_ads" do
describe "POST /admin/customization/billboards" do
it "blocks the request" do
expect { post_resource }.to raise_error(Pundit::NotAuthorizedError)
end

2
spec/views/admin/display_ads/new_spec.rb → spec/views/admin/billboards/new_spec.rb
View file

@ -1,6 +1,6 @@
require "rails_helper"
RSpec.describe "admin/display_ads/new" do
RSpec.describe "admin/billboards/new" do
let(:admin) { build(:user, :super_admin) }
before do