Making dynamic zones inheritance based

Few namespace changes
Fixing template layout
Alphabeticalised base query

Author: msquance-stem

app/services/cms/collections/enrichment_page.rb

@@ -22,7 +22,7 @@ def self.is_collection = true
 
       def self.collection_attribute_mappings
         [
-          {model: Cms::Models::Data::WebPagePreview, key: nil}
+          {model: Models::Data::WebPagePreview, key: nil}
         ]
       end
 

app/services/cms/models/dynamic_components/blocks/homepage_hero.rb

@@ -12,7 +12,7 @@ def initialize(title:, house_content:, buttons:)
           end
 
           def render
-            HomepageHeroComponent.new(title:, house_content:, buttons:)
+            Cms::HomepageHeroComponent.new(title:, house_content:, buttons:)
           end
         end
       end

app/services/cms/models/dynamic_zones/enrichment_dynamic_zone.rb

@@ -1,16 +1,7 @@
 module Cms
   module Models
     module DynamicZones
-      class EnrichmentDynamicZone
-        attr_accessor :cms_models
-
-        def initialize(cms_models:)
-          @cms_models = cms_models
-        end
-
-        def render
-          Cms::DynamicZoneComponent.new(cms_models:)
-        end
+      class EnrichmentDynamicZone < DynamicZone
       end
     end
   end

app/services/cms/models/dynamic_zones/homepage_dynamic_zone.rb

@@ -1,16 +1,7 @@
 module Cms
   module Models
     module DynamicZones
-      class HomepageDynamicZone
-        attr_accessor :cms_models
-
-        def initialize(cms_models:)
-          @cms_models = cms_models
-        end
-
-        def render
-          Cms::DynamicZoneComponent.new(cms_models:)
-        end
+      class HomepageDynamicZone < DynamicZone
       end
     end
   end

app/services/cms/providers/strapi/mocks/dynamic_components/blocks/full_width_banner.rb

@@ -10,10 +10,12 @@ class FullWidthBanner < StrapiMock
               attribute(:image) { Images::Image.generate_data }
               attribute(:imageLink) { Faker::Internet.url }
               attribute(:backgroundColor) { {name: "white"} }
+              attribute(:boxColor) { {name: "white"} }
               attribute(:imageSide) { "right" }
               attribute(:buttons) { nil }
-              attribute(:i_belong_flag) { false }
-              attribute(:corner_flourish) { false }
+              attribute(:iBelongFlag) { false }
+              attribute(:cornerFlourish) { false }
+              attribute(:imageFit) { false }
             end
           end
         end

app/services/cms/providers/strapi/mocks/dynamic_components/blocks/programme_picture_card_section.rb

@@ -8,10 +8,10 @@ class ProgrammePictureCardSection < StrapiMock
               strapi_component "blocks.programme-picture-card-section"
 
               attribute(:sectionTitle) { Faker::Lorem.sentence }
-              attribute(:introText) { Mocks::Text::RichBlocks.generate_data }
+              attribute(:introText) { Text::RichBlocks.generate_data }
               attribute(:cardsPerRow) { 3 }
               attribute(:prog) { {data: {attributes: {slug: "i-belong"}}} }
-              attribute(:programmeCards) { Array.new(3) { Mocks::DynamicComponents::ContentBlocks::ProgrammePictureCard.generate_data } }
+              attribute(:programmeCards) { Array.new(3) { DynamicComponents::ContentBlocks::ProgrammePictureCard.generate_data } }
             end
           end
         end

app/services/cms/providers/strapi/queries/base_query.rb

@@ -6,24 +6,24 @@ class BaseQuery
           attr_accessor :resource_name, :resource_filter
 
           QUERY_MAPS = {
-            Models::DynamicComponents::ContentBlocks::QuestionBankForm => Components::ContentBlocks::QuestionBankForm,
             Models::Collections::Aside => Aside,
             Models::Collections::BlogPreview => BlogPreview,
-            Models::Meta::SimpleTitle => SimpleField,
+            Models::Collections::EmailTemplate => EmailTemplate,
+            Models::Collections::EnrichmentList => EnrichmentList,
+            Models::Data::Slug => Slug,
+            Models::Data::TextField => SimpleField,
+            Models::Data::WebPagePreview => WebPagePreview,
+            Models::DynamicComponents::ContentBlocks::QuestionBankForm => Components::ContentBlocks::QuestionBankForm,
             Models::DynamicZones::DynamicZone => DynamicZone,
             Models::DynamicZones::EnrichmentDynamicZone => EnrichmentDynamicZone,
             Models::DynamicZones::HomepageDynamicZone => HomepageDynamicZone,
-            Models::Collections::EmailTemplate => EmailTemplate,
-            Models::Collections::EnrichmentList => EnrichmentList,
-            Models::Meta::HeaderMenu => HeaderMenu,
             Models::Images::FeaturedImage => FeaturedImage,
+            Models::Meta::HeaderMenu => HeaderMenu,
             Models::Meta::PageTitle => PageTitle,
             Models::Meta::Seo => Seo,
-            Models::Data::Slug => Slug,
-            Models::Data::WebPagePreview => WebPagePreview,
+            Models::Meta::SimpleTitle => SimpleField,
             Models::Text::TextBlock => SimpleField,
-            Models::Text::TextBlockWithoutWrapper => SimpleField,
-            Models::Data::TextField => SimpleField
+            Models::Text::TextBlockWithoutWrapper => SimpleField
           }.freeze
 
           def initialize(collection_class, resource_filter = "slug")

lib/generators/strapi/component_templates/mapping_template.rb.tt

@@ -1,19 +1,21 @@
 module Cms
- module Models module DynamicComponents
-    module <%= @component_type_class %>
-      class <%= @component_name_class %>
-        attr_accessor <%= @rails_param_names.map{":#{_1}"}.join(", ") %>
+  module Models 
+    module DynamicComponents
+      module <%= @component_type_class %>
+        class <%= @component_name_class %>
+          attr_accessor <%= @rails_param_names.map{":#{_1}"}.join(", ") %>
 
-        def initialize(<%= @rails_param_names.map{"#{_1}:"}.join(", ") %>)
-        <%- @rails_param_names.each do |param| -%>
-          <%= "@#{param} = #{param}" %>
-        <%- end -%>
-        end
+          def initialize(<%= @rails_param_names.map{"#{_1}:"}.join(", ") %>)
+          <%- @rails_param_names.each do |param| -%>
+            <%= "@#{param} = #{param}" %>
+          <%- end -%>
+          end
 
-        def render
-          Cms::<%= @component_name_class %>Component.new(<%= @rails_param_names.map{"#{_1}:"}.join(", ") %>)
+          def render
+            Cms::<%= @component_name_class %>Component.new(<%= @rails_param_names.map{"#{_1}:"}.join(", ") %>)
+          end
         end
       end
     end
   end
-end
+end

lib/generators/strapi/component_templates/mock_template.rb.tt

@@ -2,14 +2,16 @@ module Cms
   module Providers
     module Strapi
       module Mocks
-       module Models module DynamicComponents
-          module <%= @component_type_class %>
-            class <%= @component_name_class %> < StrapiMock
-              strapi_component "blocks.<%= @component_strapi_name %>"
+        module Models 
+          module DynamicComponents
+            module <%= @component_type_class %>
+              class <%= @component_name_class %> < StrapiMock
+                strapi_component "blocks.<%= @component_strapi_name %>"
 
-              <%- @strapi_params.each do |param| -%>
-              attribute(:<%= param %>) { } 
-              <%- end -%>
+                <%- @strapi_params.each do |param| -%>
+                attribute(:<%= param %>) { } 
+                <%- end -%>
+              end
             end
           end
         end