metadata_presenter 2.17.12 → 2.17.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d44483b1324f5bd4feb59767282ae2356c985bfd7afc50be63335dd1c57dbe
-  data.tar.gz: 64dd7c4d4cd9c2815e1fada71c2780f60203b2530b305b0edd82a85833cf5f0b
+  metadata.gz: 554d66ee3145149186a1ba14c1314e491d8288f7089dc4f471aad6e49fd010f7
+  data.tar.gz: a43937e88311ebe4885cc3465182c11e9322691f70c9f7dfe495f4b5bfae2d21
 SHA512:
-  metadata.gz: 6da916e33426cfbd2868b09aa0a92c16a78fbee45cf33016a24844686dfc82a8dc076c80538c2e5ab723e9448fd5a0a1802e06bea94abfe311922a046c94d190
-  data.tar.gz: 5af616852e99ec845cf63daf3eb630f9a6b6e83229f58a763df29f787fc0e940e8b7fd7f928a048687324469c7abbe78e611bca513936de80cf3a2838d2b7d64
+  metadata.gz: c2d04eec97e8cb4370fc0ff93340c7690fef5531de833cc2b258cdaa45c0d65ad0d9119fe1dd791e67f4f07a778ed287a0703716d3a94a42ea3d4614b47beb4b
+  data.tar.gz: 5754628254e35783c0b1a898abbbbef6e2c4c89e0a5ef1da07428bce4c73cf8d536a97dac578aff3e2a999960317cfce0f303f0a8a4f8906da68bca09d09ee9c

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' ? { autocomplete_items: autocomplete_items } : {}
+    end
   end
 end

data/app/views/layouts/metadata_presenter/application.html.erb

@@ -14,8 +14,8 @@
   <link rel="apple-touch-icon" sizes="152x152" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon-152x152.png') %>">
   <link rel="apple-touch-icon" href="<%= asset_pack_url('media/images/govuk-apple-touch-icon.png') %>">
 
-    <%= stylesheet_pack_tag 'govuk' %>
-    <%= stylesheet_link_tag 'application', media: 'all' %>
+    <%= javascript_pack_tag 'runner_application', 'govuk', defer: true %> 
+    <%= stylesheet_pack_tag 'govuk', 'runner_application', media: 'all' %>
 
     <% if allow_analytics? %>
       <%= render template: 'metadata_presenter/analytics/analytics' %>
@@ -30,15 +30,12 @@
     <%= render template: 'metadata_presenter/header/show' %>
     <div class="govuk-width-container govuk-body-m">
       <main class="govuk-main-wrapper govuk-main-wrapper--auto-spacing" id="main-content" role="main">
-      <% if back_link.present? %>
-        <a class="govuk-back-link" href="<%= back_link %>">Back</a>
-      <% end %>
-
+        <% if back_link.present? %>
+          <a class="govuk-back-link" href="<%= back_link %>">Back</a>
+        <% end %>
         <%= yield %>
       </main>
     </div>
     <%= render template: 'metadata_presenter/footer/footer' %>
-    <%= javascript_pack_tag 'runner_application' %>
-    <%= javascript_pack_tag 'govuk' %>
   </body>
 </html>

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

@@ -3,14 +3,19 @@
   component.items,
   :id,
   :name,
+  selected: component.value,
   label: { text: input_title },
   hint:  {
       data: { "fb-default-text" => default_text('hint') },
       text: component.hint
     },
-  class: "govuk-!-width-two-thirds"
+  class: "govuk-!-width-two-thirds fb-autocomplete",
+  options: {
+    include_blank: true
+  }
 %>
 
 <% if editable? %>
   <%= render partial: '/partials/editable_autocomplete', locals: { component: component } %>
 <% 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.12'.freeze
+  VERSION = '2.17.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.12
+  version: 2.17.15
 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