metadata_presenter 2.15.9 → 2.15.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd26567ffefc85523ea94a99b37c9ff4ab7c9c923a591af95e2f8c254522b346
-  data.tar.gz: c949f8259d9a581317af29eff875330694e1dd9fc8decf507fafdd1230b126f5
+  metadata.gz: fa0c41f4fa6c6480de3cf499e6c1ed023e2bf375eaa37e80fda2af43ed79e2a0
+  data.tar.gz: 6c656d1fdea731a25f81dfa4a83ecb4c140267d7e396245f6871fcc513b52738
 SHA512:
-  metadata.gz: deef6fca91c8cd3203bd4eb6c4326b9e340711753681c41e9f873be0b204b161dd4a2d8e721cfd7abfc368e9a6dd9bead9c1f2039708db6ba602299c7b18e75a
-  data.tar.gz: c3bdc48b2cf30259ab65d13d43652bf1f60d66073f1c1106dffded0b09fba581cf2a113e645c8046425c5cd6da4ed4d3cb6bb0f04dd8c12341233dedd8944337
+  metadata.gz: 68eccd32be7f6490f708193614752d7c41ffc74cf7992f772ac1d9b1a03a26d2b4866c8d0ed2a37d13ed9f43bd3e79628c2c058412e0f391cd94c56a35fa24a5
+  data.tar.gz: a698125db67640863c49e19b46d8ca99e458a06d9323f2a73252270df98bb7b47018ba26ec90ae9b7999b9a30dd2282063a389a68a73655074f7bd9996cc0adb

data/app/models/metadata_presenter/branch_destinations.rb

@@ -14,5 +14,9 @@ module MetadataPresenter
       end
       destination_uuids.flatten.push(branch.default_next)
     end
+
+    def has_or_conditionals?(branch)
+      branch.conditionals.any? { |c| c.type == 'or' }
+    end
   end
 end

data/app/models/metadata_presenter/coordinates.rb

@@ -39,7 +39,7 @@ module MetadataPresenter
     end
 
     def set_branch_spacers_column(branch_uuid, column)
-      branch_spacers[branch_uuid].each do |_, position|
+      branch_spacers[branch_uuid].each do |position|
         position[:column] = column
       end
     end
@@ -50,7 +50,7 @@ module MetadataPresenter
     # to draw an arrow therefore we increment the row number from the branches
     # calculated starting row
     def set_branch_spacers_row(branch_uuid, starting_row)
-      branch_spacers[branch_uuid].each.with_index(starting_row) do |(_, position), row|
+      branch_spacers[branch_uuid].each.with_index(starting_row) do |position, row|
         position[:row] = row
       end
     end
@@ -68,11 +68,15 @@ module MetadataPresenter
     # need an additional line for an arrow.
     def setup_branch_spacers
       service.branches.each.with_object({}) do |branch, hash|
-        destinations = exiting_destinations_from_branch(branch)
-        hash[branch.uuid] = destinations.index_with do |_uuid|
-          { row: nil, column: nil }
-        end
+        hash[branch.uuid] = initial_spacer(branch)
+      end
+    end
+
+    def initial_spacer(branch)
+      destinations = exiting_destinations_from_branch(branch).map do |uuid|
+        { uuid: uuid, row: nil, column: nil }
       end
+      has_or_conditionals?(branch) ? destinations.uniq : destinations
     end
   end
 end

data/app/models/metadata_presenter/grid.rb

@@ -241,9 +241,9 @@ module MetadataPresenter
         column.each do |flow_object|
           next unless flow_object.branch?
 
-          coordinates.branch_spacers[flow_object.uuid].each do |destination_uuid, position|
-            if replace_with_pointer?(next_column, position[:row], destination_uuid)
-              @ordered[next_column][position[:row]] = MetadataPresenter::Pointer.new(uuid: destination_uuid)
+          coordinates.branch_spacers[flow_object.uuid].map do |destination|
+            if replace_with_pointer?(next_column, destination[:row], destination[:uuid])
+              @ordered[next_column][destination[:row]] = MetadataPresenter::Pointer.new(uuid: destination[:uuid])
             end
           end
         end
@@ -356,10 +356,13 @@ module MetadataPresenter
     # and arrow. When there are 'OR' conditions we need to insert additional
     # spacers into the necessary row in the column after the one the branch is
     # located in.
+    # This is done for the column directly after a branching point
     def insert_expression_spacers
       service.branches.each do |branch|
         next if coordinates.uuid_column(branch.uuid).nil?
 
+        next unless has_or_conditionals?(branch)
+
         previous_uuid = ''
         next_column = coordinates.uuid_column(branch.uuid) + 1
         exiting_destinations_from_branch(branch).each_with_index do |uuid, row|

data/app/models/metadata_presenter/page.rb

@@ -100,6 +100,10 @@ module MetadataPresenter
       type.in?(END_OF_ROUTE_PAGES)
     end
 
+    def multiple_questions?
+      type == 'page.multiplequestions'
+    end
+
     private
 
     def heading?

data/app/models/metadata_presenter/row_number.rb

@@ -42,7 +42,7 @@ module MetadataPresenter
       return if branches_in_column.empty?
 
       row_numbers = branches_in_column.map do |branch_uuid, _|
-        coordinates.branch_spacers[branch_uuid].map { |_, position| position[:row] }
+        coordinates.branch_spacers[branch_uuid].map { |position| position[:row] }
       end
       row_numbers.flatten.max + 1
     end
@@ -54,7 +54,7 @@ module MetadataPresenter
     def branch_spacer_row
       return if spacers_for_current_object.empty?
 
-      spacers_for_current_object.map { |position| position[:row] }.max
+      spacers_for_current_object.flatten.map { |position| position[:row] }.max
     end
 
     def first_row?
@@ -84,7 +84,7 @@ module MetadataPresenter
         end
 
         current_object_spacers = spacer_positions.map do |branch_uuid, _|
-          coordinates.branch_spacers[branch_uuid][uuid]
+          coordinates.branch_spacers[branch_uuid].select { |branch_spacer| branch_spacer[:uuid] == uuid }
         end
         current_object_spacers.compact
       end

data/app/operators/metadata_presenter/contains_operator.rb

@@ -0,0 +1,11 @@
+module MetadataPresenter
+  class ContainsOperator < BaseOperator
+    def evaluate?
+      @actual == @expected
+    end
+
+    def evaluate_collection?
+      Array(@expected).include?(@actual)
+    end
+  end
+end

data/app/operators/metadata_presenter/does_not_contain_operator.rb

@@ -0,0 +1,11 @@
+module MetadataPresenter
+  class DoesNotContainOperator < BaseOperator
+    def evaluate?
+      @actual != @expected
+    end
+
+    def evaluate_collection?
+      Array(@expected).exclude?(@actual)
+    end
+  end
+end

data/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.irregular 'is', 'is'
+  inflect.irregular 'contains', 'contains'
 end

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.15.9'.freeze
+  VERSION = '2.15.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.15.9
+  version: 2.15.12
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -303,6 +303,8 @@ files:
 - app/models/metadata_presenter/traversed_pages.rb
 - app/models/metadata_presenter/uploaded_file.rb
 - app/operators/metadata_presenter/base_operator.rb
+- app/operators/metadata_presenter/contains_operator.rb
+- app/operators/metadata_presenter/does_not_contain_operator.rb
 - app/operators/metadata_presenter/is_answered_operator.rb
 - app/operators/metadata_presenter/is_not_answered_operator.rb
 - app/operators/metadata_presenter/is_not_operator.rb