metadata_presenter 3.3.13 → 3.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b7921e476909c4309519d2c7dd96f2e67abcd8ba72410323d0102bc0d135b1
-  data.tar.gz: 2202769033c4b5b8f346de287d83b2b4745a7b5b6b82b69cfb8878a01c739e72
+  metadata.gz: fce1f7719e73302d134f91f03ce4bfbd239e9303d1d2a08bc5594f9b9882585c
+  data.tar.gz: 5c15e0714aaa369a8898ba00d27f0199972bed43dfc6bffb99e6c0e8be35d0e9
 SHA512:
-  metadata.gz: e262046041825252e0b8848c98d6d46313863ad78ed85f541a4a89e04174d0d1921a88bfc0c2d678d29e4b4ce40b22ac7f0733f4e5cd3ae06c6a5e240ce6737a
-  data.tar.gz: ba19606fc7da52f38e7a816942e88bfc752013ded8e639a41b0c7362b11473ec81d6e9f7b256e8ef16d08e8e3e9495ea8d25abfd425a56a0fc8937f8d64c90c8
+  metadata.gz: cfb93f873bdd5cd77e49819a924178b45c2a30e35c8dd6aab829011c058a49ca6a79aa3d94917f136e68c3274fa722b6c9864ee8f5ae759a957f40ac4c6dee95
+  data.tar.gz: 6c68732e6f9cbcac962ce1ef24847d317a041a3b0b48ebacc7589ddd4bfc419770d0fc049dd61427446f82e08d7baa29741538908538f54503afd9a2d21ec7ca

data/app/models/metadata_presenter/component.rb

@@ -1,4 +1,6 @@
 class MetadataPresenter::Component < MetadataPresenter::Metadata
+  include Comparable
+
   VALIDATION_BUNDLES = {
     'date' => 'date',
     'number' => 'number',
@@ -11,6 +13,13 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   # Threshold percentage at which the remaining count is shown
   VALIDATION_STRING_LENGTH_THRESHOLD = 75
 
+  def <=>(other)
+    return nil unless other.is_a?(MetadataPresenter::Component)
+    return 0 unless order
+
+    order <=> other.order
+  end
+
   # 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

data/app/models/metadata_presenter/page.rb

@@ -181,12 +181,12 @@ module MetadataPresenter
     end
 
     def to_components(node_components, collection:)
-      Array(node_components).map do |component|
+      Array(node_components).map { |component|
         MetadataPresenter::Component.new(
           component.merge(collection:),
           editor: editor?
         )
-      end
+      }.sort
     end
 
     def supported_components(page_type)

data/fixtures/version.json

@@ -425,7 +425,8 @@
           "collection": "components",
           "validation": {
             "required": true
-          }
+          },
+          "order": 2
         },
         {
           "_id": "star-wars-knowledge_content_1",
@@ -433,7 +434,8 @@
           "_type": "content",
           "_uuid": "82444d3d-dab6-44c4-a147-e2650326c9eb",
           "content": "Stay on target",
-          "collection": "components"
+          "collection": "components",
+          "order": 1
         },
         {
           "_id": "star-wars-knowledge_radios_1",
@@ -493,7 +495,8 @@
           "collection": "components",
           "validation": {
             "required": true
-          }
+          },
+          "order": 0
         }
       ],
       "add_component": "radios",
@@ -528,7 +531,7 @@
       "heading": "Question",
       "components": [
         {
-          "_id":  "dog-picture_upload_1",
+          "_id": "dog-picture_upload_1",
           "name": "dog-picture_upload_1",
           "_type": "upload",
           "_uuid": "f056a76e-ec3f-47ae-b625-1bba92220ad1",
@@ -594,7 +597,7 @@
       "heading": "Multiupload",
       "components": [
         {
-          "_id":  "dog-picture_upload_2",
+          "_id": "dog-picture_upload_2",
           "name": "dog-picture_upload_2",
           "_type": "multiupload",
           "_uuid": "f056a76e-ec3f-47ae-b625-1bba92220ad2",
@@ -668,10 +671,8 @@
           "name": "countries_autocomplete_1",
           "_type": "autocomplete",
           "_uuid": "4dc23b9c-9757-4526-813d-b43efbe07dad",
-          "items": [
-          ],
-          "errors": {
-          },
+          "items": [],
+          "errors": {},
           "legend": "Countries",
           "validation": {
             "required": true,

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.13'.freeze
+  VERSION = '3.3.14'.freeze
 end

metadata

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