metadata_presenter 2.17.13 → 2.17.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 268aeb32fbc8b5e3bf2bf779dc9b3084b5720705974c637b083d9f4fb7a375ac
-  data.tar.gz: d60414f947c4896709b8f546d9e3d8f41ddaf64a89d448552efd7ff75ddf8ddf
+  metadata.gz: e97452ef08994e231a3652ad8f9ccdae67668e04bb3e449fd958a0872e4320ca
+  data.tar.gz: 6bacb894b8f40bda5ac33ffa4625d9a0970ba676d11184cdd97c8c1c5db2d0d4
 SHA512:
-  metadata.gz: c1ef5a82ce1be109e3f5fa6a4d8b8da0a7384f2087da4828e62aa97fc957336d3b4cc194609052d355f1de30efbaea7a90b0517880b5f4721956b50cef364298
-  data.tar.gz: 153703f311912d4c5b6aaf8e768a4027e6bb58706fede917d598abbbde2c65376f52f8469cedfa527207bea401a95e113af07ec71cd8c488b01b50a810380a25
+  metadata.gz: c446088262eea4845c754ed6f17b30237fc50acdd1b9f96b9bb78e2acb28d45445bf50d26a699188497ef58e90e8799fa2d7d384f350dac509e46d98b77faa36
+  data.tar.gz: e583b37191f8d82e357c06eb0bd17113bf2531ae1f7e4de3a40991d20ddcb4ce2877bf9cfa8bc81ae8da1964ab5c0b0150154feb2e6f8e7a013eed632fdf07e1

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -4,7 +4,7 @@ module MetadataPresenter
 
     def create
       @previous_answers = reload_user_data.deep_dup
-      @page_answers = PageAnswers.new(page, answers_params)
+      @page_answers = PageAnswers.new(page, answers_params, autocomplete_items(page.components))
 
       upload_files if upload?
 
@@ -43,6 +43,8 @@ module MetadataPresenter
 
     def render_validation_error
       @user_data = answers_params
+      load_autocomplete_items
+
       render template: page.template, status: :unprocessable_entity
     end
 

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -57,6 +57,13 @@ module MetadataPresenter
     end
     helper_method :analytics_tags_present?
 
+    def load_autocomplete_items
+      if @page.autocomplete_component_present?
+        items = autocomplete_items(@page.components)
+        @page.assign_autocomplete_items(items)
+      end
+    end
+
     private
 
     def not_found

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -5,10 +5,7 @@ module MetadataPresenter
       @page ||= service.find_page_by_url(request.env['PATH_INFO'])
 
       if @page
-        if @page.autocomplete_component_present?
-          items = autocomplete_items(@page.components)
-          @page.assign_autocomplete_items(items)
-        end
+        load_autocomplete_items
 
         @page_answers = PageAnswers.new(@page, @user_data)
         render template: @page.template

data/app/models/metadata_presenter/page_answers.rb

@@ -3,16 +3,17 @@ module MetadataPresenter
     include ActiveModel::Model
     include ActiveModel::Validations
     include ActionView::Helpers
-    attr_reader :page, :answers, :uploaded_files
+    attr_reader :page, :answers, :uploaded_files, :autocomplete_items
 
-    def initialize(page, answers)
+    def initialize(page, answers, autocomplete_items = nil)
       @page = page
       @answers = answers
+      @autocomplete_items = autocomplete_items
       @uploaded_files = []
     end
 
     def validate_answers
-      ValidateAnswers.new(self, components: components).valid?
+      ValidateAnswers.new(self, components: components, autocomplete_items: autocomplete_items).valid?
     end
 
     delegate :components, to: :page

data/app/validators/metadata_presenter/autocomplete_validator.rb

@@ -0,0 +1,21 @@
+module MetadataPresenter
+  class AutocompleteValidator < BaseValidator
+    attr_reader :autocomplete_items
+
+    def initialize(page_answers:, component:, autocomplete_items:)
+      super(page_answers: page_answers, component: component)
+
+      @autocomplete_items = autocomplete_items
+    end
+
+    def invalid_answer?
+      return if autocomplete_item_list.blank?
+
+      autocomplete_item_list.exclude?(JSON.parse(user_answer))
+    end
+
+    def autocomplete_item_list
+      @autocomplete_item_list ||= autocomplete_items[component.uuid]
+    end
+  end
+end

data/app/validators/metadata_presenter/validate_answers.rb

@@ -1,10 +1,11 @@
 module MetadataPresenter
   class ValidateAnswers
-    attr_reader :page_answers, :components
+    attr_reader :page_answers, :components, :autocomplete_items
 
-    def initialize(page_answers, components:)
+    def initialize(page_answers, components:, autocomplete_items:)
       @page_answers = page_answers
       @components = Array(components)
+      @autocomplete_items = autocomplete_items
     end
 
     def valid?
@@ -21,8 +22,10 @@ module MetadataPresenter
       components.map { |component|
         component_validations(component).map do |key|
           "MetadataPresenter::#{key.classify}Validator".constantize.new(
-            page_answers: page_answers,
-            component: component
+            {
+              component: component,
+              page_answers: page_answers
+            }.merge(autocomplete_param(key))
           )
         end
       }.compact.flatten
@@ -33,5 +36,9 @@ module MetadataPresenter
 
       component.validation.select { |_, value| value.present? }.keys
     end
+
+    def autocomplete_param(key)
+      key == 'autocomplete_item' ? { autocomplete_items: autocomplete_items } : {}
+    end
   end
 end

data/default_metadata/component/autocomplete.json

@@ -7,6 +7,7 @@
   "name": "component-name",
   "legend": "Question",
   "validation": {
-    "required": true
+    "required": true,
+    "autocomplete": true
   }
 }

data/default_metadata/string/error.autocomplete.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.autocomplete",
+  "_type": "string.error",
+  "description": "Autocomplete item is not on the list",
+  "value": "Select an option from the list"
+}

data/fixtures/version.json

@@ -595,7 +595,8 @@
           },
           "legend": "Countries",
           "validation": {
-            "required": true
+            "required": true,
+            "autocomplete": true
           }
         }
       ],

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.17.13'.freeze
+  VERSION = '2.17.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.13
+  version: 2.17.14
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-29 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -299,6 +299,7 @@ files:
 - app/operators/metadata_presenter/operator.rb
 - app/presenters/metadata_presenter/page_answers_presenter.rb
 - app/validators/metadata_presenter/accept_validator.rb
+- app/validators/metadata_presenter/autocomplete_validator.rb
 - app/validators/metadata_presenter/base_validator.rb
 - app/validators/metadata_presenter/date_after_validator.rb
 - app/validators/metadata_presenter/date_before_validator.rb
@@ -390,6 +391,7 @@ files:
 - default_metadata/page/start.json
 - default_metadata/service/base.json
 - default_metadata/string/error.accept.json
+- default_metadata/string/error.autocomplete.json
 - default_metadata/string/error.date.json
 - default_metadata/string/error.date_after.json
 - default_metadata/string/error.date_before.json