Updating model and view component

Initial setup of mocks and testing

Author: A-Wheeto

app/components/cms/footer_component.rb

@@ -1,19 +1,39 @@
 # frozen_string_literal: true
 
 class Cms::FooterComponent < ViewComponent::Base
+  attr_reader :data
+
   def initialize(data:)
     @data = data
   end
 
   def company_logo
-    @data.data_models.first
+    data_models_by_type(Cms::Models::Images::Image).first
   end
 
   def funding_logo
-    @data.data_models.second
+    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.data_models.last.link_block
+    data_models_by_type(Cms::Models::Meta::FooterLinkBlock).first&.process_blocks
+  end
+
+  private
+
+  def data_models_by_type(type)
+    data.data_models.select { |model| model.is_a?(type) }
+  end
+
+  def find_text_field(index)
+    data_models_by_type(Cms::Models::Data::TextField)[index]
   end
 end

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

@@ -2,20 +2,18 @@
   <%= row.with_column("full") do %>
     <div class="cms-footer-component-wrapper">
       <div>
-        <%= render company_logo.render %>
+        <a href="<%= company_url %>">
+          <%= render company_logo.render %>
+        </a>
         <p class="govuk-body-s cms-footer-component--funding-text">Funded by</p>
-        <%= render funding_logo.render %>
+        <a href="<%= funding_url %>">
+          <%= render funding_logo.render %>
+        </a>
       </div>
-
       <% link_blocks.each do |block| %>
         <div class="cms-footer-component__link-block">
           <% block[:links].each do |link| %>
-            <div>
-              <%= link_to link[:link_text], link[:url], class: "govuk-footer__link ncce-link ncce-link--on-dark" %>
-              <% if link[:icon][:data] %>
-                ICON
-              <% end %>
-            </div>
+            <%= render link.render %>
           <% end %>
         </div>
       <% end %>

app/components/cms/footer_component/footer_component.scss

@@ -4,10 +4,6 @@
 
   img {
     width: 125px;
-
-    @include govuk-media-query($until: desktop) {
-      width: 80px;
-    }
   }
 
   &--funding-text {
@@ -31,5 +27,14 @@
     display: flex;
     flex-direction: column;
     gap: 12px;
+
+    .cms-icon-row {
+      margin-top: 0;
+
+      img {
+        width: 20px !important;
+        height: 20px !important;
+      }
+    }
   }
 }

app/components/cms/link_with_icon_component.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 class Cms::LinkWithIconComponent < ViewComponent::Base
-  def initialize(link_text:, url:, icon:)
+  def initialize(link_text:, url:, icon: nil, additional_classes: nil)
     @link_text = link_text
     @url = url
     @icon = icon
+    @additional_classes = additional_classes
   end
 
   def call
     content_tag :div, class: "cms-icon-row" do
-      concat(render(@icon.render))
-      concat(link_to(@link_text, @url))
+      if @icon
+        concat(render(@icon.render))
+      end
+      concat(link_to(@link_text, @url, class: @additional_classes))
     end
   end
 end

app/services/cms/models/dynamic_components/content_blocks/link_with_icon.rb

@@ -3,16 +3,17 @@ module Models
     module DynamicComponents
       module ContentBlocks
         class LinkWithIcon
-          attr_accessor :link_text, :url, :icon
+          attr_accessor :link_text, :url, :icon, :additional_classes
 
-          def initialize(link_text:, url:, icon:)
+          def initialize(link_text:, url:, icon:, additional_classes:)
             @link_text = link_text
             @url = url
             @icon = icon
+            @additional_classes = additional_classes
           end
 
           def render
-            Cms::LinkWithIconComponent.new(link_text:, url:, icon:)
+            Cms::LinkWithIconComponent.new(link_text:, url:, icon:, additional_classes:)
           end
         end
       end

app/services/cms/models/meta/footer.rb

@@ -9,14 +9,14 @@ def initialize(link_block:)
         end
 
         def process_blocks
-          @link_block.each do |block|
-            block
+          @link_block.map do |block|
+            {
+              links: block[:links].map do |link|
+                link
+              end
+            }
           end
         end
-
-        def render
-          Cms::FooterComponent.new(link_block:)
-        end
       end
     end
   end

app/services/cms/models/meta/footer_link_block.rb

@@ -161,7 +161,20 @@ def self.to_footer(strapi_data, _all_data)
             {
               link_block: strapi_data.map do |link|
                 {
-                  links: link[:link].map { |l| {link_text: l[:linkText], url: l[:url], icon: l[:icon]} }
+                  links: link[:link].map {
+                    Models::DynamicComponents::ContentBlocks::LinkWithIcon.new(
+                      link_text: _1[:linkText],
+                      url: _1[:url],
+                      icon: _1[:icon].dig(:data).nil? ? nil : Models::Images::Image.new(
+                        url: _1[:icon][:data][:attributes][:url],
+                        alt: _1[:icon][:data][:attributes][:alternativeText],
+                        caption: _1[:icon][:data][:attributes][:caption],
+                        default_size: :small,
+                        formats: _1[:icon][:data][:attributes][:formats]
+                      ),
+                      additional_classes: ["govuk-footer__link", "ncce-link", "ncce-link--on-dark"]
+                    )
+                  }
                 }
               end
             }

app/services/cms/providers/strapi/factories/model_factory.rb

@@ -10,6 +10,7 @@ class LinkWithIcon < StrapiMock
               attribute(:linkText) { Faker::Lorem.sentence }
               attribute(:url) { Faker::Internet.url }
               attribute(:icon) { Images::Image.generate_raw_data }
+              attribute(:additional_classes) {}
             end
           end
         end

app/services/cms/providers/strapi/mocks/dynamic_components/content_blocks/link_with_icon.rb

@@ -0,0 +1,13 @@
+module Cms
+  module Providers
+    module Strapi
+      module Mocks
+        module Meta
+          class FooterLinkBlock < StrapiMock
+            attribute(:link_block) { Array.new(3) { DynamicComponents::ContentBlocks::LinkWithIcon.as_model } }
+          end
+        end
+      end
+    end
+  end
+end