metadata_presenter 3.3.20 → 3.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49928822b091fdbfe75be2040239c8e85ed64b00df6015fe798741b518f13c3c
-  data.tar.gz: a2ca260534237177f11385b0f4961a3bc6e509bb0bc00b1b3008343353f4db3a
+  metadata.gz: 04f348f4f53e3272bc416e845f9970aa6851ac22b7d069fbd52f9309f63e820c
+  data.tar.gz: a20ab803b0750532425e02d698adaf87c4b89f96aae65542777b46c3d240bb9e
 SHA512:
-  metadata.gz: 21e9d08c09ebe60664f00d6cd397a204fb1ac750b09b6aad43a1b05470381e1661b89376f9b0d5f295341c865e257f430610ed35cf90470f859794ecdf9e3cb7
-  data.tar.gz: ab78554da5f3cb3f5bb79e49cd4f55b9640aef435f703ea5b47c8f2ace8dcfa06ee47d0477ee204900c6cdbe0507ee9c8dbc0de52f54b464e4eaa08574ec48cc
+  metadata.gz: 802a3624e3953dc7bd7d2596fcc7d462e3e9ee950186e58b90c1d408fcc3a9ca308ba42b5bdded8172d4895462a67ceb0b83a674b85b5115a1316a98bd8c2a8c
+  data.tar.gz: 07b914afe2a8a241add444452f19e5dec3bc46da8792c1d38f840d5e7084d1a8230d2c823066677f0608b44ffbe4610efd67e9548a20a9f93913b56cce946997

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -118,6 +118,7 @@ module MetadataPresenter
     def render_validation_error
       @user_data = answers_params
       load_autocomplete_items
+      load_page_content
 
       render template: page.template, status: :unprocessable_entity
     end

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -112,6 +112,14 @@ module MetadataPresenter
       end
     end
 
+    def load_page_content
+      if single_page_preview?
+        @page.load_all_content
+      else
+        @page.load_conditional_content(service, @user_data)
+      end
+    end
+
     def maintenance_mode?
       ENV['MAINTENANCE_MODE'].present? && ENV['MAINTENANCE_MODE'] == '1'
     end

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -8,11 +8,7 @@ module MetadataPresenter
       @page ||= service.find_page_by_url(request.env['PATH_INFO'])
       if @page
         load_autocomplete_items
-        if single_page_preview?
-          @page.load_all_content
-        else
-          @page.load_conditional_content(service, @user_data)
-        end
+        load_page_content
 
         @page_answers = PageAnswers.new(@page, @user_data)
         render template: @page.template

data/app/models/metadata_presenter/evaluate_content_conditionals.rb

@@ -22,26 +22,20 @@ module MetadataPresenter
 
     def uuid_to_include?(candidate_component)
       evaluation_conditions = []
-      if candidate_component.conditionals.count == 1
-        # if there are only and rules or the particular case where there is only one condition
+
+      if candidate_component.conditionals.count > 1
+        candidate_component.conditionals.each do |conditional|
+          evaluation_conditions << if conditional[:_type] == 'and'
+                                     evaluate_condition(conditional).flatten.all?
+                                   else
+                                     evaluate_condition(conditional)
+                                   end
+        end
+
+        candidate_component.uuid if evaluation_conditions.flatten.any?
+      else
         evaluation_conditions << evaluate_condition(candidate_component.conditionals[0])
         candidate_component.uuid if evaluation_conditions.flatten.all?
-      elsif candidate_component.conditionals.count > 1
-        # if there are or rule
-        if candidate_component.conditionals[0][:_type] == 'and'
-          # if there are 'and' in conditions between the 'or' rule
-          candidate_component.conditionals.map do |conditional|
-            evaluation_conditions << evaluate_condition(conditional).flatten.all?
-          end
-          return candidate_component.uuid if evaluation_conditions.flatten.any?
-        end
-        if candidate_component.conditionals[0][:_type] == 'if'
-          # then this is an 'or' condition between conditionals
-          candidate_component.conditionals.map do |conditional|
-            evaluation_conditions << evaluate_condition(conditional)
-          end
-          candidate_component.uuid if evaluation_conditions.flatten.any?
-        end
       end
     end
 

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.20'.freeze
+  VERSION = '3.3.22'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.20
+  version: 3.3.22
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder