Added a get_model method into cms resource to pull out specific models by key

Refactored footer component
Updated and added additional tests

Author: A-Wheeto

app/components/cms/footer_component.rb

@@ -7,33 +7,9 @@ def initialize(data:)
     @data = data
   end
 
-  def company_logo
-    data_models_by_type(Cms::Models::Images::Image).first
-  end
-
-  def funding_logo
-    data_models_by_type(Cms::Models::Images::Image).second
-  end
-
-  def company_url
-    find_text_field(0)&.value
-  end
-
-  def funding_url
-    find_text_field(1)&.value
-  end
-
-  def link_blocks
-    data_models_by_type(Cms::Models::Meta::FooterLinkBlock).first&.process_blocks
-  end
-
   private
 
-  def data_models_by_type(type)
-    data.select { |model| model.is_a?(type) }
-  end
-
-  def find_text_field(index)
-    data_models_by_type(Cms::Models::Data::TextField)[index]
+  def get_model(key)
+    @data.get_model(key)
   end
 end

app/components/cms/footer_component/footer_component.html.erb

@@ -2,15 +2,15 @@
   <%= row.with_column("full") do %>
     <div class="cms-footer-component-wrapper">
       <div>
-        <a href="<%= company_url %>">
-          <%= render company_logo.render %>
+        <a href="<%= get_model(:company_logo_link).value %>">
+          <%= render get_model(:company_logo).render %>
         </a>
         <p class="govuk-body-s cms-footer-component--funding-text">Funded by</p>
-        <a href="<%= funding_url %>">
-          <%= render funding_logo.render %>
+        <a href="<%= get_model(:funder_logo_link).value %>">
+          <%= render get_model(:funder_logo).render %>
         </a>
       </div>
-      <% link_blocks.each do |block| %>
+      <% get_model(:link_block).link_blocks.each do |block| %>
         <div class="cms-footer-component__link-block">
           <% block.each do |link| %>
             <%= render link.render(additional_classes: ["govuk-footer__link", "ncce-link", "ncce-link--on-dark"]) %>

app/services/cms/resource.rb

@@ -23,6 +23,13 @@ def method_missing(method_name)
       data_models[index]
     end
 
+    def get_model(key)
+      index = self.class.param_indexes[key]
+      return nil unless index
+
+      data_models[index]
+    end
+
     def self.param_name(mapping)
       return mapping[:param_name] if mapping.has_key?(:param_name)
       mapping[:key].to_s.underscore.to_sym

app/views/components/_footer.html.erb

@@ -1,5 +1,5 @@
 <footer class="govuk-footer ncce-footer">
   <% if @cms_footer %>
-    <%= render Cms::FooterComponent.new(data: @cms_footer.data_models) %>
+    <%= render Cms::FooterComponent.new(data: @cms_footer) %>
   <% end %>
 </footer>

spec/components/cms/footer_component_spec.rb

@@ -3,18 +3,11 @@
 require "rails_helper"
 
 RSpec.describe Cms::FooterComponent, type: :component do
+  let(:data) { Cms::Singles::Footer.get }
+
   before do
-    render_inline(described_class.new(data: [
-      Cms::Models::Data::TextField.new(value: Faker::Lorem.word),
-      Cms::Models::Data::TextField.new(value: Faker::Lorem.word),
-      Cms::Mocks::Images::Image.as_model,
-      Cms::Mocks::Images::Image.as_model,
-      Cms::Models::Meta::FooterLinkBlock.new(
-        link_blocks: Array.new(4) do
-          Array.new(5) { Cms::Mocks::DynamicComponents::ContentBlocks::LinkWithIcon.as_model }
-        end
-      )
-    ]))
+    stub_strapi_footer
+    render_inline(described_class.new(data:))
   end
 
   it "renders the component" do
@@ -25,6 +18,14 @@
     expect(page).to have_css("img", count: 2)
   end
 
+  it "has the company logo link" do
+    expect(page).to have_link(href: data.get_model(:company_logo_link).value)
+  end
+
+  it "has the funder logo link" do
+    expect(page).to have_link(href: data.get_model(:funder_logo_link).value)
+  end
+
   it "renders the link blocks" do
     expect(page).to have_css(".cms-footer-component__link-block", count: 4)
   end