metadata_presenter 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42603519130d7f5029066830adc145fe8800465f38493f5acfe37943623210b9
-  data.tar.gz: 9cb6b248e8246c2b0145f6d746043680494fd7292a36d2e18dff619cf55af8dc
+  metadata.gz: b7184f97740de68d7fb003316d4d2bc5a822ccdfa13749c858b638b64b7f59e6
+  data.tar.gz: 6d540b23868160de18de5c3ef87c5a9ef2f7ecc279ed72e4e2c9ab5bb3c0369d
 SHA512:
-  metadata.gz: 354e08330a417e94180c4686e058eac97155e2b62440faabdf1e10b17d469d2e7b93a0fd155d5d3eeb71549f2fc6725c78e048ac442c5a5b6dfeaae3f81c09e9
-  data.tar.gz: 22011caef879554eb407f7bbda3726b5255178eb51b15e095c3409ec84f97df6ed565382f51651801f0ee9686b895ffc1db92ee9f4e715baa957e4378b88eee9
+  metadata.gz: 10c4c37e567f4b1c58546627c480ceda59a1c65bdafeacf65014c044a380a03a7f22f40180674054f5614adc742fd95aca4624b6d8a1af3ac2158b96a0ebbac0
+  data.tar.gz: 3eb7004878552017ce8c9e180675330d824461234ad410f11384b788eeb5ab46a480526020a7edf4efd6ece8d1f7588d0cfd2ed3561fe9270d2c936717072b4b

data/app/models/metadata_presenter/column_number.rb

@@ -9,6 +9,10 @@ module MetadataPresenter
 
     def number
       if service.flow_object(uuid).branch?
+        # Even though we are associating the column number to a specific flow object
+        # in the Coordinates model we do not use column_number + 1 as we are
+        # updating the position for the Spacers that exist for a branch which
+        # are always in the same column as the branch object itself.
         coordinates.set_branch_spacers_column(uuid, column_number)
       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
@@ -64,12 +64,14 @@ module MetadataPresenter
       service.flow.keys.index_with { |_uuid| { row: nil, column: nil } }
     end
 
-    # This also takes into account the 'or' expressions which
+    # This also takes into account the 'OR' expressions which
     # 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.map { { row: nil, column: nil } }
+        hash[branch.uuid] = destinations.index_with do |_uuid|
+          { row: nil, column: nil }
+        end
       end
     end
   end

data/app/models/metadata_presenter/row_number.rb

@@ -28,7 +28,7 @@ module MetadataPresenter
 
         return ROW_ZERO if place_on_row_zero?
 
-        existing_row || [current_row, potential_row].compact.max
+        existing_row || [current_row, potential_row, branch_spacer_row].compact.max
       end
     end
 
@@ -36,27 +36,60 @@ module MetadataPresenter
       @existing_row ||= coordinates.uuid_row(uuid)
     end
 
+    # This looks for any branches in the current column and checks that there is
+    # enough space for the any branch conditionals before returning a row number.
     def potential_row
       return if branches_in_column.empty?
 
-      row_numbers = branches_in_column.map do |uuid, _|
-        coordinates.branch_spacers[uuid].map { |position| position[:row] }
+      row_numbers = branches_in_column.map do |branch_uuid, _|
+        coordinates.branch_spacers[branch_uuid].map { |_, position| position[:row] }
       end
       row_numbers.flatten.max + 1
     end
 
+    # This looks at the previous column and finds any branches that link to the
+    # current object. If any are found it checks for rows numbers that relate
+    # to the current objects UUID in the branch spacers hash and defaults to
+    # returning the highest row number.
+    def branch_spacer_row
+      return if spacers_for_current_object.empty?
+
+      spacers_for_current_object.map { |position| position[:row] }.max
+    end
+
     def first_row?
       @first_row ||= route.row.zero?
     end
 
     def branches_in_column
-      @branches_in_column ||= coordinates.positions_in_column(uuid_column).select do |key, position|
+      @branches_in_column ||= branches(uuid_column)
+    end
+
+    def branches_in_previous_column
+      @branches_in_previous_column ||= branches(uuid_column - 1)
+    end
+
+    def branches(column_number)
+      coordinates.positions_in_column(column_number).select do |key, position|
         next if uuid == key || position[:row].blank?
 
         service.flow_object(key).branch?
       end
     end
 
+    def spacers_for_current_object
+      @spacers_for_current_object ||= begin
+        spacer_positions = branches_in_previous_column.select do |key, _|
+          coordinates.branch_spacers[key]
+        end
+
+        current_object_spacers = spacer_positions.map do |branch_uuid, _|
+          coordinates.branch_spacers[branch_uuid][uuid]
+        end
+        current_object_spacers.compact
+      end
+    end
+
     def uuid_column
       @uuid_column ||= coordinates.uuid_column(uuid)
     end

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.14.0'.freeze
+  VERSION = '2.14.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - MoJ Forms