metadata_presenter 2.12.1 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a349beb4173c1f6361b321a95e36a407c5f5361153403cae2fbd15ffb7b8840
-  data.tar.gz: 8e06745f55b04f1074a5da27b77e4f9cb720b95bfb328672c14cca059e4a3003
+  metadata.gz: 92db6bbc2b6ecefe9836a96c3014b94cc43c48a2fb4e82152f71bea00d6b3bc4
+  data.tar.gz: f9a2d946f0bf343f4a20f943f2aed35d3fce8ddbc42cf28997b10f10bfa3f9ba
 SHA512:
-  metadata.gz: 01f7f93e1b0d7a058ff856cb27ce07ec816b060e2b2299cec55be298aa046809a9e9ba82f9f770205b4fe647a8d3e046e1a0b10afad0a78fc5190e52aa28fc5f
-  data.tar.gz: 5cb518f2fb78f26ae06d447d0d1a7a7f2b84de9b4f24057079464bdcd77945c36430c4718c49d1bc2a04ec48ab1cfb422fbfc02c952a516ca83d7cae3e29a2ff
+  metadata.gz: 4b94a4afee1f43a692360645775bb5555c3c722f93a5c1f2c0cb865af90e43448d5eb1bab458eb022c49d76a39348497f2946ca925afdf11fd8ed5f8749ef0f4
+  data.tar.gz: 10ad22eada3869215e8d7ef9e00dc578468d142b7c3d151c9ba8590ad001101570e317f1b7b1f2dd5343572608ba4e1464383f8c57acbb317aa160cd2ab85157

data/app/models/metadata_presenter/grid.rb

@@ -11,6 +11,12 @@ module MetadataPresenter
     end
   end
 
+  class Warning < OpenStruct
+    def type
+      'flow.warning'
+    end
+  end
+
   class Grid
     include BranchDestinations
     attr_reader :start_from
@@ -37,13 +43,14 @@ module MetadataPresenter
       insert_expression_spacers
       trim_pointers unless main_flow.empty?
       trim_spacers
+      insert_warning if main_flow.empty?
 
       @ordered = @ordered.reject(&:empty?)
     end
 
     def ordered_flow
       @ordered_flow ||=
-        build.flatten.reject { |obj| obj.is_a?(MetadataPresenter::Spacer) }
+        build.flatten.reject { |obj| obj.is_a?(MetadataPresenter::Spacer) || obj.is_a?(MetadataPresenter::Warning) }
     end
 
     def ordered_pages
@@ -263,6 +270,51 @@ module MetadataPresenter
       @ordered[column].insert(row, MetadataPresenter::Spacer.new)
     end
 
+    # Include a warning if a service does not have a CYA or Confirmation page in the
+    # main flow. The warning should always be in the first row, last column.
+    def insert_warning
+      if cya_and_confirmation_pages_not_in_service? ||
+          cya_and_confirmation_pages_detached?
+        @ordered.append([MetadataPresenter::Warning.new])
+      end
+    end
+
+    def cya_and_confirmation_pages_not_in_service?
+      (checkanswers_not_in_service? && confirmation_not_in_service?) ||
+        checkanswers_not_in_service? ||
+        confirmation_not_in_service?
+    end
+
+    def checkanswers_not_in_service?
+      service.checkanswers_page.blank?
+    end
+
+    def confirmation_not_in_service?
+      service.confirmation_page.blank?
+    end
+
+    def cya_and_confirmation_pages_detached?
+      (checkanswers_detached? && confirmation_detached?) ||
+        checkanswers_detached? ||
+        confirmation_detached?
+    end
+
+    def checkanswers_detached?
+      if service.checkanswers_page.present?
+        uuid = service.checkanswers_page.uuid
+        position = coordinates.position(uuid)
+        detached?(position)
+      end
+    end
+
+    def confirmation_detached?
+      if service.confirmation_page.present?
+        uuid = service.confirmation_page.uuid
+        position = coordinates.position(uuid)
+        detached?(position)
+      end
+    end
+
     # Any destinations exiting the branch that have not already been traversed.
     # This removes any branch destinations that already exist on other rows. If
     # that is the case then the arrow will flow towards whatever row that object

data/app/models/metadata_presenter/service.rb

@@ -60,6 +60,12 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
+  def checkanswers_page
+    @checkanswers_page ||= pages.find do |page|
+      page.type == 'page.checkanswers'
+    end
+  end
+
   def meta
     MetadataPresenter::Meta.new(configuration['meta'])
   end

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.12.1'.freeze
+  VERSION = '2.13.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.0
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder