From c53522a8a83a5bb61a6f745d478106e52b8a51b8 Mon Sep 17 00:00:00 2001
From: Jacob Herrington <jacobherringtondeveloper@gmail.com>
Date: Wed, 7 Oct 2020 09:19:18 -0500
Subject: [PATCH] Remove random onboarding background images (#10683)

* Fix misleading alt tags

* Make random fallback images optional
---
 app/helpers/application_helper.rb       | 6 ++++--
 app/views/admin/configs/show.html.erb   | 4 ++--
 app/views/onboardings/show.html.erb     | 2 +-
 spec/helpers/application_helper_spec.rb | 5 +++++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index edd5b39a1..b7bc97945 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -76,8 +76,10 @@ module ApplicationHelper
     "https://res.cloudinary.com/#{ApplicationConfig['CLOUDINARY_CLOUD_NAME']}/image/upload/#{postfix}"
   end
 
-  def optimized_image_url(url, width: 500, quality: 80, fetch_format: "auto")
-    image_url = url.presence || asset_path("#{rand(1..40)}.png")
+  def optimized_image_url(url, width: 500, quality: 80, fetch_format: "auto", random_fallback: true)
+    fallback_image = asset_path("#{rand(1..40)}.png") if random_fallback
+
+    return unless (image_url = url.presence || fallback_image)
 
     Images::Optimizer.call(SimpleIDN.to_ascii(image_url), width: width, quality: quality, fetch_format: fetch_format)
   end
diff --git a/app/views/admin/configs/show.html.erb b/app/views/admin/configs/show.html.erb
index cf60b15f6..fa90405b5 100644
--- a/app/views/admin/configs/show.html.erb
+++ b/app/views/admin/configs/show.html.erb
@@ -778,7 +778,7 @@
                                  placeholder: Constants::SiteConfig::DETAILS[:onboarding_background_image][:placeholder] %>
                 <div class="row mt-2">
                   <div class="col-12">
-                    <img alt="main social image" class="img-fluid" src="<%= SiteConfig.onboarding_background_image %>" />
+                    <img alt="onboarding background image" class="img-fluid" src="<%= SiteConfig.onboarding_background_image %>" />
                   </div>
                   <div class="col-12">
                     <div class="alert alert-info"><%= Constants::SiteConfig::DETAILS[:onboarding_background_image][:description] %></div>
@@ -794,7 +794,7 @@
                                  placeholder: Constants::SiteConfig::DETAILS[:onboarding_taskcard_image][:placeholder] %>
                 <div class="row mt-2">
                   <div class="col-12">
-                    <img alt="main social image" class="img-fluid" src="<%= SiteConfig.onboarding_taskcard_image %>" />
+                    <img alt="onboarding taskcard image" class="img-fluid" src="<%= SiteConfig.onboarding_taskcard_image %>" />
                   </div>
                   <div class="col-12">
                     <div class="alert alert-info"><%= Constants::SiteConfig::DETAILS[:onboarding_taskcard_image][:description] %></div>
diff --git a/app/views/onboardings/show.html.erb b/app/views/onboardings/show.html.erb
index bd9c4d214..592eff8e3 100644
--- a/app/views/onboardings/show.html.erb
+++ b/app/views/onboardings/show.html.erb
@@ -15,7 +15,7 @@
   data-community-name="<%= community_name %>"
   data-community-description="<%= SiteConfig.community_description %>"
   data-community-logo="<%= optimized_image_url(safe_logo_url(SiteConfig.onboarding_logo_image)) %>"
-  data-community-background="<%= optimized_image_url(SiteConfig.onboarding_background_image, width: 1680, quality: 75) %>">
+  data-community-background="<%= optimized_image_url(SiteConfig.onboarding_background_image, width: 1680, quality: 75, random_fallback: false) %>">
   <%= javascript_packs_with_chunks_tag "Onboarding", defer: true %>
 </div>
 
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 5a853208a..324bdf686 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -207,6 +207,11 @@ RSpec.describe ApplicationHelper, type: :helper do
     it "keeps an ASCII domain as ASCII" do
       expect(helper.optimized_image_url("https://www.xn--vnx.dev/image.png")).to include("https://www.xn--vnx.dev")
     end
+
+    it "returns random fallback images as expected" do
+      expect(helper.optimized_image_url("")).not_to be_nil
+      expect(helper.optimized_image_url("", random_fallback: false)).to be_nil
+    end
   end
 
   describe "#optimized_image_tag" do