metadata_presenter 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 120ed63601d40a759fe3176e0555341c7cc7220cc1bac5a87cf58d5989d670fa
-  data.tar.gz: 84e748f9388d3208ade3db02f37f662e8ab4e7fca1aef8488411dd05dabe6a93
+  metadata.gz: 8a349beb4173c1f6361b321a95e36a407c5f5361153403cae2fbd15ffb7b8840
+  data.tar.gz: 8e06745f55b04f1074a5da27b77e4f9cb720b95bfb328672c14cca059e4a3003
 SHA512:
-  metadata.gz: 2bd170ba65c91f723ada48baff42bd90228cbf22f5aaa56eb158203b3f497037635bdeaf8e17f760556ad6bf55fb6ed922727c2bae9914e6f9e81cad54d708da
-  data.tar.gz: 8045ff1fe8a8366bedc081a4864687e7da1f56119ca71285f03bb3457787c9644513e8f54195b5fc6feb8cdbb3fc6d899bbf86b683109f910235e81a01288a05
+  metadata.gz: 01f7f93e1b0d7a058ff856cb27ce07ec816b060e2b2299cec55be298aa046809a9e9ba82f9f770205b4fe647a8d3e046e1a0b10afad0a78fc5190e52aa28fc5f
+  data.tar.gz: 5cb518f2fb78f26ae06d447d0d1a7a7f2b84de9b4f24057079464bdcd77945c36430c4718c49d1bc2a04ec48ab1cfb422fbfc02c952a516ca83d7cae3e29a2ff

data/app/models/metadata_presenter/column_number.rb

@@ -7,19 +7,15 @@ module MetadataPresenter
     end
 
     def number
-      use_new_column? ? new_column : existing_column
+      [existing_column, new_column].compact.max
     end
 
     private
 
     attr_reader :uuid, :coordinates, :new_column
 
-    def use_new_column?
-      existing_column.nil? || new_column > existing_column
-    end
-
     def existing_column
-      @existing_column ||= @coordinates.uuid_column(uuid)
+      @coordinates.uuid_column(uuid)
     end
   end
 end

data/app/models/metadata_presenter/coordinates.rb

@@ -35,14 +35,6 @@ module MetadataPresenter
       positions[uuid]
     end
 
-    def occupied?(column, row, new_object_uuid)
-      positions.any? do |uuid, position|
-        position[:column] == column &&
-          position[:row] == row &&
-          new_object_uuid != uuid
-      end
-    end
-
     def positions_in_column(column_number)
       positions.select { |_, position| position[:column] == column_number }
     end

data/app/models/metadata_presenter/grid.rb

@@ -185,7 +185,10 @@ module MetadataPresenter
         position = coordinates.position(uuid)
         next if detached?(position)
 
-        @ordered[position[:column]][position[:row]] = get_flow_object(uuid)
+        column = position[:column]
+        row = position[:row]
+        insert_spacer(column, row) if occupied?(column, row, uuid)
+        @ordered[column][row] = get_flow_object(uuid)
       end
     end
 
@@ -193,6 +196,11 @@ module MetadataPresenter
       position[:row].nil? || position[:column].nil?
     end
 
+    def occupied?(column, row, uuid)
+      object = @ordered[column][row]
+      object.is_a?(MetadataPresenter::Flow) && object.uuid != uuid
+    end
+
     def get_flow_object(uuid)
       # main_flow is always empty if the Grid is _actually_ building the main flow
       return MetadataPresenter::Pointer.new(uuid: uuid) if main_flow.include?(uuid)
@@ -245,14 +253,16 @@ module MetadataPresenter
         previous_uuid = ''
         next_column = coordinates.uuid_column(branch.uuid) + 1
         exiting_destinations_from_branch(branch).each_with_index do |uuid, row|
-          if uuid == previous_uuid
-            @ordered[next_column].insert(row, MetadataPresenter::Spacer.new)
-          end
+          insert_spacer(next_column, row) if uuid == previous_uuid
           previous_uuid = uuid
         end
       end
     end
 
+    def insert_spacer(column, row)
+      @ordered[column].insert(row, MetadataPresenter::Spacer.new)
+    end
+
     # Any destinations exiting the branch that have not already been traversed.
     # This removes any branch destinations that already exist on other rows. If
     # that is the case then the arrow will flow towards whatever row that object

data/app/models/metadata_presenter/row_number.rb

@@ -17,11 +17,7 @@ module MetadataPresenter
 
       return ROW_ZERO if place_on_row_zero?
 
-      if object_above.branch? && uuid != object_above.uuid
-        coordinates.uuid_row(object_above.uuid) + number_of_destinations
-      else
-        existing_row.nil? ? current_row : [current_row, existing_row].max
-      end
+      [current_row, existing_row, potential_row].compact.max
     end
 
     private
@@ -32,13 +28,32 @@ module MetadataPresenter
       @existing_row ||= coordinates.uuid_row(uuid)
     end
 
+    def potential_row
+      return unless object_above.branch? && uuid != object_above.uuid
+
+      coordinates.uuid_row(object_above.uuid) + number_of_destinations
+    end
+
     def first_row?
       @first_row ||= route.row.zero?
     end
 
     def object_above
       @object_above ||=
-        service.flow_object(coordinates.uuid_at_position(uuid_column, row_above))
+        service.flow_object(
+          coordinates.uuid_at_position(uuid_column, row_number_for_object_above)
+        )
+    end
+
+    def row_number_for_object_above
+      column_objects.map { |_, p| p[:row] if p[:row] < current_row }.compact.max.to_i
+    end
+
+    def column_objects
+      objects_in_column = coordinates.positions_in_column(uuid_column).reject do |u, p|
+        u == uuid || p[:row].nil?
+      end
+      objects_in_column.sort_by { |_, p| p[:row] }
     end
 
     # Takes into account the 'or' type of conditionals which requires an
@@ -51,10 +66,6 @@ module MetadataPresenter
       @uuid_column ||= coordinates.uuid_column(uuid)
     end
 
-    def row_above
-      @row_above ||= route.row - 1
-    end
-
     # If an object has already been positioned on row 0 then leave it there.
     # If the object is a checkanswers or confirmation type then always place it
     # on row 0.

data/fixtures/branching_7.json

@@ -78,12 +78,6 @@
         "default": ""
       }
     },
-    "f475d6fd-0ea4-45d5-985e-e1a7c7a5b992": {
-      "_type": "flow.page",
-      "next": {
-        "default": "be130ac1-f33d-4845-807d-89b23b90d205"
-      }
-    },
     "be130ac1-f33d-4845-807d-89b23b90d205": {
       "_type": "flow.page",
       "next": {
@@ -399,62 +393,6 @@
         }
       ]
     },
-    {
-      "_id": "page.j",
-      "url": "page-j",
-      "body": "Page J body",
-      "lede": "",
-      "_type": "page.singlequestion",
-      "_uuid": "f475d6fd-0ea4-45d5-985e-e1a7c7a5b992",
-      "heading": "Page J",
-      "components": [
-        {
-          "_id": "page-j_radios_1",
-          "hint": "",
-          "name": "page-j_radios_1",
-          "_type": "radios",
-          "_uuid": "c2f4ad91-d7ad-4aa9-b7e9-be287a7248d3",
-          "items": [
-            {
-              "_id": "page-j_radios_1_item_1",
-              "hint": "",
-              "name": "page-j_radios_1",
-              "_type": "radio",
-              "_uuid": "2e7e602d-e1af-4757-a126-75363fad80f3",
-              "label": "Item 1",
-              "value": "value-1",
-              "errors": {},
-              "legend": "Item 1",
-              "collection": "components",
-              "validation": {
-                "required": true
-              }
-            },
-            {
-              "_id": "page-j_radios_1_item_2",
-              "hint": "",
-              "name": "page-j_radios_1",
-              "_type": "radio",
-              "_uuid": "4548747d-81c0-49a5-b4f1-32291b7c3415",
-              "label": "Item 2",
-              "value": "value-2",
-              "errors": {},
-              "legend": "Item 2",
-              "collection": "components",
-              "validation": {
-                "required": true
-              }
-            }
-          ],
-          "errors": {},
-          "legend": "Page J",
-          "collection": "components",
-          "validation": {
-            "required": true
-          }
-        }
-      ]
-    },
     {
       "_id": "page.k",
       "url": "page-k",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.12.0'.freeze
+  VERSION = '2.12.1'.freeze
 end

metadata

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