metadata_presenter 2.17.11 → 2.17.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c0fc8809f2ded3ff926abae242977d1e502bb49f2dfecc64c91c8fd43e3ca8d
-  data.tar.gz: afaf9751bf92bfccdfb9b5ca8362b179b6999acab4efb1e098f51873ef15149e
+  metadata.gz: 83d44483b1324f5bd4feb59767282ae2356c985bfd7afc50be63335dd1c57dbe
+  data.tar.gz: 64dd7c4d4cd9c2815e1fada71c2780f60203b2530b305b0edd82a85833cf5f0b
 SHA512:
-  metadata.gz: e738295503ef40d85ea5129be00bd0896e8f0b7273a27bce1f8203a3b12e7d2e4f50cc5d214f9503c308aa0d3033bbe69f31499b5584da64725ea90b77066fc9
-  data.tar.gz: 0c4d1f59c8809212399ea14d8446dff1088d26446463a3eabf9ba6c0435df16c4a05901f2d66c5fde4ae969d16a0149b6b71505fda987bad2b4f13529a4bcaf7
+  metadata.gz: 6da916e33426cfbd2868b09aa0a92c16a78fbee45cf33016a24844686dfc82a8dc076c80538c2e5ab723e9448fd5a0a1802e06bea94abfe311922a046c94d190
+  data.tar.gz: 5af616852e99ec845cf63daf3eb630f9a6b6e83229f58a763df29f787fc0e940e8b7fd7f928a048687324469c7abbe78e611bca513936de80cf3a2838d2b7d64

data/app/models/metadata_presenter/autocomplete_item.rb

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

data/app/models/metadata_presenter/component.rb

@@ -10,6 +10,17 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   # Threshold percentage at which the remaining count is shown
   VALIDATION_STRING_LENGTH_THRESHOLD = 75
 
+  # Overriding here because autocomplete component's items property is non interactable
+  # in the Editor therefore it does not need to exist in the data-fb-content-data
+  # attribute on the page. The data-fb-content-data attribute is what is used to
+  # update user interactable elements such as the component question or page section
+  # heading etc.
+  def to_json(*_args)
+    return super unless autocomplete?
+
+    JSON.parse(super).to_json(except: 'items')
+  end
+
   def to_partial_path
     "metadata_presenter/component/#{type}"
   end
@@ -25,7 +36,7 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   end
 
   def item_klass
-    type == 'autocomplete' ? MetadataPresenter::AutocompleteItem : MetadataPresenter::Item
+    autocomplete? ? MetadataPresenter::AutocompleteItem : MetadataPresenter::Item
   end
 
   SUPPORTS_BRANCHING = %w[radios checkboxes].freeze
@@ -34,6 +45,10 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
     type.in?(SUPPORTS_BRANCHING)
   end
 
+  def autocomplete?
+    type == 'autocomplete'
+  end
+
   def content?
     type == 'content'
   end

data/app/models/metadata_presenter/page.rb

@@ -106,7 +106,7 @@ module MetadataPresenter
     end
 
     def autocomplete_component_present?
-      components.any? { |component| component.type == 'autocomplete' }
+      components.any?(&:autocomplete?)
     end
 
     def assign_autocomplete_items(items)

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -83,5 +83,9 @@ module MetadataPresenter
     def upload(file_hash)
       file_hash['original_filename']
     end
+
+    def autocomplete(value)
+      JSON.parse(value)['text']
+    end
   end
 end

data/fixtures/countries.json

@@ -0,0 +1,7 @@
+{
+  "4dc23b9c-9757-4526-813d-b43efbe07dad": [
+    { "text": "Afghanistan", "value": "AF"},
+    { "text": "Albania", "value": "AL"},
+    { "text": "Australia", "value": "AU"}
+  ]
+}

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.17.11'.freeze
+  VERSION = '2.17.12'.freeze
 end

data/schemas/component/autocomplete.json

@@ -4,14 +4,12 @@
   "title": "Autocomplete",
   "description": "Let users select one option from an auto-completing list",
   "type": "object",
-  "allOf": [
-    {
-      "$ref": "definition.select"
-    }
-  ],
   "properties": {
     "_type": {
       "const": "autocomplete"
+    },
+    "items": {
+      "$ref": "definition.select"
     }
   }
 }

data/schemas/definition/select.json

@@ -2,15 +2,9 @@
   "$id": "http://gov.uk/schema/v1.0.0/definition/select",
   "_name": "definition.select",
   "title": "Select component definition",
-  "properties": {
-    "items": {
-      "title": "Items",
-      "description": "Items that users can select",
-      "type": "array",
-      "items": {
-        "$ref": "definition.select_item"
-      }
-    }
+  "type": "array",
+  "items": {
+    "$ref": "definition.select_item"
   },
   "required": [
     "items"

data/schemas/definition/select_item.json

@@ -17,12 +17,8 @@
       "type": "string"
     }
   },
-  "allOf": [
-    {
-      "$ref": "definition.component"
-    }
-  ],
   "required": [
+    "text",
     "value"
   ],
   "category": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.17.11
+  version: 2.17.12
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -435,6 +435,7 @@ files:
 - fixtures/branching_8.png
 - fixtures/branching_9.json
 - fixtures/branching_9.png
+- fixtures/countries.json
 - fixtures/exit_only_service.json
 - fixtures/invalid_content_page.json
 - fixtures/no_component_page.json