metadata_presenter 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 984ce62e691c47847bd4bbc36332690f442bcf7db3a65520e79137c04b03b35a
-  data.tar.gz: e028e1d6285c37403ba079089151d0187f8abc5adc25ec4033995b21b2dc54cc
+  metadata.gz: ec8517c93b646b82f9084516869dd500189ee28718b67cbf15f681e71b3ae83f
+  data.tar.gz: 31476c840217b5fa8bceb6ccd1e3e008e33784a3fb5506018192e54901e0330a
 SHA512:
-  metadata.gz: 9663825f4e18f2f465739f2c2fc72fafdbb9b1d9c91b990c7778054335ad577ea87ea6205a404e229d73ebaf3e4105e1c1c1afd11543832bc4b81c23430c8735
-  data.tar.gz: 04e04bdc47ebd8aca8ae538d5ff9d32eeb2c1c00fc5569d7a5b88fa7343575b9cccbb57a12a8ed0acbdee9c3bc9f5a63aee97a1a7bc51c996c782aeee4eea0f7
+  metadata.gz: 4bace053abc5af0fc2ba23a7d64348a2bc23aefed4df1e834138988138d6c24fb04ffd552a594537794e76b35308d98e5bf75efed844d99266fc88f0d3b0a861
+  data.tar.gz: aa40d60598b4217c2a0296e61ec5500d1b6df03037783c63de58415d18c1a1819866978e275518fb4e794676f643f1a7b9525c6f3c5e9319a37a66cfc70cfc15

data/app/models/metadata_presenter/next_page.rb

@@ -8,10 +8,8 @@ module MetadataPresenter
 
       if conditionals?
         evaluate_conditionals
-      elsif current_page_flow.present?
-        service.find_page_by_uuid(current_page_flow.default_next)
       else
-        service.next_page(from: current_page_url)
+        service.find_page_by_uuid(current_page_flow.default_next)
       end
     end
 

data/app/models/metadata_presenter/page.rb

@@ -12,6 +12,7 @@ module MetadataPresenter
       add_component
       add_extra_component
     ].freeze
+    QUESTION_PAGES = %w[page.singlequestion page.multiplequestions].freeze
 
     def editable_attributes
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
@@ -33,11 +34,19 @@ module MetadataPresenter
       to_components(metadata.extra_components, collection: :extra_components)
     end
 
-    def components_by_type(type)
-      supported_components = page_components(raw_type)[type]
+    def input_components
+      all_components.reject(&:content?)
+    end
+
+    def content_components
+      all_components.select(&:content?)
+    end
+
+    def supported_components_by_type(type)
+      supported = supported_components(raw_type)[type]
 
       all_components.select do |component|
-        supported_components.include?(component.type)
+        supported.include?(component.type)
       end
     end
 
@@ -49,12 +58,12 @@ module MetadataPresenter
       "metadata_presenter/#{type.gsub('.', '/')}"
     end
 
-    def input_components
-      page_components(raw_type)[:input]
+    def supported_input_components
+      supported_components(raw_type)[:input]
     end
 
-    def content_components
-      page_components(raw_type)[:content]
+    def supported_content_components
+      supported_components(raw_type)[:content]
     end
 
     def upload_components
@@ -65,6 +74,10 @@ module MetadataPresenter
       type == 'page.standalone'
     end
 
+    def question_page?
+      type.in?(QUESTION_PAGES)
+    end
+
     def title
       return heading if heading?
 
@@ -87,10 +100,10 @@ module MetadataPresenter
       end
     end
 
-    def page_components(page_type)
-      values = Rails.application.config.page_components[page_type]
+    def supported_components(page_type)
+      values = Rails.application.config.supported_components[page_type]
       if values.blank?
-        raise PageComponentsNotDefinedError, "No page components defined for #{page_type} in config initialiser"
+        raise PageComponentsNotDefinedError, "No supported components defined for #{page_type} in config initialiser"
       end
 
       values

data/app/models/metadata_presenter/previous_page.rb

@@ -4,29 +4,13 @@ module MetadataPresenter
     attr_accessor :service, :user_data, :current_page, :referrer
 
     def page
-      # 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 service.flow.present?
-        return referrer_page if return_to_referrer?
-
-        TraversedPages.new(service, user_data, current_page).last
-      else
-        service.previous_page(current_page: current_page, referrer: referrer)
-      end
+      TraversedPages.new(service, user_data, current_page).last
     end
 
     private
 
-    def referrer_page
-      @referrer_page ||= service.find_page_by_url(URI(referrer).path)
-    end
-
-    def return_to_referrer?
-      current_page.standalone? ||
-        (referrer_page && referrer_page.standalone?)
-    end
-
     def no_current_or_referrer_pages?
       current_page.blank? || referrer.nil?
     end

data/app/models/metadata_presenter/service.rb

@@ -38,14 +38,6 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     pages[pages.index(current_page) + 1] if current_page.present?
   end
 
-  def previous_page(current_page:, referrer:)
-    return if current_page.nil? || referrer.nil?
-
-    unless no_back_link?(current_page)
-      flow_page(current_page) || referrer_page(referrer)
-    end
-  end
-
   def confirmation_page
     @confirmation_page ||= pages.find do |page|
       page.type == 'page.confirmation'
@@ -57,7 +49,15 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def no_back_link?(current_page)
-    current_page == start_page || current_page == confirmation_page
+    current_page == start_page ||
+      current_page == confirmation_page ||
+      current_page.standalone?
+  end
+
+  def page_with_component(uuid)
+    pages.find do |page|
+      Array(page.components).any? { |component| component.uuid == uuid }
+    end
   end
 
   private

data/app/models/metadata_presenter/traversed_pages.rb

@@ -12,8 +12,6 @@ module MetadataPresenter
     delegate :last, to: :all
 
     def all
-      return latest_pages if service.flow.blank?
-
       page_uuid = service.start_page.uuid
 
       service.flow.size.times do

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -10,7 +10,7 @@ module MetadataPresenter
 
     def self.map(view:, pages:, answers:)
       user_input_pages(pages).map { |page|
-        Array(page.components_by_type(:input)).map do |component|
+        Array(page.supported_components_by_type(:input)).map do |component|
           new(
             view: view,
             component: component,

data/app/views/metadata_presenter/page/checkanswers.html.erb

@@ -16,8 +16,8 @@
                    components: @page.extra_components,
                    tag: nil,
                    classes: nil,
-                   input_components: @page.input_components,
-                   content_components: @page.content_components
+                   input_components: @page.supported_input_components,
+                   content_components: @page.supported_content_components
                  } %>
 
         <dl class="fb-block fb-block-answers govuk-summary-list">
@@ -80,8 +80,8 @@
                    components: @page.components,
                    tag: nil,
                    classes: nil,
-                   input_components: @page.input_components,
-                   content_components: @page.content_components
+                   input_components: @page.supported_input_components,
+                   content_components: @page.supported_content_components
                  } %>
 
         <button <%= 'disabled' if editable? %> data-prevent-double-click="true" class="fb-block fb-block-actions govuk-button" data-module="govuk-button" data-block-id="actions" data-block-type="actions">

data/app/views/metadata_presenter/page/confirmation.html.erb

@@ -29,7 +29,7 @@
              components: @page.components,
              tag: nil,
              classes: nil,
-             input_components: @page.input_components,
-             content_components: @page.content_components
+             input_components: @page.supported_input_components,
+             content_components: @page.supported_content_components
            } %>
 </div>

data/app/views/metadata_presenter/page/content.html.erb

@@ -21,8 +21,8 @@
                      components: @page.components,
                      tag: nil,
                      classes: nil,
-                     input_components: @page.input_components,
-                     content_components: @page.content_components
+                     input_components: @page.supported_input_components,
+                     content_components: @page.supported_content_components
                    } %>
 
         <%= f.govuk_submit(disabled: editable?) %>

data/app/views/metadata_presenter/page/multiplequestions.html.erb

@@ -13,8 +13,8 @@
             components: @page.components,
             tag: :h2,
             classes: 'govuk-heading-m govuk-!-margin-top-8',
-            input_components: @page.input_components,
-            content_components: @page.content_components
+            input_components: @page.supported_input_components,
+            content_components: @page.supported_content_components
           }
         %>
 

data/config/initializers/{page_components.rb → supported_components.rb}

@@ -1,4 +1,4 @@
-Rails.application.config.page_components =
+Rails.application.config.supported_components =
   ActiveSupport::HashWithIndifferentAccess.new({
     checkanswers: {
       input: %w(),

data/fixtures/invalid_content_page.json

@@ -33,6 +33,20 @@
       ]
     }
   },
+  "flow": {
+    "9626b2e9-5ef0-4070-8331-ac55151b22c4": {
+      "_type": "flow.page",
+      "next": {
+        "default": "1ed3e4ad-5098-41c9-b4b6-426e89f7804e"
+      }
+    },
+    "1ed3e4ad-5098-41c9-b4b6-426e89f7804e": {
+      "_type": "flow.page",
+      "next": {
+        "default": ""
+      }
+    }
+  },
   "pages": [
     {
       "_uuid": "9626b2e9-5ef0-4070-8331-ac55151b22c4",
@@ -42,7 +56,6 @@
       "lede": "Use this service to:",
       "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/fixtures/no_component_page.json

@@ -33,6 +33,20 @@
       ]
     }
   },
+  "flow": {
+    "9626b2e9-5ef0-4070-8331-ac55151b22c4": {
+      "_type": "flow.page",
+      "next": {
+        "default": "1ed3e4ad-5098-41c9-b4b6-426e89f7804e"
+      }
+    },
+    "b238a22f-c180-48d0-a7d9-8aad2036f1f2": {
+      "_type": "flow.page",
+      "next": {
+        "default": ""
+      }
+    }
+  },
   "pages": [
     {
       "_uuid": "9626b2e9-5ef0-4070-8331-ac55151b22c4",
@@ -42,7 +56,6 @@
       "lede": "Use this service to:",
       "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/fixtures/non_finished_service.json

@@ -34,23 +34,46 @@
       ]
     }
   },
+  "flow": {
+    "cf6dc32f-502c-4215-8c27-1151a45735bb": {
+      "_type": "flow.page",
+      "next": {
+        "default": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73"
+      }
+    },
+    "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
+      "_type": "flow.page",
+      "next": {
+        "default": "68fbb180-9a2a-48f6-9da6-545e28b8d35a"
+      }
+    },
+    "68fbb180-9a2a-48f6-9da6-545e28b8d35a": {
+      "_type": "flow.page",
+      "next": {
+        "default": "09e91fd9-7a46-4840-adbc-244d545cfef7"
+      }
+    },
+    "09e91fd9-7a46-4840-adbc-244d545cfef7": {
+      "_type": "flow.page",
+      "next": {
+        "default": ""
+      }
+    }
+  },
   "pages": [
     {
       "_id": "page.start",
       "_type": "page.start",
+      "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
       "heading": "Service name goes here",
       "lede": "This is your start page first paragraph. You can only have one paragraph here.",
       "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.",
-      "steps": [
-        "page.name",
-        "page.email-address",
-        "page.parent_name"
-      ],
       "url": "/"
     },
     {
       "_id": "page.name",
       "_type": "page.singlequestion",
+      "_uuid": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73",
       "components": [
         {
           "_id": "page.name--text.auto_name__1",
@@ -70,6 +93,7 @@
     {
       "_id": "page.email-address",
       "_type": "page.singlequestion",
+      "_uuid": "68fbb180-9a2a-48f6-9da6-545e28b8d35a",
       "heading": "Email address",
       "components": [
         {
@@ -101,6 +125,7 @@
     {
       "_id": "page.parent_name",
       "_type": "page.singlequestion",
+      "_uuid": "09e91fd9-7a46-4840-adbc-244d545cfef7",
       "components": [
         {
           "_id": "page.parent-name--text.auto_name__3",

data/fixtures/service.json

@@ -1,6 +1,14 @@
 {
   "_id": "service.base",
   "_type": "service.base",
+  "flow": {
+    "86ed04ac-1727-4172-8dd2-608009f1a656": {
+      "_type": "flow.page",
+      "next": {
+        "default": ""
+      }
+    }
+  },
   "pages": [
     {
       "_id": "page.start",
@@ -9,7 +17,6 @@
       "lede": "",
       "_type": "page.start",
       "_uuid": "86ed04ac-1727-4172-8dd2-608009f1a656",
-      "steps": [],
       "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/version.json

@@ -1,6 +1,92 @@
 {
   "_id": "service.base",
   "_type": "service.base",
+  "flow": {
+    "cf6dc32f-502c-4215-8c27-1151a45735bb": {
+      "_type": "flow.page",
+      "next": {
+        "default": "9e1ba77f-f1e5-42f4-b090-437aa9af7f73"
+      }
+    },
+    "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
+      "_type": "flow.page",
+      "next": {
+        "default": "df1ba645-f748-46d0-ad75-f34112653e37"
+      }
+    },
+    "df1ba645-f748-46d0-ad75-f34112653e37": {
+      "_type": "flow.page",
+      "next": {
+        "default": "4b8c6bf3-878a-4446-9198-48351b3e2185"
+      }
+    },
+    "4b8c6bf3-878a-4446-9198-48351b3e2185": {
+      "_type": "flow.page",
+      "next": {
+        "default": "54ccc6cd-60c0-4749-947b-a97af1bc0aa2"
+      }
+    },
+    "54ccc6cd-60c0-4749-947b-a97af1bc0aa2": {
+      "_type": "flow.page",
+      "next": {
+        "default": "b8335af2-6642-4e2f-8192-0dd12279eec7"
+      }
+    },
+    "b8335af2-6642-4e2f-8192-0dd12279eec7": {
+      "_type": "flow.page",
+      "next": {
+        "default": "68fbb180-9a2a-48f6-9da6-545e28b8d35a"
+      }
+    },
+    "68fbb180-9a2a-48f6-9da6-545e28b8d35a": {
+      "_type": "flow.page",
+      "next": {
+        "default": "7806cd64-0c05-450e-ba6f-2325c8b22d46"
+      }
+    },
+    "7806cd64-0c05-450e-ba6f-2325c8b22d46": {
+      "_type": "flow.page",
+      "next": {
+        "default": "0c022e95-0748-4dda-8ba5-12fd1d2f596b"
+      }
+    },
+    "0c022e95-0748-4dda-8ba5-12fd1d2f596b": {
+      "_type": "flow.page",
+      "next": {
+        "default": "e8708909-922e-4eaf-87a5-096f7a713fcb"
+      }
+    },
+    "e8708909-922e-4eaf-87a5-096f7a713fcb": {
+      "_type": "flow.page",
+      "next": {
+        "default": "80420693-d6f2-4fce-a860-777ca774a6f5"
+      }
+    },
+    "80420693-d6f2-4fce-a860-777ca774a6f5": {
+      "_type": "flow.page",
+      "next": {
+        "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd66"
+      }
+    },
+    "2ef7d11e-0307-49e9-9fe2-345dc528dd66": {
+      "_type": "flow.page",
+      "next": {
+        "default": "e337070b-f636-49a3-a65c-f506675265f0"
+      }
+    },
+    "e337070b-f636-49a3-a65c-f506675265f0": {
+      "_type": "flow.page",
+      "next": {
+        "default": "778e364b-9a7f-4829-8eb2-510e08f156a3"
+      }
+    },
+    "778e364b-9a7f-4829-8eb2-510e08f156a3": {
+      "_type": "flow.page",
+      "next": {
+        "default": ""
+      }
+    }
+  },
   "pages": [
     {
       "_id": "page.start",
@@ -9,21 +95,6 @@
       "lede": "",
       "_type": "page.start",
       "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
-      "steps": [
-        "page.name",
-        "page.email-address",
-        "page.parent-name",
-        "page.your-age",
-        "page.family-hobbies",
-        "page.do-you-like-star-wars",
-        "page.holiday",
-        "page.burgers",
-        "page.star-wars-knowledge",
-        "page.how-many-lights",
-        "page.dog-picture",
-        "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."
     },