metadata_presenter 2.15.8 → 2.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653f75d32f4d53e3693e97db20ad1e985b0cc87ea4de2d50bdda17565c960a43
-  data.tar.gz: 0e358c7b47bbecbe3d19d321759aca4becffa0341150fab41aa23316dd61cb27
+  metadata.gz: fd26567ffefc85523ea94a99b37c9ff4ab7c9c923a591af95e2f8c254522b346
+  data.tar.gz: c949f8259d9a581317af29eff875330694e1dd9fc8decf507fafdd1230b126f5
 SHA512:
-  metadata.gz: ba4e1ab5e37c2aa03b9a079ab808597f481067d68140ee2dcc739e987e12cece01b2cbbcc80570442d23a564a2d533e4f5912e9d7a211d2242dfd501e00103b4
-  data.tar.gz: 22cc527a15fb85ab087cd5944222d20557f401af4b014c692bef7f06fe0333c647927672c9e1cad19e4262ae2e2ede3c7102ddda44003189ffd73d18fdb53bc3
+  metadata.gz: deef6fca91c8cd3203bd4eb6c4326b9e340711753681c41e9f873be0b204b161dd4a2d8e721cfd7abfc368e9a6dd9bead9c1f2039708db6ba602299c7b18e75a
+  data.tar.gz: c3bdc48b2cf30259ab65d13d43652bf1f60d66073f1c1106dffded0b09fba581cf2a113e645c8046425c5cd6da4ed4d3cb6bb0f04dd8c12341233dedd8944337

data/app/models/metadata_presenter/column_number.rb

@@ -25,18 +25,35 @@ module MetadataPresenter
 
     def column_number
       @column_number ||= begin
-        return latest_column if cya_or_confirmation_page?
+        return last_column if confirmation_page?
+        return latest_column if checkanswers_page?
 
         existing_column || new_column
       end
     end
 
+    def confirmation_page?
+      service.confirmation_page&.uuid == uuid
+    end
+
+    def checkanswers_page?
+      service.checkanswers_page&.uuid == uuid
+    end
+
     def latest_column
       [existing_column, new_column].compact.max
     end
 
-    def cya_or_confirmation_page?
-      [service.checkanswers_page&.uuid, service.confirmation_page&.uuid].include?(uuid)
+    def last_column
+      checkanswers_column.present? ? checkanswers_column + 1 : latest_column
+    end
+
+    def checkanswers_column
+      @checkanswers_column ||= begin
+        return if service.checkanswers_page.blank?
+
+        coordinates.uuid_column(service.checkanswers_page&.uuid)
+      end
     end
 
     def existing_column

data/app/models/metadata_presenter/grid.rb

@@ -41,7 +41,7 @@ module MetadataPresenter
       set_row_numbers
       add_by_coordinates
       insert_expression_spacers
-      trim_pointers unless main_flow.empty?
+      trim_pointers unless main_flow.empty? # only used by detached grids
       trim_spacers
       insert_warning if main_flow.empty?
 
@@ -222,9 +222,42 @@ module MetadataPresenter
       service.flow_object(uuid)
     end
 
+    def trim_pointers
+      update_branch_destination_pointers
+      trim_to_first_pointer
+      update_coordinates
+      replace_pointers
+    end
+
+    # Since a detached grid is built in the same way as the main flow grid, objects
+    # that appear later in the flow are left in their latest position. However
+    # for detached grids we want to show a Pointer to that object. This only
+    # happens for branch destinations so in those instances we need to replace
+    # the Spacers with Pointers.
+    def update_branch_destination_pointers
+      @ordered.each_with_index do |column, column_number|
+        next_column = column_number + 1
+
+        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)
+            end
+          end
+        end
+      end
+    end
+
+    def replace_with_pointer?(column_number, row_number, destination_uuid)
+      @ordered[column_number][row_number].is_a?(MetadataPresenter::Spacer) &&
+        main_flow.include?(destination_uuid)
+    end
+
     # A row should end at the first Pointer object it finds.
     # Therefore replace any Pointers after the first one with Spacers.
-    def trim_pointers
+    def trim_to_first_pointer
       max_potential_rows.times do |row|
         first_index_of = first_pointer(row)
         next unless first_index_of
@@ -237,8 +270,70 @@ module MetadataPresenter
     end
 
     def first_pointer(row)
-      row_objects = @ordered.map { |column| column[row] }
-      row_objects.find_index { |obj| obj.is_a?(MetadataPresenter::Pointer) }
+      row_objects(row).find_index { |obj| obj.is_a?(MetadataPresenter::Pointer) }
+    end
+
+    def row_objects(row)
+      @ordered.map { |column| column[row] }
+    end
+
+    # It's a shame to have to do this.
+    # Once the Pointers have been trimmed back the original positions for each
+    # object will no longer be correct so we need to update them.
+    # We only really need to do this because we replace Pointers with Spacers
+    # later on.
+    def update_coordinates
+      @ordered.each_with_index do |column, column_number|
+        column.each_with_index do |flow_object, row_number|
+          next if flow_object.is_a?(MetadataPresenter::Spacer)
+
+          @coordinates.set_column(flow_object.uuid, column_number)
+          @coordinates.set_row(flow_object.uuid, row_number)
+        end
+      end
+    end
+
+    def replace_pointers
+      @ordered.each_with_index do |column, column_number|
+        next if column_number.zero?
+
+        column.each_with_index do |flow_object, row_number|
+          next if flow_object.is_a?(MetadataPresenter::Spacer)
+
+          previous_column = column_number - 1
+          if replace_with_spacer?(previous_column, column_number, row_number, flow_object.uuid)
+            @ordered[column_number][row_number] = MetadataPresenter::Spacer.new
+          end
+        end
+      end
+    end
+
+    def replace_with_spacer?(previous_column, current_column, row_number, uuid)
+      no_flow_objects?(previous_column, row_number, uuid) ||
+        at_different_position?(current_column, row_number, uuid)
+    end
+
+    # Unless the destination is the Pointer for a branch in the directly preceeding
+    # column, we want to swap Pointers for Spacers if there are no Flow objects
+    # in that row.
+    def no_flow_objects?(previous_column, row_number, uuid)
+      !branch_destination?(uuid, previous_column) &&
+        row_objects(row_number).none?(MetadataPresenter::Flow)
+    end
+
+    # The object already exists elsewhere in the flow so we can replace the Pointer
+    # and let the frontend draw an arrow to that position.
+    def at_different_position?(column_number, row_number, uuid)
+      @coordinates.uuid_column(uuid) != column_number &&
+        @coordinates.uuid_row(uuid) != row_number
+    end
+
+    def branch_destination?(uuid, column_number)
+      @ordered[column_number].any? do |flow_object|
+        next unless flow_object.branch?
+
+        flow_object.all_destination_uuids.include?(uuid)
+      end
     end
 
     # Find the very last MetadataPresenter::Flow object in every column and
@@ -254,7 +349,7 @@ module MetadataPresenter
     end
 
     def only_spacers?(trimmed_column)
-      trimmed_column.all? { |item| item.is_a?(MetadataPresenter::Spacer) }
+      trimmed_column.all?(MetadataPresenter::Spacer)
     end
 
     # Each branch has a certain number of exits that require their own line

data/lib/metadata_presenter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.15.8
+  version: 2.15.9
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder