metadata_presenter 2.15.11 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed2edbd83d209d0d3dbe101acba9e00e58a97c15d6f808e702c973a785d9ca9
-  data.tar.gz: 3edc797ab259c41f3b64ba3beb35825ef7a7a699b6057baf8f2e37255f789c6d
+  metadata.gz: aea27b189ffc9aa32b2eaa0e82687641c85cee5c0838f76eab923ef914528228
+  data.tar.gz: fa9a46743dd960cb6b870ef3399f792dc721baa407a4a70f6b3d9445b87c88ea
 SHA512:
-  metadata.gz: c623243b91fc49d8656c71daea983dfb23eec612e61b374a3d7ae356047162ad6e273ca292639f0ef830e7c15b30a06754cf06e6c117873773fb9fb6a4a5c36c
-  data.tar.gz: abe236b3cbf2674c92716a5b89fb6b5fe41b5e3c34eeb67b3d57b71b2a439109dbd6ed3827e0829a8ee4983c6e5ec4f3a470e1c42d85dc4b7d491948f2762360
+  metadata.gz: e7181c2097257a9d518cb104e64a8922a586e53c14731e7e1cad87c979904a953968e8c7efe927ae576ec9635bfa824b8c5dc1a886d6ca5ce02bc24d0380a9e3
+  data.tar.gz: '09653947ee618d2b69ad8114f0271166cac37b290a222a219aeab548159c914d89ecc07d4829d52da935d45b56129949384ca60902b589a913854e30959cacaf'

data/app/models/metadata_presenter/coordinates.rb

@@ -61,7 +61,9 @@ module MetadataPresenter
     attr_writer :positions, :branch_spacers
 
     def setup_positions
-      service.flow.keys.index_with { |_uuid| { row: nil, column: nil } }
+      service.flow.keys.index_with do |_uuid|
+        { row: nil, column: nil, previous_flow_uuid: nil, conditional_uuid: nil }
+      end
     end
 
     # This also takes into account the 'OR' expressions which

data/app/models/metadata_presenter/grid.rb

@@ -19,7 +19,7 @@ module MetadataPresenter
 
   class Grid
     include BranchDestinations
-    attr_reader :service, :start_from
+    attr_reader :service, :start_from, :previous_uuids
 
     def initialize(service, start_from: nil, main_flow: [])
       @service = service
@@ -29,6 +29,7 @@ module MetadataPresenter
       @routes = []
       @traversed = []
       @coordinates = MetadataPresenter::Coordinates.new(service)
+      @previous_uuids = {}
     end
 
     ROW_ZERO = 0
@@ -39,6 +40,7 @@ module MetadataPresenter
       @ordered = make_grid
       set_column_numbers
       set_row_numbers
+      set_previous_uuids
       add_by_coordinates
       insert_expression_spacers
       trim_pointers unless main_flow.empty? # only used by detached grids
@@ -71,10 +73,23 @@ module MetadataPresenter
       checkanswers_warning.show_warning? || confirmation_warning.show_warning?
     end
 
+    def previous_uuid_for_object(uuid)
+      return unless previous_uuids.key?(uuid)
+
+      previous_uuids[uuid][:previous_flow_uuid]
+    end
+
+    def conditional_uuid_for_object(uuid)
+      return unless previous_uuids.key?(uuid)
+
+      previous_uuids[uuid][:conditional_uuid]
+    end
+
     private
 
     attr_reader :main_flow
     attr_accessor :ordered, :traversed, :routes, :coordinates
+    attr_writer :previous_uuids
 
     def route_from_start
       @route_from_start ||=
@@ -352,6 +367,16 @@ module MetadataPresenter
       trimmed_column.all?(MetadataPresenter::Spacer)
     end
 
+    def set_previous_uuids
+      @routes.each do |route|
+        route.flow_uuids.each do |uuid|
+          if previous_uuids[uuid].blank?
+            previous_uuids[uuid] = route.previous_uuids[uuid]
+          end
+        end
+      end
+    end
+
     # Each branch has a certain number of exits that require their own line
     # 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

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/route.rb

@@ -1,21 +1,27 @@
 module MetadataPresenter
   class Route
     attr_reader :traverse_from
-    attr_accessor :flow_uuids, :routes, :row, :column
+    attr_accessor :flow_uuids, :routes, :row, :column, :previous_flow_uuid,
+                  :conditional_uuid, :previous_uuids
 
-    def initialize(service:, traverse_from:, row: 0, column: 0)
+    def initialize(service:, traverse_from:, row: 0, column: 0,
+                   previous_flow_uuid: nil, conditional_uuid: nil)
       @service = service
       @traverse_from = traverse_from
       @row = row
       @column = column
+      @previous_flow_uuid = previous_flow_uuid
+      @conditional_uuid = conditional_uuid
+      @previous_uuids = setup_previous_uuids
       @routes = []
       @flow_uuids = []
     end
 
     def traverse
       @flow_uuid = traverse_from
-
       index = column
+      previous_uuid = previous_flow_uuid || ''
+
       until @flow_uuid.blank?
         if index > service.flow.size
           ActiveSupport::Notifications.instrument(
@@ -29,36 +35,27 @@ module MetadataPresenter
         flow_object = service.flow_object(@flow_uuid)
 
         if flow_object.branch?
-          destinations = destination_uuids(flow_object)
+          destinations = branch_destinations(flow_object)
           # Take the first conditional destination and follow that until the end
           # of the route.
-          @flow_uuid = destinations.shift
-
-          # The remaining conditional destinations and the branch's default next
-          # (otherwise) will be the starting point for a new Route object to be
-          # traversed.
-          # The default behaviour is that the next destination will be on the row
-          # below this current route's row. This can be changed under certain
-          # conditions in the Grid model.
-          # Each of the destinations need to be placed in the column after the
-          # current column.
-          row_number = row + 1
-          column_number = index + 1
-          destinations.each do |uuid|
-            @routes.push(
-              MetadataPresenter::Route.new(
-                service: service,
-                traverse_from: uuid,
-                row: row_number,
-                column: column_number
-              )
-            )
-            row_number += 1
-          end
+          first_conditional = destinations.shift
+          set_first_conditional_previous_flow(flow_object.uuid, first_conditional)
+          create_destination_routes(
+            previous_flow_uuid: flow_object.uuid,
+            destinations: destinations,
+            row: row,
+            column: index
+          )
+
+          @flow_uuid = first_conditional[:next]
         else
           @flow_uuid = flow_object.default_next
         end
 
+        unless previous_uuids.key?(flow_object.uuid)
+          set_previous_flow(uuid: flow_object.uuid, previous_flow_uuid: previous_uuid)
+        end
+        previous_uuid = flow_object.uuid
         index += 1
       end
 
@@ -69,8 +66,64 @@ module MetadataPresenter
 
     attr_reader :service
 
-    def destination_uuids(flow_object)
-      flow_object.conditionals.map(&:next).push(flow_object.default_next)
+    def branch_destinations(flow_object)
+      conditionals = flow_object.conditionals.map do |conditional|
+        { next: conditional.next, conditional_uuid: conditional.uuid }
+      end
+
+      conditionals.push({ next: flow_object.default_next })
+      conditionals
+    end
+
+    def set_first_conditional_previous_flow(previous_flow_uuid, first_conditional)
+      set_previous_flow(
+        uuid: first_conditional[:next],
+        previous_flow_uuid: previous_flow_uuid,
+        conditional_uuid: first_conditional[:conditional_uuid]
+      )
+    end
+
+    def set_previous_flow(uuid:, previous_flow_uuid:, conditional_uuid: nil)
+      previous_uuids[uuid] = {
+        previous_flow_uuid: previous_flow_uuid,
+        conditional_uuid: conditional_uuid
+      }
+    end
+
+    # The remaining conditional destinations and the branch's default next
+    # (otherwise) will be the starting point for a new Route object to be
+    # traversed.
+    # The default behaviour is that the next destination will be on the row
+    # below this current route's row. This can be changed under certain
+    # conditions in the Grid model.
+    # Each of the destinations need to be placed in the column after the
+    # current column.
+    def create_destination_routes(previous_flow_uuid:, destinations:, row:, column:)
+      row_number = row + 1
+      column_number = column + 1
+      destinations.each do |destination|
+        @routes.push(
+          MetadataPresenter::Route.new(
+            service: service,
+            traverse_from: destination[:next],
+            previous_flow_uuid: previous_flow_uuid,
+            conditional_uuid: destination[:conditional_uuid],
+            row: row_number,
+            column: column_number
+          )
+        )
+        row_number += 1
+      end
+    end
+
+    def setup_previous_uuids
+      Hash[
+        traverse_from,
+        {
+          previous_flow_uuid: previous_flow_uuid,
+          conditional_uuid: conditional_uuid
+        }
+      ]
     end
   end
 end

data/app/views/metadata_presenter/component/_radios.html.erb

@@ -8,5 +8,6 @@
     hint: {
       data: { "fb-default-text" => default_text('hint') },
       text: component.hint
-    }
+    },
+    bold_labels: false
 %>

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.15.11'.freeze
+  VERSION = '2.16.0'.freeze
 end

metadata

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