From 33d20363dbb133e903aa119b739212bca6293b0b Mon Sep 17 00:00:00 2001
From: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk>
Date: Wed, 16 Oct 2024 15:59:26 +0100
Subject: [PATCH 1/4] Add a render_block helper

The render_block method fails silently if a block doesn't exist.
This means that the page won't fail if a block is added to the YAML
before the block has been built, or if the block name has a typo in it.
The page won't fail, the block just won't display.
---
 app/helpers/block_helper.rb       | 7 +++++++
 spec/helpers/block_helper_spec.rb | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/app/helpers/block_helper.rb b/app/helpers/block_helper.rb
index 766a2786fb..7890debc6e 100644
--- a/app/helpers/block_helper.rb
+++ b/app/helpers/block_helper.rb
@@ -1,4 +1,11 @@
 module BlockHelper
+  def render_block(block)
+    render("landing_page/blocks/#{block.type}", block:)
+  rescue ActionView::MissingTemplate
+    Rails.logger.warn("Missing template for block #{block.type}")
+    ""
+  end
+
   def tab_items_to_component_format(tab_items)
     tab_items.map do |ti|
       {
diff --git a/spec/helpers/block_helper_spec.rb b/spec/helpers/block_helper_spec.rb
index 4345b62c95..1efa2dec54 100644
--- a/spec/helpers/block_helper_spec.rb
+++ b/spec/helpers/block_helper_spec.rb
@@ -60,4 +60,11 @@
       end
     end
   end
+
+  describe "#render_block" do
+    it "returns an empty string when a partial template doesn't exist" do
+      block = double(type: "not_a_block")
+      expect(render_block(block)).to be_empty
+    end
+  end
 end

From 7a11f0c05c0ba8ccb01ec01c82ce72a79d6d5db0 Mon Sep 17 00:00:00 2001
From: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk>
Date: Wed, 16 Oct 2024 16:00:18 +0100
Subject: [PATCH 2/4] Update landing page views to use the new block_helper
 methods

---
 app/views/landing_page/blocks/_blocks_container.html.erb  | 2 +-
 app/views/landing_page/blocks/_card.html.erb              | 2 +-
 app/views/landing_page/blocks/_featured.html.erb          | 2 +-
 app/views/landing_page/blocks/_grid_container.html.erb    | 2 +-
 app/views/landing_page/blocks/_hero.html.erb              | 2 +-
 app/views/landing_page/blocks/_two_column_layout.html.erb | 4 ++--
 app/views/landing_page/show.html.erb                      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/landing_page/blocks/_blocks_container.html.erb b/app/views/landing_page/blocks/_blocks_container.html.erb
index 36bf2980d5..3c5ea65df3 100644
--- a/app/views/landing_page/blocks/_blocks_container.html.erb
+++ b/app/views/landing_page/blocks/_blocks_container.html.erb
@@ -1,5 +1,5 @@
 <div class="blocks-container">
   <% block.children.each do |child| %>
-    <%= render "landing_page/blocks/#{child.type}", block: child %>
+    <%= render_block(child)  %>
   <% end %>
 </div>
diff --git a/app/views/landing_page/blocks/_card.html.erb b/app/views/landing_page/blocks/_card.html.erb
index 59482f0802..c6a3a9ede1 100644
--- a/app/views/landing_page/blocks/_card.html.erb
+++ b/app/views/landing_page/blocks/_card.html.erb
@@ -7,7 +7,7 @@
 <div class="app-b-card">
   <div class="app-b-card__textbox">
     <% block.card_content.each do |subblock| %>
-      <%= render "landing_page/blocks/#{subblock.type}", block: subblock, inverse: true %>
+      <%= render_block(subblock)  %>
     <% end %>
   </div>
   <figure class="app-b-card__figure">
diff --git a/app/views/landing_page/blocks/_featured.html.erb b/app/views/landing_page/blocks/_featured.html.erb
index 0c134dcce8..2226e31c0d 100644
--- a/app/views/landing_page/blocks/_featured.html.erb
+++ b/app/views/landing_page/blocks/_featured.html.erb
@@ -4,7 +4,7 @@
 <div class="featured">
   <div class="featured__child featured__child--content">
     <% block.featured_content.each do |subblock| %>
-      <%= render "landing_page/blocks/#{subblock.type}", block: subblock, inverse: true %>
+      <%= render_block(subblock) %>
     <% end %>
   </div>
   <div class="featured__child featured__child--image">
diff --git a/app/views/landing_page/blocks/_grid_container.html.erb b/app/views/landing_page/blocks/_grid_container.html.erb
index 259dd6c179..bf5c3af761 100644
--- a/app/views/landing_page/blocks/_grid_container.html.erb
+++ b/app/views/landing_page/blocks/_grid_container.html.erb
@@ -4,6 +4,6 @@
 
 <div class="grid-container">
   <% block.children.each do |child| %>
-    <%= render "landing_page/blocks/#{child.type}", block: child %>
+    <%= render_block(child) %>
   <% end %>
 </div>
diff --git a/app/views/landing_page/blocks/_hero.html.erb b/app/views/landing_page/blocks/_hero.html.erb
index bf098cfbb9..12daa28de9 100644
--- a/app/views/landing_page/blocks/_hero.html.erb
+++ b/app/views/landing_page/blocks/_hero.html.erb
@@ -15,7 +15,7 @@
       <div class="govuk-grid-column-two-thirds">
         <div class="app-b-hero__textbox">
           <% block.hero_content.each do |subblock| %>
-            <%= render "landing_page/blocks/#{subblock.type}", block: subblock, inverse: true %>
+            <%= render_block(subblock) %>
           <% end %>
         </div>
       </div>
diff --git a/app/views/landing_page/blocks/_two_column_layout.html.erb b/app/views/landing_page/blocks/_two_column_layout.html.erb
index 10df858856..7d6f56fb8f 100644
--- a/app/views/landing_page/blocks/_two_column_layout.html.erb
+++ b/app/views/landing_page/blocks/_two_column_layout.html.erb
@@ -1,8 +1,8 @@
 <div class="govuk-grid-row">
   <div class="<%= column_class_for_assymetric_columns(block.total_columns, block.left_column_size) %>">
-    <%= render "landing_page/blocks/#{block.left.type}", block: block.left %>
+    <%= render_block(block.left) %>
   </div>
   <div class="<%= column_class_for_assymetric_columns(block.total_columns, block.right_column_size) %>">
-    <%= render "landing_page/blocks/#{block.right.type}", block: block.right %>
+    <%= render_block(block.right) %>
   </div>
 </div>
diff --git a/app/views/landing_page/show.html.erb b/app/views/landing_page/show.html.erb
index de542467d8..736c8bd070 100644
--- a/app/views/landing_page/show.html.erb
+++ b/app/views/landing_page/show.html.erb
@@ -2,7 +2,7 @@
 <div class="landing-page" id="content">
   <% @content_item.blocks.each do |block| %>
     <%= tag.div class: ["govuk-block__#{block.type}", ("govuk-width-container" unless block.full_width?)] do
-      render "landing_page/blocks/#{block.type}", block:
+      render_block(block)
     end %>
   <% end %>
   <% if @content_item.blocks.empty? %>

From 31842982d3a52b2d09ee6482a800f0636cfe1a45 Mon Sep 17 00:00:00 2001
From: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk>
Date: Wed, 16 Oct 2024 16:02:26 +0100
Subject: [PATCH 3/4] Add an inverse flag to block config

Now that we're using a helper method to render a block it's harder to
tell whether a component should be inverted or not.

This moves the responsibility to the block configuration.
---
 app/views/landing_page/blocks/_action_link.html.erb | 2 +-
 app/views/landing_page/blocks/_govspeak.html.erb    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/landing_page/blocks/_action_link.html.erb b/app/views/landing_page/blocks/_action_link.html.erb
index b51a7a6a96..7d0fec7aae 100644
--- a/app/views/landing_page/blocks/_action_link.html.erb
+++ b/app/views/landing_page/blocks/_action_link.html.erb
@@ -1,5 +1,5 @@
 <%= render "govuk_publishing_components/components/action_link", {
-  inverse:,
+  inverse: block.data["inverse"],
   text: block.data["text"],
   href: block.data["href"]
 } %>
diff --git a/app/views/landing_page/blocks/_govspeak.html.erb b/app/views/landing_page/blocks/_govspeak.html.erb
index 35a3f44e52..ac1d87fdb9 100644
--- a/app/views/landing_page/blocks/_govspeak.html.erb
+++ b/app/views/landing_page/blocks/_govspeak.html.erb
@@ -1,5 +1,3 @@
-<% inverse ||= false %>
-
-<%= render "govuk_publishing_components/components/govspeak", { inverse: } do %>
+<%= render "govuk_publishing_components/components/govspeak", { inverse: block.data["inverse"] } do %>
   <%= block.data["content"].html_safe %>
 <% end %>

From 223bd80fe66391e21cbc24717aebb504f2cdd7e3 Mon Sep 17 00:00:00 2001
From: Leena Gupte <leena.gupte@digital.cabinet-office.gov.uk>
Date: Wed, 16 Oct 2024 16:03:16 +0100
Subject: [PATCH 4/4] Update config for blocks that should be inverted

---
 lib/data/landing_page_content_items/landing_page.yaml | 8 ++++++++
 spec/fixtures/landing_page.yaml                       | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/data/landing_page_content_items/landing_page.yaml b/lib/data/landing_page_content_items/landing_page.yaml
index 514cfd03cd..c72557e207 100644
--- a/lib/data/landing_page_content_items/landing_page.yaml
+++ b/lib/data/landing_page_content_items/landing_page.yaml
@@ -28,10 +28,12 @@ blocks:
   hero_content:
     blocks:
       - type: govspeak
+        inverse: true
         content: |
           <h2>This is a heading</h2>
           <p>Lorem ipsum...</p>
       - type: action_link
+        inverse: true
         text: "See the tasks"
         href: "todo"
 - type: featured
@@ -47,6 +49,7 @@ blocks:
   featured_content:
     blocks:
       - type: govspeak
+        inverse: true
         content: |
           <h2>Title of the content</h2>
           <p>Lorem ipsum dolor sit amet. In voluptas dolorum vel veniam nisi et voluptate dolores id voluptatem distinctio. Et quia accusantium At ducimus quis aut voluptates iusto aut esse suscipit.</p>
@@ -100,6 +103,7 @@ blocks:
     card_content:
       blocks:
         - type: govspeak
+          inverse: true
           content: <h2><a href="http://gov.uk">Title 1 govspeak title goes here</a></h2>
   - type: card
     image:
@@ -108,6 +112,7 @@ blocks:
     card_content:
       blocks:
         - type: govspeak
+          inverse: true
           content: <h2><a href="http://gov.uk">Title 2 govspeak title goes here</a></h2>
   - type: card
     image:
@@ -116,6 +121,7 @@ blocks:
     card_content:
       blocks:
         - type: govspeak
+          inverse: true
           content: <h2><a href="http://gov.uk">Title 3 govspeak title</a></h2>
 - type: two_column_layout
   theme: one_third_two_thirds
@@ -131,6 +137,7 @@ blocks:
       card_content:
         blocks:
           - type: govspeak
+            inverse: true
             content: <h2><a href="http://gov.uk">Title 1 govspeak title goes here</a></h2>
     - type: card
       image:
@@ -139,4 +146,5 @@ blocks:
       card_content:
         blocks:
           - type: govspeak
+            inverse: true
             content: <h2><a href="http://gov.uk">Title 2 govspeak title goes here</a></h2>
diff --git a/spec/fixtures/landing_page.yaml b/spec/fixtures/landing_page.yaml
index d5e7a2fc86..18aac1c1b1 100644
--- a/spec/fixtures/landing_page.yaml
+++ b/spec/fixtures/landing_page.yaml
@@ -12,10 +12,12 @@ blocks:
   hero_content:
     blocks:
       - type: govspeak
+        inverse: true
         content: |
           <h2>This is a heading</h2>
           <p>Lorem ipsum...</p>
       - type: action_link
+        inverse: true
         text: "See the missions"
         href: "todo"
 - type: featured
@@ -31,6 +33,7 @@ blocks:
   featured_content:
     blocks:
       - type: govspeak
+        inverse: true
         content: |
           <h2>Title of the content</h2>
           <p>Lorem ipsum dolor sit amet. In voluptas dolorum vel veniam nisi et voluptate dolores id voluptatem distinctio. Et quia accusantium At ducimus quis aut voluptates iusto aut esse suscipit.</p>
@@ -84,6 +87,7 @@ blocks:
     card_content:
       blocks:
         - type: govspeak
+          inverse: true
           content: <h2><a href="http://gov.uk">Title 1 govspeak title goes here</a></h2>
   - type: card
     image:
@@ -92,6 +96,7 @@ blocks:
     card_content:
       blocks:
         - type: govspeak
+          inverse: true 
           content: <h2><a href="http://gov.uk">Title 2 govspeak title goes here</a></h2>
   - type: card
     image:
@@ -100,6 +105,7 @@ blocks:
     card_content:
       blocks:
         - type: govspeak
+          inverse: true
           content: <h2><a href="http://gov.uk">Title 3 govspeak title</a></h2>
 - type: two_column_layout
   theme: one_third_two_thirds
@@ -115,6 +121,7 @@ blocks:
       card_content:
         blocks:
           - type: govspeak
+            inverse: true
             content: <h2><a href="http://gov.uk">Title 1 govspeak title goes here</a></h2>
     - type: card
       image:
@@ -123,4 +130,5 @@ blocks:
       card_content:
         blocks:
           - type: govspeak
+            inverse: true
             content: <h2><a href="http://gov.uk">Title 2 govspeak title goes here</a></h2>