From f29bb2d8226b400a77a24b0f478315ca52a018ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Lled=C3=B3?= <jlledo@redhat.com>
Date: Thu, 13 Oct 2022 13:32:12 +0200
Subject: [PATCH] THREESCALE-7522: Set the CDN URL in all layouts

---
 app/helpers/application_helper.rb              | 5 ++++-
 app/views/layouts/error.html.erb               | 1 +
 app/views/layouts/provider.html.slim           | 4 +---
 app/views/layouts/provider/iframe.html.slim    | 1 +
 app/views/layouts/provider/login.html.slim     | 2 +-
 app/views/layouts/provider/suspended.html.slim | 1 +
 app/views/layouts/wizard.html.slim             | 1 +
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f962ab3f08..fdf1e6f0e5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -365,7 +365,10 @@ def has_out_of_date_configuration?(service)
     service.pending_affecting_changes?
   end
 
-  #TODO: Tests pending for this
+  def rails_asset_url_tag
+    javascript_tag("window.rails_asset_host = '#{rails_asset_host_url}'", { type: "text/javascript"})
+  end
+
   def rails_asset_host_url
     asset_host_enabled = Rails.configuration.asset_host.present?
     asset_host_url = Rails.configuration.three_scale.asset_host.presence
diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb
index d6a6924d86..c19025ad20 100644
--- a/app/views/layouts/error.html.erb
+++ b/app/views/layouts/error.html.erb
@@ -6,6 +6,7 @@
     <%- admin_domain = Account.is_admin_domain?(request.internal_host) -%>
     <%- master_domain = Account.is_master_domain?(request.internal_host) -%>
     <%- site_account ||= Account.master -%>
+    <%= rails_asset_url_tag %>
     <%= stylesheet_link_tag 'error' -%>
     <%= render 'provider/analytics' if admin_domain %>
   </head>
diff --git a/app/views/layouts/provider.html.slim b/app/views/layouts/provider.html.slim
index f6a6caeba0..39eeeacde8 100644
--- a/app/views/layouts/provider.html.slim
+++ b/app/views/layouts/provider.html.slim
@@ -6,9 +6,7 @@ html[lang="en" class="pf-m-redhat-font"]
       = content_for?(:title) ? yield(:title) : default_title
       |  | Red Hat 3scale API Management
     = csrf_meta_tag
-    // Is this the entrypoint of the app?
-    javascript:
-        window.rails_asset_host = "#{rails_asset_host_url}";
+    = rails_asset_url_tag
     = javascript_pack_tag 'PF4Styles/base'
     = render 'provider/theme'
     = render 'provider/analytics'
diff --git a/app/views/layouts/provider/iframe.html.slim b/app/views/layouts/provider/iframe.html.slim
index 5ea0f875c9..c3854f00e4 100644
--- a/app/views/layouts/provider/iframe.html.slim
+++ b/app/views/layouts/provider/iframe.html.slim
@@ -6,6 +6,7 @@ html[lang="en"]
     base href=base_url
     = stylesheet_link_tag "provider/layouts/iframe"
     = csrf_meta_tag
+    = rails_asset_url_tag
     = yield :head
 
   body
diff --git a/app/views/layouts/provider/login.html.slim b/app/views/layouts/provider/login.html.slim
index a5f2d9c974..d70f6686fb 100644
--- a/app/views/layouts/provider/login.html.slim
+++ b/app/views/layouts/provider/login.html.slim
@@ -4,7 +4,7 @@ html[lang="en" class="pf-m-redhat-font"]
     meta http-equiv="Content-Type" content="text/html; charset=utf-8"
     title 3scale Login
     = csrf_meta_tag
-
+    = rails_asset_url_tag
     = javascript_pack_tag 'PF4Styles/base'
     = javascript_pack_tag 'PF4Styles/loginPage'
     = javascript_include_tag 'vendor/jquery-1.8.2.min.js', 'vendor/rails.js'
diff --git a/app/views/layouts/provider/suspended.html.slim b/app/views/layouts/provider/suspended.html.slim
index 8b18d127f6..524d9b99b7 100644
--- a/app/views/layouts/provider/suspended.html.slim
+++ b/app/views/layouts/provider/suspended.html.slim
@@ -5,6 +5,7 @@ html[lang="en"]
     title
       | Account Suspended | Red Hat 3scale API Management
     = csrf_meta_tag
+    = rails_asset_url_tag
     = stylesheet_link_tag "provider/themes/wizard.css"
     = render 'provider/analytics'
     = javascript_include_tag 'provider/layout/provider'
diff --git a/app/views/layouts/wizard.html.slim b/app/views/layouts/wizard.html.slim
index 8cebe09a12..0b89a6ab64 100644
--- a/app/views/layouts/wizard.html.slim
+++ b/app/views/layouts/wizard.html.slim
@@ -6,6 +6,7 @@ html[lang="en" class="pf-m-redhat-font"]
       = content_for?(:title) ? yield(:title) : default_title
       |  | Red Hat 3scale API Management
     = csrf_meta_tag
+    = rails_asset_url_tag
     = javascript_pack_tag 'PF4Styles/base'
     = stylesheet_link_tag "provider/themes/wizard.css"
     = render 'provider/analytics'