metadata_presenter 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4803f047828b34c584bbe1a6e3634e55ab62fb7dc5cf84af0e74179fab2bfd
-  data.tar.gz: 48d367b837b22dae94e57158a1f23471ac5c8f51bac70ece003bcaa528eed909
+  metadata.gz: 86ebfbaf7f71c17731ad61596d6fe476f89103aceb9ce630fd8aecf1191dbff2
+  data.tar.gz: 120924e797dcbf42e6ef93807471555ba32e13ef0f95c59a30315d109f05c26b
 SHA512:
-  metadata.gz: 45740afe9df6c30057f70e6c8c8cd24f913c90f6bb63c49a04c4104abbf65c3a87333f648cb8ff55be537ff754a5cb1e86745dd9762acb2df2201ba03bfeebda
-  data.tar.gz: dd590ea13e20ce649630a7640e5877d56dca8081e2b8c118c22da9e4f43e62afaa39b3ddbdf185cc1e6b4f244aaafb9b37b1ca4d6995f8bd90a3deb5b95d8a60
+  metadata.gz: 49e96e2ca21a0cc70ba8a8d6582ecbad329a398512e93d8007be1bc20ed3dc8a41a95b19d9c23efd6728ec272e0f407b5f0bb5130d3a9f874490eee957046a14
+  data.tar.gz: 71a8456b3e0153693efaf08387e5caf043543d2ff970e254f89dec445459ee08415dd68e83de8a354db529e5b6d9b76d15a36b90b82146259fb6b67d5f97e05d

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

@@ -43,10 +43,10 @@ module MetadataPresenter
       return {} unless file_details
 
       if file_details.is_a?(Hash) || file_details.is_a?(ActionController::Parameters)
-        file_details.merge('original_filename' => sanitize(filename(file_details['original_filename'])))
+        file_details.merge('original_filename' => sanitize(filename(update_filename(file_details['original_filename']))))
       else
         {
-          'original_filename' => sanitize(filename(file_details.original_filename)),
+          'original_filename' => sanitize(filename(update_filename(file_details.original_filename))),
           'content_type' => file_details.content_type,
           'tempfile' => file_details.tempfile.path.to_s
         }
@@ -85,5 +85,16 @@ module MetadataPresenter
 
       filename
     end
+
+    def update_filename(answer)
+      jfif_or_jpg_extension?(answer) ? "#{File.basename(answer, '.*')}.jpeg" : answer
+    end
+
+    def jfif_or_jpg_extension?(answer)
+      return false if answer.nil?
+
+      file_extension = File.extname(answer)
+      %w[.jfif .jpg].include?(file_extension)
+    end
   end
 end

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.4'.freeze
 end

metadata

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