Merge pull request #2388 from NCCE/3029-refactor-cms-componentsmocks

Refactor/tidy CMS models, mocks and tests

Author: msquance-stem

app/components/aside_component/aside_component.scss

@@ -48,6 +48,7 @@
 
   .button {
     width: 250px;
+    margin: 1rem 0 0;
   }
 
   img {

app/components/cms/dynamic_zone_component.rb

@@ -6,7 +6,7 @@ def initialize(cms_models:)
   end
 
   def needs_padding?
-    @cms_models.any? { _1.instance_of?(Cms::DynamicComponents::StickyDashboardBar) }
+    @cms_models.any? { _1.instance_of?(Cms::Models::DynamicComponents::Blocks::StickyDashboardBar) }
   end
 
   def classes

app/components/cms/full_width_banner_component/full_width_banner_component.scss

@@ -7,6 +7,10 @@
   }
 }
 
+.cms-button-container {
+  align-items: flex-start;
+}
+
 .cms-full-width-banner__heading {
   margin-bottom: 20px;
 }

app/components/cms/horizontal_link_card_component/horizontal_link_card_component.scss

@@ -3,13 +3,6 @@
   padding: 20px;
   border-left-width: 13px;
 
-  .ncce-link {
-    color: $hyper-link-blue;
-    &:visited {
-      color: $hyper-link-blue;
-    }
-  }
-
   h2 {
     @extend .govuk-heading-m;
   }

app/components/cms/picture_card_component/picture_card_component.html.erb

@@ -3,7 +3,7 @@
     <%= render Cms::ImageComponent.new(@image, show_caption: false, link: @link) %>
   <% end %>
   <div class="cms-picture-card__title">
-    <h3 class="govuk-heading-m"><%= link_to_if @link, @title, @link, class: "cms-picture-card__link" %></h3>
+    <h3 class="govuk-heading-m"><%= link_to_if @link, @title, @link, class: %w[cms-picture-card__link ncce-link] %></h3>
   </div>
   <div class="cms-picture-card__text">
     <%= render @body_text.render %>

app/services/cms/collections/aside_section.rb

@@ -13,7 +13,7 @@ def self.collection_attribute_mappings
 
       def self.resource_attribute_mappings
         [
-          {model: Cms::Models::Aside, key: nil}
+          {model: Models::Collections::Aside, key: nil}
         ]
       end
 

app/services/cms/collections/blog.rb

@@ -18,16 +18,16 @@ def self.is_collection = true
 
       def self.collection_attribute_mappings
         [
-          {model: Cms::Models::BlogPreview, key: nil}
+          {model: Models::Collections::BlogPreview, key: nil}
         ]
       end
 
       def self.resource_attribute_mappings
         [
-          {model: Cms::Models::SimpleTitle, key: :title},
-          {model: Cms::Models::FeaturedImage, key: :featuredImage},
-          {model: Cms::Models::TextBlock, key: :content},
-          {model: Cms::Models::Seo, key: :seo}
+          {model: Models::Meta::SimpleTitle, key: :title},
+          {model: Models::Images::FeaturedImage, key: :featuredImage},
+          {model: Models::Text::TextBlock, key: :content},
+          {model: Models::Meta::Seo, key: :seo}
         ]
       end
 

app/services/cms/collections/email_template.rb

@@ -5,13 +5,13 @@ def self.is_collection = true
 
       def self.collection_attribute_mapping
         [
-          {model: Cms::Models::EmailTemplate, key: nil, param_name: :template}
+          {model: Models::Collections::EmailTemplate, key: nil, param_name: :template}
         ]
       end
 
       def self.resource_attribute_mappings
         [
-          {model: Cms::Models::EmailTemplate, key: nil, param_name: :template}
+          {model: Models::Collections::EmailTemplate, key: nil, param_name: :template}
         ]
       end
 

app/services/cms/collections/enrichment_page.rb

@@ -22,22 +22,22 @@ def self.is_collection = true
 
       def self.collection_attribute_mappings
         [
-          {model: Cms::Models::WebPagePreview, key: nil}
+          {model: Models::Data::WebPagePreview, key: nil}
         ]
       end
 
       def self.resource_attribute_mappings
         [
-          {model: Models::Slug, key: nil},
-          {model: Models::Seo, key: :seo},
-          {model: Models::PageTitle, key: :pageTitle},
-          {model: Models::EnrichmentDynamicZone, key: :content},
-          {model: Models::EnrichmentList, key: :enrichments},
-          {model: Models::TextField, key: :featuredSectionTitle},
-          {model: Models::TextField, key: :allSectionTitle},
-          {model: Models::TextField, key: :typeFilterPlaceholder},
-          {model: Models::TextField, key: :termFilterPlaceholder},
-          {model: Models::TextField, key: :ageGroupFilterPlaceholder}
+          {model: Models::Data::Slug, key: nil},
+          {model: Models::Meta::Seo, key: :seo},
+          {model: Models::Meta::PageTitle, key: :pageTitle},
+          {model: Models::DynamicZones::EnrichmentDynamicZone, key: :content},
+          {model: Models::Collections::EnrichmentList, key: :enrichments},
+          {model: Models::Data::TextField, key: :featuredSectionTitle},
+          {model: Models::Data::TextField, key: :allSectionTitle},
+          {model: Models::Data::TextField, key: :typeFilterPlaceholder},
+          {model: Models::Data::TextField, key: :termFilterPlaceholder},
+          {model: Models::Data::TextField, key: :ageGroupFilterPlaceholder}
 
         ]
       end

app/services/cms/collections/primary_glossary_table_items.rb

@@ -13,17 +13,17 @@ def self.graphql_key
 
       def self.collection_attribute_mappings
         [
-          {model: Cms::Models::TextField, key: :term},
-          {model: Cms::Models::TextField, key: :keyStage},
-          {model: Cms::Models::TextBlock, key: :definition}
+          {model: Models::Data::TextField, key: :term},
+          {model: Models::Data::TextField, key: :keyStage},
+          {model: Models::Text::TextBlock, key: :definition}
         ]
       end
 
       def self.resource_attribute_mappings
         [
-          {model: Cms::Models::TextField, key: :term},
-          {model: Cms::Models::TextField, key: :keyStage},
-          {model: Cms::Models::TextBlock, key: :definition}
+          {model: Models::Data::TextField, key: :term},
+          {model: Models::Data::TextField, key: :keyStage},
+          {model: Models::Text::TextBlock, key: :definition}
         ]
       end
     end