metadata_presenter 3.2.9 → 3.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 897373db9fc9e22cdd101785b6906d6a0cc657bba1ed4bab5eb81e5834eac598
-  data.tar.gz: c295de4f671132adc78f8cff9ce26594996c64c4f91eaff46ae1bacaeb114b5b
+  metadata.gz: 63fc209d420f65d544451620bbc2331e554d607e8c3df329f5f243bd285b3bff
+  data.tar.gz: 91a2d6a553874cc6aa8012f845af32a99168a8a94528ca9aa13cb758e1acec36
 SHA512:
-  metadata.gz: 1c82446ff868a0ec684a4a5f239189a0abaa05983cb752209f9f7739bc7d144d0300a9314e005f251478c6ce7486a9571be47c7ccdc139bd13fa9c333b010fa4
-  data.tar.gz: d88712f097b7ba9ef105bc15a5b4c18c909f72c998c820ff8b4113f1769c7e971670a24f9ec6a65d82981fc0f51b05927b664790df51395dc2e475ec1fa8c119
+  metadata.gz: 58b2be95c2268ffa1c4f4d65561348dd48bcdc92e19eacc238ef5561d1c47c4028709def52c39f50f500cbf534dd42a101d54ab36a8dbffba24ab77d6ab14c7d
+  data.tar.gz: 1183d876e40b55148b978aa429b1b35a6861d0a10ebd404d68a284a65821a0e651ce8d564183118781225af5805e763cbe98de4a468ed6be2ad98ef831f1a537

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -113,35 +113,6 @@ module MetadataPresenter
     end
     helper_method :external_or_relative_link
 
-    def load_conditional_content
-      if @page.content_component_present?
-        if components_without_conditionals(@page).present?
-          return components_without_conditionals(@page) + show_components(@page).compact
-        end
-
-        show_components(@page).compact
-      end
-    end
-    helper_method :load_conditional_content
-
-    def components_without_conditionals(page)
-      page.content_components.select { |component|
-        component.conditionals.blank?
-      }.map(&:uuid)
-    end
-
-    def show_components(page)
-      return @page.content_components.map(&:uuid) if editor_preview?
-
-      page.content_components.map do |content_component|
-        EvaluateContentConditionals.new(
-          service:,
-          component: content_component,
-          user_data: load_user_data
-        ).show_component
-      end
-    end
-
     private
 
     def not_found
@@ -180,5 +151,18 @@ module MetadataPresenter
     def editor_preview?
       URI(request.original_url).path.split('/').include?('preview')
     end
+
+    def single_page_preview?
+      return false if in_runner?
+      return true if request.referrer.blank?
+
+      !URI(request.referrer).path.split('/').include?('preview')
+    end
+    helper_method :single_page_preview?
+
+    def in_runner?
+      ::Rails.application.class.module_parent.name == 'FbRunner'
+    end
+    helper_method :in_runner?
   end
 end

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -8,7 +8,11 @@ module MetadataPresenter
       @page ||= service.find_page_by_url(request.env['PATH_INFO'])
       if @page
         load_autocomplete_items
-        load_conditional_content
+        if single_page_preview?
+          @page.load_all_content
+        else
+          @page.load_conditional_content(service, @user_data)
+        end
 
         @page_answers = PageAnswers.new(@page, @user_data)
         render template: @page.template
@@ -35,6 +39,11 @@ module MetadataPresenter
       TraversedPages.new(service, load_user_data, @page).all
     end
 
+    def conditional_components_present?
+      @page.conditional_components.any?
+    end
+    helper_method :conditional_components_present?
+
     private
 
     def set_caching_header

data/app/helpers/metadata_presenter/application_helper.rb

@@ -36,6 +36,12 @@ module MetadataPresenter
       MetadataPresenter::DefaultMetadata[type.to_s]&.[]('heading')
     end
 
+    def timeout_fallback(time)
+      time.strftime('%l:%M %p')
+    rescue NoMethodError
+      time
+    end
+
     def multiupload_files_remaining
       component = page_multiupload_component
       answers = @user_data.keys.include?(component.id) ? @user_data.find(component.id).first : []

data/app/models/metadata_presenter/component.rb

@@ -88,6 +88,12 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
     end
   end
 
+  def find_conditional_content_by_uuid(uuid)
+    metadata['conditionals'].select do |conditional|
+      conditional['_uuid'] == uuid
+    end
+  end
+
   private
 
   def validation_bundle_key

data/app/models/metadata_presenter/evaluate_content_conditionals.rb

@@ -1,35 +1,81 @@
 module MetadataPresenter
   class EvaluateContentConditionals
     include ActiveModel::Model
-    attr_accessor :service, :component, :user_data
+    attr_accessor :service, :user_data
 
-    def show_component
-      component_uuid
+    def evaluate_content_components(page)
+      displayed_components = []
+      page.content_components.map do |content_component|
+        next if page.conditionals_uuids_by_type('never').include?(content_component.uuid)
+
+        if page.conditionals_uuids_by_type('always').include?(content_component.uuid)
+          displayed_components << content_component.uuid
+        end
+        if page.conditionals_uuids_by_type('conditional').include?(content_component.uuid)
+          displayed_components << uuid_to_include?(content_component)
+        end
+      end
+      displayed_components.compact
     end
 
-    def component_uuid
-      @results ||=
-        conditionals.map do |conditional|
-          evaluated_expressions = conditional.expressions.map do |expression|
-            expression.service = service
-
-            Operator.new(
-              expression.operator
-            ).evaluate(
-              expression.field_label,
-              user_data[expression.expression_component.id]
-            )
-          end
+    private
 
-          if conditional.type == 'or' && evaluated_expressions.any?
-            component.uuid
-          elsif evaluated_expressions.all?
-            component.uuid
+    def uuid_to_include?(candidate_component)
+      evaluation_conditions = []
+      if candidate_component.conditionals.count == 1
+        # if there are only and rules or the particular case where there is only one condition
+        evaluation_conditions << evaluate_condition(candidate_component.conditionals[0])
+        return candidate_component.uuid if evaluation_conditions.flatten.all?
+      elsif candidate_component.conditionals.count > 1
+        # if there are or rule
+        if candidate_component.conditionals[0][:_type] == 'and'
+          # if there are 'and' in conditions between the 'or' rule
+          candidate_component.conditionals.map do |conditional|
+            evaluation_conditions << evaluate_condition(conditional).flatten.all?
           end
+          return candidate_component.uuid if evaluation_conditions.flatten.any?
         end
-      @results.flatten.compact.first
+        if candidate_component.conditionals[0][:_type] == 'if'
+          # then this is an 'or' condition between conditionals
+          candidate_component.conditionals.map do |conditional|
+            evaluation_conditions << evaluate_condition(conditional)
+          end
+          return candidate_component.uuid if evaluation_conditions.flatten.any?
+        end
+      end
     end
 
-    delegate :conditionals, to: :component
+    def evaluate_condition(conditional)
+      evaluation_expressions = []
+      conditional.expressions.map do |expression|
+        expression.service = service
+        case expression.operator
+        when 'is'
+          evaluation_expressions << check_answer_equal_expression(expression, user_data)
+        when 'is_not'
+          evaluation_expressions << !check_answer_equal_expression(expression, user_data)
+        when 'is_answered'
+          evaluation_expressions << user_data[expression.expression_component.id].present?
+        when 'is_not_answered'
+          evaluation_expressions << user_data[expression.expression_component.id].blank?
+        when 'contains'
+          evaluation_expressions << check_answer_include_expression(expression, user_data)
+        when 'does_not_contain'
+          evaluation_expressions << !check_answer_include_expression(expression, user_data)
+        end
+      end
+      evaluation_expressions
+    end
+
+    def check_answer_equal_expression(expression, user_data)
+      expression.field_label == user_data[expression.expression_component.id]
+    end
+
+    def check_answer_include_expression(expression, user_data)
+      answer = user_data[expression.expression_component.id]
+      return false if answer.blank?
+
+      answer.include?(expression.field_label)
+    end
   end
 end

data/app/models/metadata_presenter/page.rb

@@ -141,8 +141,37 @@ module MetadataPresenter
       end
     end
 
-    def content_component_present?
-      components.any?(&:content?)
+    def conditional_content_to_show
+      @conditional_content_to_show || []
+    end
+
+    def show_conditional_component?(component_id)
+      conditional_content_to_show.include?(component_id)
+    end
+
+    def load_conditional_content(service, user_data)
+      if content_component_present?
+        evaluator = EvaluateContentConditionals.new(service:, user_data:)
+        items = evaluator.evaluate_content_components(self)
+        items << legacy_content_components
+        assign_conditional_component(items.flatten)
+      end
+    end
+
+    def content_components_by_type(*display)
+      content_components.filter { |component| display.include? component[:display] }
+    end
+
+    def conditionals_uuids_by_type(*display)
+      content_components_by_type(*display).map { |component| component[:_uuid] }
+    end
+
+    def load_all_content
+      @conditional_content_to_show = content_components
+    end
+
+    def conditional_components
+      conditionals_uuids_by_type('never', 'conditional')
     end
 
     private
@@ -172,5 +201,17 @@ module MetadataPresenter
     def raw_type
       type.gsub('page.', '')
     end
+
+    def assign_conditional_component(items)
+      @conditional_content_to_show = items
+    end
+
+    def content_component_present?
+      all_components.any?(&:content?)
+    end
+
+    def legacy_content_components
+      content_components.filter_map { |component| component[:_uuid] if component[:display].blank? }
+    end
   end
 end

data/app/models/metadata_presenter/service.rb

@@ -21,6 +21,14 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     branches.map(&:conditionals).flatten
   end
 
+  def content_expressions
+    content_conditionals.flat_map(&:expressions)
+  end
+
+  def content_conditionals
+    pages.flat_map(&:content_components).flat_map(&:conditionals)
+  end
+
   def flow_object(uuid)
     MetadataPresenter::Flow.new(uuid, metadata.flow[uuid])
   rescue StandardError
@@ -78,23 +86,32 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
 
   def page_with_component(uuid)
     pages.find do |page|
-      Array(page.components).any? { |component| component.uuid == uuid }
+      Array(page.all_components).any? { |component| component.uuid == uuid }
     end
   end
 
-  private
+  def pages_with_conditional_content_for_page(uuid)
+    pages.select do |page|
+      uuid.in? page.content_components_by_type('conditional').flat_map(&:conditionals).flat_map(&:expressions).map(&:page)
+    end
+  end
 
-  def all_pages
-    @all_pages ||= pages + standalone_pages
+  def pages_with_conditional_content_for_question(uuid)
+    pages.select do |page|
+      uuid.in?  page.content_components_by_type('conditional').flat_map(&:conditionals).flat_map(&:expressions).map(&:component)
+    end
   end
 
-  def flow_page(current_page)
-    page_index = pages.index(current_page)
-    pages[page_index - 1] if page_index.present?
+  def pages_with_conditional_content_for_question_option(uuid)
+    pages.select do |page|
+      uuid.in?  page.content_components_by_type('conditional').flat_map(&:conditionals).flat_map(&:expressions).map(&:field)
+    end
   end
 
-  def referrer_page(referrer)
-    find_page_by_url(URI(referrer).path) if referrer
+  private
+
+  def all_pages
+    @all_pages ||= pages + standalone_pages
   end
 
   def strip_slash(url)

data/app/views/metadata_presenter/component/_components.html.erb

@@ -1,12 +1,16 @@
 <% components.each_with_index do |component, index| %>
+
   <% if component.type == 'content' %>
+    <% next unless (editable? || @page.show_conditional_component?(component.uuid) || single_page_preview?) %>
+
     <editable-content id="<%= "page[#{component.collection}[#{index}]]" %>"
                       class="fb-editable govuk-!-margin-top-8"
                       type="<%= component.type %>"
                       default-content="<%= default_text('content') %>"
                       content="<%= component.content %>"
                       data-fb-content-id="<%= "page[#{component.collection}[#{index}]]" %>"
-                      data-config="<%= component.to_json %>">
+                      data-config="<%= component.to_json %>"
+                      data-conditional-api-path="<%= editable? ? URI.decode_www_form_component(api_service_edit_conditional_content_path(service.service_id, component.uuid)) : '' %>">
         <%= to_html(component.content) %>
     </editable-content>
   <% end %>

data/app/views/metadata_presenter/component/_conditional_component_banner.html.erb

@@ -0,0 +1,5 @@
+<% if single_page_preview? && !editable? && @page.conditional_components.any? %>
+  <%= govuk_notification_banner(title_text: 'Important') do |nb|
+    nb.with_heading(text: t('presenter.conditional_content.notification'))
+  end %>
+<% end%>

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

@@ -2,6 +2,8 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
+      <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
+
       <h1 class="fb-editable govuk-heading-xl"
           data-fb-content-type="element"
           data-fb-content-id="page[heading]"
@@ -11,6 +13,7 @@
 
       <%= form_for @page, url: reserved_submissions_path, authenticity_token: false, html: { id: 'answers-form' } do |f| %>
         <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
+
         <%= render partial: 'metadata_presenter/component/components',
                    locals: {
                    f: f,

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

@@ -1,59 +1,64 @@
 <% content_for :manual_global_analytics_properties do %>'page_title': 'Confirmation page'<% end %>
 <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
-<% if payment_link_enabled? %>
-  <div class="govuk-panel govuk-panel--confirmation-payment govuk-grid-column-two-thirds">
-  <% else %>
-  <div class="govuk-panel govuk-panel--confirmation govuk-grid-column-two-thirds">
-<% end %>
-    <h1 class="fb-editable govuk-panel__title"
-        data-fb-content-type="element"
-        data-fb-content-id="page[heading]"
-        data-fb-default-value="<%= default_page_title(@page.type) %>">
-      <% if payment_link_enabled? && @page.heading == I18n.t('presenter.confirmation.application_complete') %>
-        <p><%= I18n.t('presenter.confirmation.payment_enabled') %></p>
-      <% else %>
-        <%= @page.heading %>
-      <% end %>
-    </h1>
 
-    <div class="govuk-panel__body">
-      <% if reference_number_enabled? %>
-        <p><%= I18n.t('presenter.confirmation.reference_number') %><br />
-          <strong><%= show_reference_number %></strong>
-        </p>
+  <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
+
+  <% if payment_link_enabled? %>
+    <div class="govuk-panel govuk-panel--confirmation-payment govuk-grid-column-two-thirds">
+    <% else %>
+      <div class="govuk-panel govuk-panel--confirmation govuk-grid-column-two-thirds">
       <% end %>
+      <h1 class="fb-editable govuk-panel__title"
+          data-fb-content-type="element"
+          data-fb-content-id="page[heading]"
+          data-fb-default-value="<%= default_page_title(@page.type) %>">
+        <% if payment_link_enabled? && @page.heading == I18n.t('presenter.confirmation.application_complete') %>
+          <p><%= I18n.t('presenter.confirmation.payment_enabled') %></p>
+        <% else %>
+          <%= @page.heading %>
+        <% end %>
+      </h1>
 
-      <%# Do not replace with app/views/metadata_presenter/attribute _lede.html.erb because that is different %>
-      <% if @page.lede %>
-        <div class="fb-editable"
-            data-fb-content-id="page[lede]"
-            data-fb-content-type="element"
-            data-fb-default-text="<%= default_text('lede') %>">
-          <%= @page.lede %>
-        </div>
-      <%- end %>
-    </div>
-  </div>
+      <div class="govuk-panel__body">
+        <% if reference_number_enabled? %>
+          <p><%= I18n.t('presenter.confirmation.reference_number') %><br />
+            <strong><%= show_reference_number %></strong>
+          </p>
+        <% end %>
 
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-     <% unless @page.body == default_text('body') %>
-      <%= render 'metadata_presenter/attribute/body' %>
-      <% end %>
+        <%# Do not replace with app/views/metadata_presenter/attribute _lede.html.erb because that is different %>
+        <% if @page.lede %>
+          <div class="fb-editable"
+               data-fb-content-id="page[lede]"
+               data-fb-content-type="element"
+               data-fb-default-text="<%= default_text('lede') %>">
+            <%= @page.lede %>
+          </div>
+        <%- end %>
+      </div>
+      </div>
 
-      <%= render partial: 'metadata_presenter/component/components',
-                 locals: {
-                 f: nil,
-                 components: @page.components,
-                 tag: nil,
-                 classes: nil,
-                 input_components: @page.supported_input_components,
-                 content_components: @page.supported_content_components
-                 } %>
+      <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds">
+          <% unless @page.body == default_text('body') %>
+            <%= render 'metadata_presenter/attribute/body' %>
+          <% end %>
 
+          <% render partial:'metadata_presenter/component/conditional_component_banner'%>
+
+          <%= render partial: 'metadata_presenter/component/components',
+            locals: {
+              f: nil,
+              components: @page.components,
+              tag: nil,
+              classes: nil,
+              input_components: @page.supported_input_components,
+              content_components: @page.supported_content_components
+            } %>
+
+        </div>
+      </div>
+      <% if payment_link_enabled? %>
+        <a href="<%= payment_link_url %>" class="govuk-button" data-module="govuk-button" data-component="pay-button"><%= t('presenter.confirmation.continue_to_pay_button') %></a>
+      <% end %>
     </div>
-  </div>
-  <% if payment_link_enabled? %>
-    <a href="<%= payment_link_url %>" class="govuk-button" data-module="govuk-button" data-component="pay-button"><%= t('presenter.confirmation.continue_to_pay_button') %></a>
-  <% end %>
-</div>

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

@@ -2,6 +2,8 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
+      <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
+
       <%= render 'metadata_presenter/attribute/section_heading' %>
 
       <h1 class="fb-editable govuk-heading-xl"

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

@@ -2,6 +2,8 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
+      <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
+
       <%= render 'metadata_presenter/attribute/section_heading' %>
 
       <h1 class="fb-editable govuk-heading-xl"
@@ -15,6 +17,7 @@
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post, authenticity_token: false do |f| %>
         <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
+        
 
         <%= render partial: 'metadata_presenter/component/components',
                    locals: {

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

@@ -2,6 +2,8 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
+      <%= render partial:'metadata_presenter/component/conditional_component_banner'%>
+
       <%= render 'metadata_presenter/attribute/section_heading' %>
       <%= render 'metadata_presenter/attribute/heading' %>
 

data/app/views/metadata_presenter/session/_timeout_fallback.html.erb

@@ -2,7 +2,7 @@
   <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
   <strong class="govuk-warning-text__text">
     <span class="govuk-warning-text__assistive">Warning</span>
-    <%= t('presenter.session_timeout_warning.timer_fallback') %> <%= session_expiry_time&.strftime('%l:%M %p') %>.
+    <%= t('presenter.session_timeout_warning.timer_fallback') %> <%= timeout_fallback(session_expiry_time) %>.
     <%= t('presenter.session_timeout_warning.timer_extra') %>
   </strong>
 </div>

data/config/locales/en.yml

@@ -55,6 +55,8 @@ en:
         singular: 'You can add 1 more file (maximum 7MB)'
         plural: 'You can add up to %{num} files (maximum 7MB per file)'
         none: "You can't add any more files. Remove a file if you need to add a different one."
+    conditional_content:
+      notification: "Some content on this page will be hidden under certain conditions. Preview the full form or publish to Test to check."
     save_and_return:
       save: 'Save for later'
       show:

data/default_metadata/component/content.json

@@ -1,5 +1,6 @@
 {
   "_id": "component.content",
   "_type": "content",
+  "display": "always",
   "content": "[Optional content]"
 }