metadata_presenter 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a31f247a10c6d27dbc9aa98fcaeba77debba7299bdc07ae0a464d5ef2e0acb4
-  data.tar.gz: 03b6fdf906a24439d474498e86d4c7e0e7978137551cbd7929fd61c06616a3d8
+  metadata.gz: bbf82d6e0d0d2d3456a197111c4f9819c7fb67c8d260fc7db6c9c8be24788d30
+  data.tar.gz: '052159fc7c7fe9b069586828b56a9b89abb7737a1714da371616faf484af2949'
 SHA512:
-  metadata.gz: fc2bc804e2e918de103b68dd0af02a6538f785f49bb4267a74cad8b88f3ed8f6d9d83476df0d2f247bbad44c8121fcbb4941397df1a5189a40e4348bf433b966
-  data.tar.gz: 559b1ddc0c79e391a0406dd7bba3cfc28758aa64fc7c20cc190790c141a9cb025400c83442cc95886509ca75741bf29a0b7121c79edf315d7cf9138a971ec034
+  metadata.gz: 194308706ef13433ad2bebba4bb8c3367e84f0b3d8de4874a67ea0c47065f4a47717c7a29c8564809a0a319d0d381b6122c0203abf0d4fb39d8e618e56ab9cfc
+  data.tar.gz: 815a4558475e02b8b32805f2c8d3c3fc7276b33d1b3497d81221332b3a3b46d1f29248d246267209cfe62692f38f00b0c3b937b37d973568cb59d25cbdb9c34d

data/app/controllers/metadata_presenter/save_and_return_controller.rb

@@ -42,6 +42,7 @@ module MetadataPresenter
       @saved_form.secret_question = params['saved_form']['secret_question']
       @saved_form.populate_service_values(service)
       @saved_form.populate_session_values(session)
+      @saved_form.service_slug = service_slug
       if @saved_form.valid?
         # put in session until we have confirmed email address
         @saved_form.secret_question = @saved_form.secret_question_text
@@ -231,5 +232,11 @@ module MetadataPresenter
     def label_text(text)
       "<h2 class='govuk-heading-m'>#{text}</h2>"
     end
+
+    private
+
+    def service_slug
+      @service_slug ||= service_slug_config
+    end
   end
 end

data/app/models/metadata_presenter/grid.rb

@@ -124,12 +124,15 @@ module MetadataPresenter
       # Always traverse the route from the start_from uuid. Defaulting to the
       # start page of the form unless otherwise specified.
       # Get all the potential routes from any branching points that exist.
+      traversed_uuids = []
       route_from_start.traverse
       @routes.append(route_from_start)
-      traversed_routes = route_from_start.routes
-
+      traversed_uuids.concat(route_from_start.flow_uuids)
+      routes_to_traverse = route_from_start.routes
       index = 0
-      until traversed_routes.empty?
+      Rails.logger.info("Total potential routes: #{total_potential_routes}")
+
+      until routes_to_traverse.empty?
         if index > total_potential_routes
           ActiveSupport::Notifications.instrument(
             'exceeded_total_potential_routes',
@@ -138,17 +141,22 @@ module MetadataPresenter
           break
         end
 
-        route = traversed_routes.shift
+        route = routes_to_traverse.shift
         @routes.append(route)
 
-        # Every route exiting a branching point needs to be traversed and any
-        # additional routes from other branching points collected and then also
-        # traversed.
+        # Traverse the route and add any nested routes to the list of routes to
+        # traverse.
+        # If the first flow_uuid in the route has already been traversed, then
+        # this route is looping back, so we don't need to traverse the nested routes.
         route.traverse
-        traversed_routes |= route.routes
+        unless traversed_uuids.include?(route.flow_uuids.first)
+          routes_to_traverse.concat(route.routes)
+        end
+        traversed_uuids.concat(route.flow_uuids)
 
         index += 1
       end
+      Rails.logger.info("Total routes traversed: #{index}")
     end
 
     def set_column_numbers
@@ -441,15 +449,12 @@ module MetadataPresenter
       branch.all_destination_uuids.reject { |uuid| @traversed.include?(uuid) }
     end
 
-    # Deliberately not including the default next for each branch as when row
-    # zero is created it takes the first available conditional for each branch.
-    # The remaining are then used to create route objects. Therefore the total
-    # number of remaining routes will be the same as the total of all the branch
-    # conditionals.
-    # Add 1 additional route as that represents the route_from_start.
+    # Calculate an upper limit to prevent infinite traversal
+    # Not easy to calculate exactly, aiming for a number that is bigger than
+    # total possible routes but not too much bigger.
     def total_potential_routes
-      @total_potential_routes ||=
-        service.branches.sum { |branch| branch.conditionals.size } + 1
+      total_conditionals = service.branches.sum { |branch| branch.conditionals.size + 1 }
+      @total_potential_routes ||= total_conditionals * total_conditionals
     end
   end
 end

data/app/models/metadata_presenter/saved_form.rb

@@ -21,7 +21,7 @@ module MetadataPresenter
                   :created_at,
                   :updated_at
 
-    validates :secret_question, :secret_answer, :service_slug, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
+    validates :secret_question, :secret_answer, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
 
     def initialize; end
 
@@ -38,7 +38,6 @@ module MetadataPresenter
     end
 
     def populate_service_values(service)
-      self.service_slug    = service.service_slug
       self.service_version = service.version_id
     end
 

data/app/models/metadata_presenter/service.rb

@@ -38,8 +38,6 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def service_slug
-    return service_slug_config if service_slug_config.present?
-
     service_name.gsub(/['’]/, '').parameterize
   end
 

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder