metadata_presenter 2.17.34 → 2.17.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1dffc8d49002c81fb1b6e646d99c2bc3934fae991d6b35f1fde762138f42c68
-  data.tar.gz: 1c5ad4558ebaa22d3ff37a4378214f76bf31810b627ecab1011ca8f805bb4143
+  metadata.gz: 93bd1410cbf89bbfddbc54da90360e8d864d98e9e4d90ed4b6f49159b4a38f55
+  data.tar.gz: f91d6a77c7a5a823c0344824b04ed9aaec2005896fd66e93ed6f07479c5e1353
 SHA512:
-  metadata.gz: 326ff927afe3e9e9d57e8d048812b4f1aea71e8a506aaefc4a43fe0fdd16abee57b9a944f5c5beac6f33f281970a4b8ccc299d7ac1fb10933a1337df419dc125
-  data.tar.gz: 3e7271f5e76796636af6494969d4f76eaf87dd18b1b213a3eae166d9ddf837893e3b8fd8cced3674a6340b675d45f57b8f9b85373a794cc28847953c72f12196
+  metadata.gz: 5f5fc9aea8e4d1bd434ba3579d1c18b46455047325f7bb7be37f67e5a0334e4077c59adca30a9c08f56f32d0dd966f4dff097937cbef70c8b6fa6ecb91c6fbcd
+  data.tar.gz: b64584d58c92f148c147e6436fc50ea08d13f9196753f4052fca86788597a2749a5fc391b8a697d8090740d95fdc8a177757bbfbd4fa98a22373df5d86161a15

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -27,8 +27,8 @@ module MetadataPresenter
 
     def redirect_to_next_page
       next_page = NextPage.new(
-        service: service,
-        session: session,
+        service:,
+        session:,
         user_data: reload_user_data,
         current_page_url: page_url,
         previous_answers: @previous_answers
@@ -74,13 +74,13 @@ module MetadataPresenter
         @page_answers.answers[component.id] = answer
         MetadataPresenter::UploadedFile.new(
           file: @page_answers.send(component.id),
-          component: component
+          component:
         )
       else
         FileUploader.new(
-          session: session,
+          session:,
           page_answers: @page_answers,
-          component: component,
+          component:,
           adapter: upload_adapter
         ).upload
       end

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -17,7 +17,7 @@ module MetadataPresenter
 
     def back_link
       previous_page = PreviousPage.new(
-        service: service,
+        service:,
         user_data: load_user_data,
         current_page: @page,
         referrer: request.referrer

data/app/models/metadata_presenter/autocomplete_item.rb

@@ -1,6 +1,6 @@
 class MetadataPresenter::AutocompleteItem < MetadataPresenter::Metadata
   def id
-    { text: text, value: value }.to_json
+    { text:, value: }.to_json
   end
 
   def name

data/app/models/metadata_presenter/coordinates.rb

@@ -76,7 +76,7 @@ module MetadataPresenter
 
     def initial_spacer(branch)
       destinations = exiting_destinations_from_branch(branch).map do |uuid|
-        { uuid: uuid, row: nil, column: nil }
+        { uuid:, row: nil, column: nil }
       end
       has_or_conditionals?(branch) ? destinations.uniq : destinations
     end

data/app/models/metadata_presenter/file_uploader.rb

@@ -4,15 +4,15 @@ module MetadataPresenter
     attr_accessor :session, :page_answers, :component, :adapter
 
     def upload
-      UploadedFile.new(file: upload_file, component: component)
+      UploadedFile.new(file: upload_file, component:)
     end
 
     def upload_file
       return {} if file_details.blank?
 
       adapter.new(
-        session: session,
-        file_details: file_details,
+        session:,
+        file_details:,
         allowed_file_types: component.validation['accept']
       ).call
     end

data/app/models/metadata_presenter/grid.rb

@@ -94,7 +94,7 @@ module MetadataPresenter
     def route_from_start
       @route_from_start ||=
         MetadataPresenter::Route.new(
-          service: service,
+          service:,
           traverse_from: start_from || service.start_page.uuid
         )
     end
@@ -155,10 +155,10 @@ module MetadataPresenter
       @routes.each do |route|
         route.flow_uuids.each.with_index(route.column) do |uuid, new_column|
           column_number = MetadataPresenter::ColumnNumber.new(
-            uuid: uuid,
-            new_column: new_column,
+            uuid:,
+            new_column:,
             coordinates: @coordinates,
-            service: service
+            service:
           ).number
           @coordinates.set_column(uuid, column_number)
         end
@@ -172,11 +172,11 @@ module MetadataPresenter
         current_row = route.row
         route.flow_uuids.each do |uuid|
           row_number = MetadataPresenter::RowNumber.new(
-            uuid: uuid,
-            route: route,
-            current_row: current_row,
+            uuid:,
+            route:,
+            current_row:,
             coordinates: @coordinates,
-            service: service
+            service:
           ).number
           @coordinates.set_row(uuid, row_number)
 
@@ -244,7 +244,7 @@ module MetadataPresenter
 
     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)
+      return MetadataPresenter::Pointer.new(uuid:) if main_flow.include?(uuid)
 
       service.flow_object(uuid)
     end

data/app/models/metadata_presenter/next_page.rb

@@ -68,9 +68,9 @@ module MetadataPresenter
 
     def evaluate_conditionals
       EvaluateConditionals.new(
-        service: service,
+        service:,
         flow: next_flow,
-        user_data: user_data
+        user_data:
       ).page
     end
 

data/app/models/metadata_presenter/page.rb

@@ -125,7 +125,7 @@ module MetadataPresenter
     def to_components(node_components, collection:)
       Array(node_components).map do |component|
         MetadataPresenter::Component.new(
-          component.merge(collection: collection),
+          component.merge(collection:),
           editor: editor?
         )
       end

data/app/models/metadata_presenter/page_answers.rb

@@ -13,7 +13,7 @@ module MetadataPresenter
     end
 
     def validate_answers
-      ValidateAnswers.new(self, components: components, autocomplete_items: autocomplete_items).valid?
+      ValidateAnswers.new(self, components:, autocomplete_items:).valid?
     end
 
     delegate :components, to: :page

data/app/models/metadata_presenter/route.rb

@@ -42,8 +42,8 @@ module MetadataPresenter
           set_first_conditional_previous_flow(flow_object.uuid, first_conditional)
           create_destination_routes(
             previous_flow_uuid: flow_object.uuid,
-            destinations: destinations,
-            row: row,
+            destinations:,
+            row:,
             column: index
           )
 
@@ -78,15 +78,15 @@ module MetadataPresenter
     def set_first_conditional_previous_flow(previous_flow_uuid, first_conditional)
       set_previous_flow(
         uuid: first_conditional[:next],
-        previous_flow_uuid: 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
+        previous_flow_uuid:,
+        conditional_uuid:
       }
     end
 
@@ -104,9 +104,9 @@ module MetadataPresenter
       destinations.each do |destination|
         @routes.push(
           MetadataPresenter::Route.new(
-            service: service,
+            service:,
             traverse_from: destination[:next],
-            previous_flow_uuid: previous_flow_uuid,
+            previous_flow_uuid:,
             conditional_uuid: destination[:conditional_uuid],
             row: row_number,
             column: column_number
@@ -120,8 +120,8 @@ module MetadataPresenter
       Hash[
         traverse_from,
         {
-          previous_flow_uuid: previous_flow_uuid,
-          conditional_uuid: conditional_uuid
+          previous_flow_uuid:,
+          conditional_uuid:
         }
       ]
     end

data/app/models/metadata_presenter/traversed_pages.rb

@@ -29,9 +29,9 @@ module MetadataPresenter
 
     def evaluated_page(flow_object)
       EvaluateConditionals.new(
-        service: service,
+        service:,
         flow: flow_object,
-        user_data: user_data
+        user_data:
       ).page
     end
 

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -12,10 +12,10 @@ module MetadataPresenter
       user_input_pages(pages).map { |page|
         Array(page.supported_components_by_type(:input)).map do |component|
           new(
-            view: view,
-            component: component,
-            page: page,
-            answers: answers
+            view:,
+            component:,
+            page:,
+            answers:
           )
         end
       }.reject(&:empty?)

data/app/validators/metadata_presenter/autocomplete_validator.rb

@@ -3,7 +3,7 @@ module MetadataPresenter
     attr_reader :autocomplete_items
 
     def initialize(page_answers:, component:, autocomplete_items:)
-      super(page_answers: page_answers, component: component)
+      super(page_answers:, component:)
 
       @autocomplete_items = autocomplete_items
     end

data/app/validators/metadata_presenter/validate_answers.rb

@@ -22,9 +22,9 @@ module MetadataPresenter
       components.map { |component|
         component_validations(component).map do |key|
           "MetadataPresenter::#{key.classify}Validator".constantize.new(
-            {
-              component: component,
-              page_answers: page_answers
+            **{
+              page_answers:,
+              component:
             }.merge(autocomplete_param(key))
           )
         end
@@ -38,7 +38,7 @@ module MetadataPresenter
     end
 
     def autocomplete_param(key)
-      key == 'autocomplete' ? { autocomplete_items: autocomplete_items } : {}
+      key == 'autocomplete' ? { autocomplete_items: } : {}
     end
   end
 end

data/config/locales/en.yml

@@ -31,7 +31,7 @@ en:
     footer:
       cookies:
         heading: "Cookies"
-        body: "This form saves small files (known as 'cookies') onto your device.\r\n \r\nCookies are used to:\r\n \r\n* remember your progress\r\n* measure how you use the form so it can be updated and improved based on your needs\r\n \r\nThese cookies are not used to identify you personally.\r\n \r\nYou will normally see a message on the form before we store a cookie on your computer. Essential cookies are necessary for the form to work but you can still complete the form if you choose not to accept analytics cookies.\r\n \r\nFind out more about [how to manage cookies](https://www.aboutcookies.org/).\r\n \r\n## Essential cookies\r\n \r\nEssential cookies are required to make this form work and keep your information secure while you use it.\r\n \r\nWe use the following essential cookies: \r\n \r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| \\_fb\\_runner\\_session | Saves your current progress on this computer and tracks inactivity periods | After 30 minutes of inactivity or when you close your browser |\r\n| analytics | Remembers whether you accept or reject analytics cookies on this form | After 1 year |\r\n \r\n## Analytics cookies\r\n \r\nAnalytics cookies collect information about how you use this form. This helps us make sure the form is meeting the needs of its users and to help us make improvements.\r\n \r\nWe use Google Analytics to learn about:\r\n \r\n* the pages you visit\r\n* how long you spend on each page\r\n* how you got to the form\r\n* what you click on while you are using the form\r\n \r\nWe do not collect or store your personal information (for example your name or address) so this information can't be used to identify who you are. We do not allow third parties to use or share our analytics data.\r\n \r\nThis form may use different versions of Google Analytics and could save some or all of the following cookies:\r\n \r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| \\_ga | Helps us count how many people visit this form | 2 years |\r\n| \\_gid | Helps us count how many people visit this form | 1 day   |\r\n| \\_ga\\_\\<container-id> | Used to persist session state | 2 years |\r\n| \\_gac\\_gb\\_\\<container-id> | Contains campaign-related information | 90 days |\r\n| \\_gat | Used to throttle request rate | 1 minute |\r\n| \\_dc\\_gtm\\_\\<property- id>| Used to throttle request rate | 1 minute |\r\n| AMP\\_TOKEN | Contains a token that can be used to retrieve a Client ID from AMP Client ID service | 30 seconds to 1 year |\r\n| \\_gac\\_\\<property-id> | Contains campaign related information | 90 days |\r\n \r\nYou can use a browser addon to [opt out of Google Analytics cookies](https://tools.google.com/dlpage/gaoptout) on all websites."
+        body: "This form saves small files (known as 'cookies') onto your device.\r\n \r\nCookies are used to:\r\n \r\n* remember your progress\r\n* measure how you use the form so it can be updated and improved based on your needs\r\n \r\nThese cookies are not used to identify you personally.\r\n \r\nYou will normally see a message on the form before we store a cookie on your computer. Essential cookies are necessary for the form to work but you can still complete the form if you choose not to accept analytics cookies.\r\n \r\nFind out more about [how to manage cookies](https://www.aboutcookies.org/).\r\n \r\n## Essential cookies\r\n \r\nEssential cookies are required to make this form work and keep your information secure while you use it.\r\n \r\nWe use the following essential cookies: \r\n \r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| \\_fb\\_runner\\_session | Saves your current progress on this computer and tracks inactivity periods | After 60 minutes from starting the form or when you close your browser |\r\n| analytics | Remembers whether you accept or reject analytics cookies on this form | After 1 year |\r\n \r\n## Analytics cookies\r\n \r\nAnalytics cookies collect information about how you use this form. This helps us make sure the form is meeting the needs of its users and to help us make improvements.\r\n \r\nWe use Google Analytics to learn about:\r\n \r\n* the pages you visit\r\n* how long you spend on each page\r\n* how you got to the form\r\n* what you click on while you are using the form\r\n \r\nWe do not collect or store your personal information (for example your name or address) so this information can't be used to identify who you are. We do not allow third parties to use or share our analytics data.\r\n \r\nThis form may use different versions of Google Analytics and could save some or all of the following cookies:\r\n \r\n| Name | Purpose | Expires |\r\n|---|---|---|\r\n| \\_ga | Helps us count how many people visit this form | 2 years |\r\n| \\_gid | Helps us count how many people visit this form | 1 day   |\r\n| \\_ga\\_\\<container-id> | Used to persist session state | 2 years |\r\n| \\_gac\\_gb\\_\\<container-id> | Contains campaign-related information | 90 days |\r\n| \\_gat | Used to throttle request rate | 1 minute |\r\n| \\_dc\\_gtm\\_\\<property- id>| Used to throttle request rate | 1 minute |\r\n| AMP\\_TOKEN | Contains a token that can be used to retrieve a Client ID from AMP Client ID service | 30 seconds to 1 year |\r\n| \\_gac\\_\\<property-id> | Contains campaign related information | 90 days |\r\n \r\nYou can use a browser addon to [opt out of Google Analytics cookies](https://tools.google.com/dlpage/gaoptout) on all websites."
         url: 'cookies'
       privacy:
         heading: "Privacy notice"

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.17.34'.freeze
+  VERSION = '2.17.36'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.34
+  version: 2.17.36
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder