metadata_presenter 3.3.21 → 3.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7869bdd57e746b2c7b56f867ab22bc87a46704420f5dde6549ea28179385c20
-  data.tar.gz: 87b1dd8f6b236889a9057b5fe7505b7a6812bb02d2889335397186680a1343b9
+  metadata.gz: 04f348f4f53e3272bc416e845f9970aa6851ac22b7d069fbd52f9309f63e820c
+  data.tar.gz: a20ab803b0750532425e02d698adaf87c4b89f96aae65542777b46c3d240bb9e
 SHA512:
-  metadata.gz: 100550a87338f2cc5a2b6028362a004e0c128bd26b49662ee26c026e41061630a4e7091afd6f7401063290ad82b0b6a7a6920b81d9b48895dd7904fff016a89d
-  data.tar.gz: 0b0c439a4a1c93939fcfee1ded176a6a4a38ad635ebdef89f21f3b4828c0faa2efd43ca8cce5338871ecca0dd2b3f833055e77735169339e779a67d87304e155
+  metadata.gz: 802a3624e3953dc7bd7d2596fcc7d462e3e9ee950186e58b90c1d408fcc3a9ca308ba42b5bdded8172d4895462a67ceb0b83a674b85b5115a1316a98bd8c2a8c
+  data.tar.gz: 07b914afe2a8a241add444452f19e5dec3bc46da8792c1d38f840d5e7084d1a8230d2c823066677f0608b44ffbe4610efd67e9548a20a9f93913b56cce946997

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.21'.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.21
+  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