Include the cookies consent components in custom views

rockandror · Mar 6, 2024 · 1d5c0fe · 1d5c0fe
1 parent 9b28a8b
commit 1d5c0fe
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 7 deletions.
diff --git a/app/components/custom/layout/footer_component.html.erb b/app/components/custom/layout/footer_component.html.erb
@@ -17,11 +17,20 @@
       <% end %>
     </div>
     <div class="small-12 large-2 column">
-      <%= link_to page_path("cookies") do %>
-        <div class="footer-link">
-          <%= image_tag(image_path_for("icono-cookies-footer.png"), alt: "") %>
-          <span><%= t("layouts.footer.links.cookies") %></span>
-        </div>
+      <% if cookies_setup_page_enabled? %>
+        <a href="#cookies_consent_setup" data-open="cookies_consent_setup">
+          <div class="footer-link">
+            <%= image_tag(image_path_for("icono-cookies-footer.png"), alt: "") %>
+            <%= t("layouts.footer.cookies_consent_setup") %>
+          </div>
+        </a>
+      <% else %>
+        <%= link_to page_path("cookies") do %>
+          <div class="footer-link">
+            <%= image_tag(image_path_for("icono-cookies-footer.png"), alt: "") %>
+            <span><%= t("layouts.footer.links.cookies") %></span>
+          </div>
+        <% end %>
       <% end %>
     </div>
     <div class="small-12 large-2 column">

diff --git a/app/views/custom/layouts/application.html.erb b/app/views/custom/layouts/application.html.erb
@@ -11,6 +11,7 @@
     <%= content_for :social_media_meta_tags %>
 
     <%= raw setting["html.per_page_code_head"] %>
+    <%= render Cookies::Vendors::ScriptsComponent.new %>
   </head>
   <body class="<%= yield(:body_class) %> public">
     <%= raw setting["html.per_page_code_body"] %>
@@ -27,6 +28,8 @@
     <div class="footer">
       <%= render Layout::FooterComponent.new %>
     </div>
+    <%= render Layout::CookiesConsent::BannerComponent.new %>
+    <%= render Layout::CookiesConsent::SetupComponent.new %>
     <div class="reveal" id="googleSearch" data-reveal>
       <button class="close-button" data-close aria-label="Close modal" type="button">
         <span aria-hidden="true">&times;</span>

diff --git a/spec/components/custom/layout/footer_component_spec.rb b/spec/components/custom/layout/footer_component_spec.rb
@@ -0,0 +1,27 @@
+require "rails_helper"
+
+describe Layout::FooterComponent do
+  describe "when the cookies consent feature is enabled" do
+    before { Setting["feature.cookies_consent"] = true }
+
+    it "shows a link to the cookies setup modal when the cookies setup page is enabled" do
+      Setting["cookies_consent.setup_page"] = true
+
+      render_inline Layout::FooterComponent.new
+
+      page.find("footer") do |footer|
+        expect(footer).to have_css "a[data-open=cookies_consent_setup]", text: "Cookies setup"
+      end
+    end
+
+    it "does not show a link to the cookies setup modal when the cookies setup page is disabled" do
+      Setting["cookies_consent.setup_page"] = false
+
+      render_inline Layout::FooterComponent.new
+
+      page.find("footer") do |footer|
+        expect(footer).not_to have_css "a[data-open=cookies_consent_setup]", text: "Cookies setup"
+      end
+    end
+  end
+end
diff --git a/spec/components/layout/footer_component_spec.rb b/spec/components/layout/footer_component_spec.rb
@@ -17,7 +17,7 @@
   describe "when the cookies consent feature is enabled" do
     before { Setting["feature.cookies_consent"] = true }
 
-    it "shows a link to the cookies setup modal when the cookies setup page is enabled" do
+    it "shows a link to the cookies setup modal when the cookies setup page is enabled", :consul do
       Setting["cookies_consent.setup_page"] = true
 
       render_inline Layout::FooterComponent.new
@@ -27,7 +27,7 @@
       end
     end
 
-    it "does not show a link to the cookies setup modal when the cookies setup page is disabled" do
+    it "does not show a link to the cookies setup modal when the cookies setup page is disabled", :consul do
       Setting["cookies_consent.setup_page"] = false
 
       render_inline Layout::FooterComponent.new