metadata_presenter 1.7.2 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac5fd51e02d3200c324282f394e5d8d3b11e0e440592e627290dfd7b6c767ba
-  data.tar.gz: bced641e349533c820815867b08bfca21f7d8c0bbd619ed19615e424edcaa2a6
+  metadata.gz: 9cd8a230778f6c6613c3929450b98894e27119904bd6c48829f008762b84b625
+  data.tar.gz: e8aecfc6eff1d694b09a44ba753e4777dce8c2f42d4f7de6922d9c2d82dd0aa9
 SHA512:
-  metadata.gz: d38891660bc18dfe3472b43b84efc4a4752be370ba88decb17aad07aa47d779282214602bd52b10db043ad9aec8cc582e2010828deb8916f4b4b40fe069165d7
-  data.tar.gz: 289b34c930dd5c2322d6c32bb22d761c2d2f973e8ae8be7edd5104d3af2f429055ac5edbe76a56b9e78b63e48da5958e551f3e1b66a444eaa02572a41ee3febf
+  metadata.gz: 0fd423f52af55ecc54ff5c59e7c0f2c3a5032b129b51146bfe71f3f9a4e1ed8440984c3b5914fd87297b5c00d1cc71645d618ca49a277f57b05cb4da2f5f4daa
+  data.tar.gz: be951f7baf2331c9e42bdd5f9fbfd1a3adaeb5f3641a2acfb3aab00eb09b77fa5b78908a00f984da8781c6b9fe2997cfa6ef486c5c5bf4c22cb0b79f27259c8d

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -15,10 +15,14 @@ module MetadataPresenter
     def pages_presenters
       PageAnswersPresenter.map(
         view: view_context,
-        pages: service.pages,
+        pages: answered_pages,
         answers: @user_data
       )
     end
     helper_method :pages_presenters
+
+    def answered_pages
+      TraversedPages.new(service, load_user_data, @page).all
+    end
   end
 end

data/app/models/metadata_presenter/flow.rb

@@ -1,7 +1,7 @@
 module MetadataPresenter
   class Flow < MetadataPresenter::Metadata
     def branch?
-      type == 'branch'
+      type == 'flow.branch'
     end
 
     def default_next

data/app/models/metadata_presenter/next_page.rb

@@ -49,11 +49,11 @@ module MetadataPresenter
     end
 
     def current_page_flow
-      service.flow(current_page_uuid)
+      service.flow_object(current_page_uuid)
     end
 
     def next_flow
-      service.flow(current_page_flow.default_next)
+      service.flow_object(current_page_flow.default_next)
     end
 
     def next_flow_branch_object?

data/app/models/metadata_presenter/page.rb

@@ -9,7 +9,6 @@ module MetadataPresenter
       _uuid
       _id
       _type
-      steps
       add_component
       add_extra_component
     ].freeze

data/app/models/metadata_presenter/previous_page.rb

@@ -7,7 +7,7 @@ module MetadataPresenter
       # what happens when a user enters in the middle of the flow
       return if no_current_or_referrer_pages? || service.no_back_link?(current_page)
 
-      if flow.present?
+      if service.flow.present?
         return referrer_page if return_to_referrer?
 
         TraversedPages.new(service, user_data, current_page).last
@@ -16,10 +16,6 @@ module MetadataPresenter
       end
     end
 
-    def flow
-      service.metadata['flow']
-    end
-
     private
 
     def referrer_page

data/app/models/metadata_presenter/service.rb

@@ -5,8 +5,8 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
-  def flow(page_uuid)
-    MetadataPresenter::Flow.new(metadata.flow[page_uuid])
+  def flow_object(uuid)
+    MetadataPresenter::Flow.new(metadata.flow[uuid])
   rescue StandardError
     nil
   end

data/app/models/metadata_presenter/traversed_pages.rb

@@ -12,12 +12,14 @@ module MetadataPresenter
     delegate :last, to: :all
 
     def all
+      return latest_pages if service.flow.blank?
+
       page_uuid = service.start_page.uuid
 
-      service.metadata['flow'].size.times do
+      service.flow.size.times do
         break if page_uuid == current_page.uuid
 
-        flow_object = service.flow(page_uuid)
+        flow_object = service.flow_object(page_uuid)
 
         if flow_object.branch?
           page = EvaluateConditions.new(
@@ -36,5 +38,11 @@ module MetadataPresenter
 
       @pages
     end
+
+    def latest_pages
+      index = service.pages.index(current_page).to_i - 1
+
+      service.pages[0..index]
+    end
   end
 end

data/config/initializers/default_metadata.rb

@@ -6,8 +6,11 @@ Rails.logger.info('Loading default metadata')
 default_metadata = Dir.glob("#{Rails.application.config.default_metadata_directory}/*/**")
 default_metadata.each do |metadata_file|
   metadata = JSON.parse(File.read(metadata_file))
-  Rails.logger.info(metadata['_id'])
-  Rails.application.config.default_metadata[metadata['_id']] = metadata
+
+  key = metadata['_id'] || metadata['_type']
+  Rails.logger.info(key)
+
+  Rails.application.config.default_metadata[key] = metadata
 end
 
 Rails.logger.info(

data/default_metadata/flow/branch.json

@@ -0,0 +1,7 @@
+{
+  "_type": "flow.branch",
+  "next": {
+    "default": "",
+    "conditions": []
+  }
+}

data/default_metadata/flow/condition.json

@@ -0,0 +1,5 @@
+{
+  "condition_type": "",
+  "next": "",
+  "criterias": []
+}

data/default_metadata/flow/criteria.json

@@ -0,0 +1,6 @@
+{
+  "operator": "",
+  "page": "",
+  "component": "",
+  "field": ""
+}

data/default_metadata/flow/page.json

@@ -0,0 +1,6 @@
+{
+  "_type": "flow.page",
+  "next": {
+    "default": ""
+  }
+}

data/default_metadata/page/start.json

@@ -5,6 +5,5 @@
   "lede": "",
   "body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
   "before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally.",
-  "steps": [],
   "url": "/"
 }

data/default_metadata/service/base.json

@@ -3,6 +3,7 @@
   "_type": "service.base",
   "service_name": "Service name",
   "configuration": {},
+  "flow": {},
   "pages": [],
   "standalone_pages": [],
   "locale": "en"

data/fixtures/branching.json

@@ -3,25 +3,25 @@
   "_type": "service.base",
   "flow": {
     "cf6dc32f-502c-4215-8c27-1151a45735bb": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73"
       }
     },
     "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "68fbb180-9a2a-48f6-9da6-545e28b8d35a"
       }
     },
     "68fbb180-9a2a-48f6-9da6-545e28b8d35a": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "09e91fd9-7a46-4840-adbc-244d545cfef7"
       }
     },
     "09e91fd9-7a46-4840-adbc-244d545cfef7": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "0b297048-aa4d-49b6-ac74-18e069118185",
         "conditions": [
@@ -41,19 +41,19 @@
       }
     },
     "e8708909-922e-4eaf-87a5-096f7a713fcb": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "0b297048-aa4d-49b6-ac74-18e069118185"
       }
     },
     "0b297048-aa4d-49b6-ac74-18e069118185": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "ffadeb22-063b-4e4f-9502-bd753c706b1d"
       }
     },
     "ffadeb22-063b-4e4f-9502-bd753c706b1d": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "05c3306c-0a39-42d2-9e0f-93fd49248f4e",
         "conditions": [
@@ -85,25 +85,25 @@
       }
     },
     "d4342dfd-0d09-4a91-a0ea-d7fd67e706cc": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "05c3306c-0a39-42d2-9e0f-93fd49248f4e"
       }
     },
     "91e9f7c6-2f75-4b7d-9eb5-0cf352f7be66": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "05c3306c-0a39-42d2-9e0f-93fd49248f4e"
       }
     },
     "05c3306c-0a39-42d2-9e0f-93fd49248f4e": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "1d02e508-5953-4eca-af2f-9d67511c8648"
       }
     },
     "1d02e508-5953-4eca-af2f-9d67511c8648": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4",
         "conditions": [
@@ -123,19 +123,19 @@
       }
     },
     "8002df6e-29ab-4cdf-b520-1d7bb931a28f": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "ef2cafe3-37e2-4533-9b0c-09a970cd38d4"
       }
     },
     "ef2cafe3-37e2-4533-9b0c-09a970cd38d4": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "cf8b3e18-dacf-4e91-92e1-018035961003"
       }
     },
     "cf8b3e18-dacf-4e91-92e1-018035961003": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b",
         "conditions": [
@@ -155,19 +155,19 @@
       }
     },
     "b5efc09c-ece7-45ae-b0b3-8a7905e25040": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b"
       }
     },
     "0c022e95-0748-4dda-8ba5-12fd1d2f596b": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "618b7537-b42b-4551-ae7d-053afa4d9ca9"
       }
     },
     "618b7537-b42b-4551-ae7d-053afa4d9ca9": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "dc7454f9-4186-48d7-b055-684d57bbcdc7",
         "conditions": [
@@ -199,25 +199,25 @@
       }
     },
     "bc666714-c0a2-4674-afe5-faff2e20d847": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "dc7454f9-4186-48d7-b055-684d57bbcdc7"
       }
     },
     "e2887f44-5e8d-4dc0-b1de-496ab6039430": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "dc7454f9-4186-48d7-b055-684d57bbcdc7"
       }
     },
     "dc7454f9-4186-48d7-b055-684d57bbcdc7": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "84a347fc-8d4b-486a-9996-6a86fa9544c5"
       }
     },
     "84a347fc-8d4b-486a-9996-6a86fa9544c5": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb",
         "conditions": [
@@ -261,25 +261,25 @@
       }
     },
     "2cc66e51-2c14-4023-86bf-ded49887cdb2": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb"
       }
     },
     "f6c51f88-7be8-4cb7-bbfc-6c905727a051": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "48357db5-7c06-4e85-94b1-5e1c9d8f39eb"
       }
     },
     "48357db5-7c06-4e85-94b1-5e1c9d8f39eb": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "1079b5b8-abd0-4bf6-aaac-1f01e69e3b39"
       }
     },
     "1079b5b8-abd0-4bf6-aaac-1f01e69e3b39": {
-      "_type": "branch",
+      "_type": "flow.branch",
       "next": {
         "default": "941137d7-a1da-43fd-994a-98a4f9ea6d46",
         "conditions": [
@@ -329,31 +329,31 @@
       }
     },
     "941137d7-a1da-43fd-994a-98a4f9ea6d46": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "e337070b-f636-49a3-a65c-f506675265f0"
       }
     },
     "56e80942-d0a4-405a-85cd-bd1b100013d6": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "e337070b-f636-49a3-a65c-f506675265f0"
       }
     },
     "6324cca4-7770-4765-89b9-1cdc41f49c8b": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "e337070b-f636-49a3-a65c-f506675265f0"
       }
     },
     "e337070b-f636-49a3-a65c-f506675265f0": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": "778e364b-9a7f-4829-8eb2-510e08f156a3"
       }
     },
     "778e364b-9a7f-4829-8eb2-510e08f156a3": {
-      "_type": "page",
+      "_type": "flow.page",
       "next": {
         "default": ""
       }
@@ -367,13 +367,6 @@
       "lede": "",
       "_type": "page.start",
       "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
-      "steps": [
-        "page.name",
-        "page.do-you-like-star-wars",
-        "page.star-wars-knowledge",
-        "page.check-answers",
-        "page.confirmation"
-      ],
       "heading": "Service name goes here",
       "before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally."
     },

data/fixtures/no_flow_service.json

@@ -0,0 +1,190 @@
+{
+  "_id": "service.base",
+  "_type": "service.base",
+  "pages": [
+    {
+      "_id": "page.start",
+      "url": "/",
+      "body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
+      "lede": "",
+      "_type": "page.start",
+      "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
+      "steps": [
+        "page.name",
+        "page.email-address",
+        "page.parent-name",
+        "page.check-answers",
+        "page.confirmation"
+      ],
+      "heading": "Service name goes here",
+      "before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally."
+    },
+    {
+      "_id": "page.name",
+      "url": "name",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "name_text_1",
+          "hint": "",
+          "name": "name_text_1",
+          "_type": "text",
+          "_uuid": "27d377a2-6828-44ca-87d1-b83ddac98284",
+          "label": "Full name",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "max_length": 10,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.email-address",
+      "url": "email-address",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "df1ba645-f748-46d0-ad75-f34112653e37",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "email-address_text_1",
+          "hint": "",
+          "name": "email-address_text_1",
+          "_type": "text",
+          "_uuid": "f27e5788-e784-4bfd-8b21-2fab8ce95abb",
+          "label": "Email address",
+          "errors": {
+            "format": {},
+            "required": {
+              "any": "Enter an email address"
+            },
+            "max_length": {
+              "any": "%{control} is too long."
+            },
+            "min_length": {
+              "any": "%{control} is too short."
+            }
+          },
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "max_length": 30,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.parent-name",
+      "url": "parent-name",
+      "body": "Body section",
+      "lede": "",
+      "_type": "page.singlequestion",
+      "_uuid": "4b8c6bf3-878a-4446-9198-48351b3e2185",
+      "heading": "Question",
+      "components": [
+        {
+          "_id": "parent-name_text_1",
+          "hint": "",
+          "name": "parent-name_text_1",
+          "_type": "text",
+          "_uuid": "5ad372fa-ed35-477f-b471-4d444f991210",
+          "label": "Parent name",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": false,
+            "max_length": 10,
+            "min_length": 2
+          }
+        }
+      ]
+    },
+    {
+      "_id": "page.check-answers",
+      "url": "check-answers",
+      "_type": "page.checkanswers",
+      "_uuid": "e337070b-f636-49a3-a65c-f506675265f0",
+      "heading": "Check your answers",
+      "send_body": "By submitting this application you confirm that, to the best of your knowledge, the details you are providing are correct.",
+      "components": [
+        {
+          "_id": "check-answers_content_2",
+          "name": "check-answers_content_2",
+          "_type": "content",
+          "_uuid": "b065ff4f-90c5-4ba2-b4ac-c984a9dd2470",
+          "content": "Take the cannoli.",
+          "collection": "components"
+        }
+      ],
+      "send_heading": "Now send your application",
+      "add_component": "content",
+      "extra_components": [
+        {
+          "_id": "check-answers_content_1",
+          "name": "check-answers_content_1",
+          "_type": "content",
+          "_uuid": "3e6ef27e-91a6-402f-8291-b7ce669e824e",
+          "content": "Check yourself before you wreck yourself.",
+          "collection": "extra_components"
+        }
+      ],
+      "add_extra_component": "content"
+    },
+    {
+      "_id": "page.confirmation",
+      "url": "confirmation",
+      "body": "Some day I will be the most powerful Jedi ever!",
+      "lede": "",
+      "_type": "page.confirmation",
+      "_uuid": "778e364b-9a7f-4829-8eb2-510e08f156a3",
+      "heading": "Complaint sent",
+      "components": []
+    }
+  ],
+  "locale": "en",
+  "created_at": "2021-04-21T13:10:19Z",
+  "created_by": "099d5bf5-5f7b-444c-86ee-9e189cc1a369",
+  "service_id": "488edccd-8411-4ffb-a38b-6a96c6ac28d6",
+  "version_id": "27dc30c9-f7b8-4dec-973a-bd153f6797df",
+  "service_name": "No Flow Service Fixture",
+  "configuration": {
+    "meta": {
+      "_id": "config.meta",
+      "_type": "config.meta",
+      "items": [
+        {
+          "_id": "config.meta--link",
+          "href": "cookies",
+          "text": "Cookies",
+          "_type": "link"
+        },
+        {
+          "_id": "config.meta--link--2",
+          "href": "privacy",
+          "text": "Privacy",
+          "_type": "link"
+        },
+        {
+          "_id": "config.meta--link--3",
+          "href": "accessibility",
+          "text": "Accessibility",
+          "_type": "link"
+        }
+      ]
+    },
+    "service": {
+      "_id": "config.service",
+      "_type": "config.service"
+    }
+  },
+  "standalone_pages": []
+}