Updating other components needed to get the primary-teachers page migrated over to strapi.

msquance-stem · msquance-stem · commit 5321f35ea1e9 · 2025-02-25T15:12:58.000Z
Converted subText to introText on card wrapper (this is a rich text block over a plain text)

Added background color to horizontal card

Changed the embed code to be a span rather than a div, as its being a div in p tag was causing extras p's to be added
diff --git a/app/components/cms/card_wrapper_component/card_wrapper_component.html.erb b/app/components/cms/card_wrapper_component/card_wrapper_component.html.erb
@@ -2,7 +2,9 @@
   <%= row.with_column("full") do %>
     <%= title_html if @title %>
     <% if @intro_text %>
-      <% render @intro_text.render %>
+      <div class="govuk-!-margin-bottom-3">
+        <%= render @intro_text.render %>
+      </div>
     <% end %>
     <div class="cms-card-wrapper__grid" style="<%= cards_per_row %>">
       <% @cards_block.each do |card| %>
diff --git a/app/components/cms/course_card_component.rb b/app/components/cms/course_card_component.rb
@@ -12,4 +12,8 @@ def initialize(title:, banner_text:, course:, description:, image:)
     @description = description
     @image = image
   end
+
+  def render?
+    @course.present?
+  end
 end
diff --git a/app/components/cms/course_card_component/course_card_component.scss b/app/components/cms/course_card_component/course_card_component.scss
@@ -27,6 +27,8 @@
   &__image {
     img {
       width: 100%;
+      height: 190px;
+      object-fit: cover;
     }
   }
 
diff --git a/app/components/cms/horizontal_card_component.rb b/app/components/cms/horizontal_card_component.rb
@@ -3,7 +3,7 @@
 class Cms::HorizontalCardComponent < ViewComponent::Base
   delegate :cms_color_theme_class, to: :helpers
 
-  def initialize(title:, body_blocks:, image: nil, image_link: nil, color_theme: nil, icon_block: nil, spacing: nil, external_title: nil)
+  def initialize(title:, body_blocks:, image: nil, image_link: nil, color_theme: nil, icon_block: nil, spacing: nil, external_title: nil, background_color: nil)
     @title = title
     @body_blocks = body_blocks
     @image = image
@@ -12,6 +12,7 @@ def initialize(title:, body_blocks:, image: nil, image_link: nil, color_theme: n
     @icon_block = icon_block
     @spacing = spacing&.downcase
     @external_title = external_title
+    @background_color = background_color
   end
 
   def padding
diff --git a/app/components/cms/horizontal_card_component/horizontal_card_component.html.erb b/app/components/cms/horizontal_card_component/horizontal_card_component.html.erb
@@ -1,4 +1,4 @@
-<%= render GovGridRowComponent.new(additional_classes: "cms-horizontal-card", padding: padding) do |row|  %>
+<%= render GovGridRowComponent.new(additional_classes: "cms-horizontal-card", padding: padding, background_color: @background_color) do |row|  %>
   <%= row.with_column("full") do %>
     <% if @external_title %>
       <h2 class="govuk-heading-m"><%= @external_title %></h2>
@@ -7,7 +7,7 @@
       <div class="horizontal-card-component__content">
         <h1 class="govuk-heading-m"><%= @title %></h1>
         <%= render @body_blocks.render %>
-        <%= render @icon_block.render if @icon_block%>
+        <%= render @icon_block.render if @icon_block&.icons&.any? %>
       </div>
       <% if @image %>
         <div class="horizontal-card-component__image">
diff --git a/app/components/cms/rich_text_block_component.rb b/app/components/cms/rich_text_block_component.rb
@@ -86,7 +86,7 @@ def call
       if @blocks[:text] == "---"
         content_tag(:hr)
       elsif @blocks[:code]
-        content_tag(:div, @blocks[:text].html_safe, class: classes)
+        content_tag(:span, @blocks[:text].html_safe, class: classes)
       else
         content_tag(:span, sanitize(@blocks[:text]), class: classes)
       end
diff --git a/app/services/cms/dynamic_components/course_card.rb b/app/services/cms/dynamic_components/course_card.rb
@@ -8,7 +8,11 @@ def initialize(title:, banner_text:, course_code:, description:, image:)
         @banner_text = banner_text
         @description = description
         @image = image
-        @course = Achiever::Course::Template.find_by_activity_code(course_code)
+        @course = begin
+          Achiever::Course::Template.find_by_activity_code(course_code)
+        rescue ActiveRecord::RecordNotFound
+          nil
+        end
       end
 
       def render
diff --git a/app/services/cms/dynamic_components/horizontal_card.rb b/app/services/cms/dynamic_components/horizontal_card.rb
@@ -1,9 +1,9 @@
 module Cms
   module DynamicComponents
     class HorizontalCard
-      attr_accessor :title, :body_blocks, :image, :image_link, :color_theme, :icon_block, :spacing, :external_title
+      attr_accessor :title, :body_blocks, :image, :image_link, :color_theme, :icon_block, :spacing, :external_title, :background_color
 
-      def initialize(title:, body_blocks:, image:, image_link:, color_theme:, icon_block:, spacing:, external_title:)
+      def initialize(title:, body_blocks:, image:, image_link:, color_theme:, icon_block:, spacing:, external_title:, background_color:)
         @title = title
         @body_blocks = body_blocks
         @image = image
@@ -12,10 +12,11 @@ def initialize(title:, body_blocks:, image:, image_link:, color_theme:, icon_blo
         @icon_block = icon_block
         @spacing = spacing
         @external_title = external_title
+        @background_color = background_color
       end
 
       def render
-        Cms::HorizontalCardComponent.new(title:, body_blocks:, image:, image_link:, color_theme:, icon_block:, spacing:, external_title:)
+        Cms::HorizontalCardComponent.new(title:, body_blocks:, image:, image_link:, color_theme:, icon_block:, spacing:, external_title:, background_color:)
       end
     end
   end
diff --git a/app/services/cms/providers/strapi/factories/blocks_factory.rb b/app/services/cms/providers/strapi/factories/blocks_factory.rb
@@ -167,7 +167,8 @@ def self.to_horizontal_card(strapi_data)
               color_theme: extract_color_name(strapi_data, :colorTheme),
               icon_block: to_icon_block(strapi_data[:iconBlock]),
               spacing: strapi_data[:spacing],
-              external_title: strapi_data[:externalTitle]
+              external_title: strapi_data[:externalTitle],
+              background_color: extract_color_name(strapi_data, :bkColor)
             )
           end
 
diff --git a/app/services/cms/providers/strapi/mocks/course_card_section.rb b/app/services/cms/providers/strapi/mocks/course_card_section.rb
@@ -0,0 +1,14 @@
+module Cms
+  module Providers
+    module Strapi
+      module Mocks
+        class CourseCardSection < StrapiMock
+          strapi_component "blocks.course-cards-section"
+          attribute(:sectionTitle) { Faker::Lorem.sentence }
+          attribute(:introText) { RichBlocks.generate_data }
+          attribute(:cards) { Array.new(3) { DynamicComponents::CourseCard.generate_data } }
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/cms/providers/strapi/mocks/dynamic_components/course_card.rb b/app/services/cms/providers/strapi/mocks/dynamic_components/course_card.rb
@@ -0,0 +1,19 @@
+module Cms
+  module Providers
+    module Strapi
+      module Mocks
+        module DynamicComponents
+          class CourseCard < StrapiMock
+            strapi_component "content-blocks.course-card"
+
+            attribute(:title) { Faker::Lorem.words(number: 5).join(" ") }
+            attribute(:bannerText) { Faker::Lorem.words(number: 3).join(" ") }
+            attribute(:image) { Image.generate_data }
+            attribute(:description) { RichBlocks.generate_data }
+            attribute(:courseCode) { "CP199" }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/cms/providers/strapi/mocks/resource_card_section.rb b/app/services/cms/providers/strapi/mocks/resource_card_section.rb
@@ -6,7 +6,7 @@ class ResourceCardSection < StrapiMock
           strapi_component "blocks.resource-card-section"
           attribute(:cardsPerRow) { 3 }
           attribute(:sectionTitle) { Faker::Lorem.sentence }
-          attribute(:subText) { Faker::Lorem.sentence }
+          attribute(:introText) { RichBlocks.generate_data }
           attribute(:colorTheme) { nil }
           attribute(:resourceCards) { Array.new(3) { ResourceCard.generate_data } }
         end
diff --git a/app/services/cms/providers/strapi/queries/components/blocks/course_cards_section.rb b/app/services/cms/providers/strapi/queries/components/blocks/course_cards_section.rb
@@ -9,7 +9,7 @@ def self.name = "ComponentBlocksCourseCardsSection"
 
               def self.base_fields
                 <<~GRAPHQL.freeze
-                  title
+                  sectionTitle
                   introText
                   #{ContentBlocks::CourseCard.embed(:cards)}
                 GRAPHQL
diff --git a/app/services/cms/providers/strapi/queries/components/blocks/horizontal_card.rb b/app/services/cms/providers/strapi/queries/components/blocks/horizontal_card.rb
@@ -17,6 +17,7 @@ def self.base_fields
                   #{SharedFields.icon_block("iconBlock")}
                   spacing
                   externalTitle
+                  #{SharedFields.color_theme("bkColor")}
                 GRAPHQL
               end
             end
diff --git a/spec/services/cms/dynamic_components/course_card_section_spec.rb b/spec/services/cms/dynamic_components/course_card_section_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe Cms::DynamicComponents::CourseCard do
+  let(:valid_course_card) { Cms::Mocks::DynamicComponents::CourseCard.generate_data(course_code: "CP228") }
+  let(:invalid_course_card) { Cms::Mocks::DynamicComponents::CourseCard.generate_data(course_code: "NV228") }
+
+  before do
+    stub_course_templates
+    stub_duration_units
+  end
+
+  context "with valid activity" do
+    before do
+      @card_section = Cms::Providers::Strapi::Factories::ComponentFactory.process_component(Cms::Mocks::CourseCardSection.generate_raw_data(cards: [valid_course_card]))
+    end
+
+    it "should render as Cms::CardWrapperComponent" do
+      expect(@card_section.render).to be_a(Cms::CardWrapperComponent)
+    end
+
+    it "should render cards as Cms::DynamicsComponents::CourseCard" do
+      expect(@card_section.cards_block.first.render).to be_a(Cms::CourseCardComponent)
+    end
+
+    it "should return true for valid code" do
+      expect(@card_section.cards_block.first.render.render?).to be true
+    end
+  end
+
+  context "with invalid activity" do
+    before do
+      @card_section = Cms::Providers::Strapi::Factories::ComponentFactory.process_component(Cms::Mocks::CourseCardSection.generate_raw_data(cards: [invalid_course_card]))
+    end
+
+    it "should return false for invalid code" do
+      expect(@card_section.cards_block.first.render.render?).to be false
+    end
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`&__image {`
`28`	`28`	`img {`
`29`	`29`	`width: 100%;`
	`30`	`+ height: 190px;`
	`31`	`+ object-fit: cover;`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ def self.to_horizontal_card(strapi_data)`
`167`	`167`	`color_theme: extract_color_name(strapi_data, :colorTheme),`
`168`	`168`	`icon_block: to_icon_block(strapi_data[:iconBlock]),`
`169`	`169`	`spacing: strapi_data[:spacing],`
`170`		`- external_title: strapi_data[:externalTitle]`
	`170`	`+ external_title: strapi_data[:externalTitle],`
	`171`	`+ background_color: extract_color_name(strapi_data, :bkColor)`
`171`	`172`	`)`
`172`	`173`	`end`
`173`	`174`