Merge pull request #2774 from govuk-forms/update-add-edit-routes-content

Update add edit routes content

Author: SamJamCul

app/components/page_list_component/view.html.erb

@@ -35,21 +35,23 @@
           <% if FeatureService.new(group: @form.group).enabled?(:multiple_branches) && page.routing_conditions.present? %>
             <div class="govuk-summary-list__row">
               <dt class="govuk-summary-list__key app-page-list__key">
-                <%= t("page_conditions.condition_name", question_number: page.position) %>
+                <%= t("page_conditions.condition_list_key", count: page.routing_conditions.count, question_number: page.position) %>
               </dt>
               <dd class="govuk-summary-list__value">
                 <% if page.routing_conditions.first.answer_value.present? %>
-                  <p><%= I18n.t("page_conditions.if_answer_is") %></p>
-                  <ul class="govuk-list govuk-list--bullet">
-                    <% page.routing_conditions.each do |condition| %>
-                      <li>
-                        <%= condition_description2(condition) %>
-                      </li>
-                    <% end %>
-                  </ul>
+                  <% answer_value_groups(page).each do |_, group| %>
+                    <p><%= condition_group_description(group) %></p>
+                    <ul class="govuk-list govuk-list--bullet">
+                      <% group.each do |condition| %>
+                        <li>
+                          <%= answer_value_text_for_condition2(condition) %>
+                        </li>
+                      <% end %>
+                    </ul>
+                  <% end %>
                 <% else %>
                   <p>
-                    <%= condition_description2(page.routing_conditions.first) %>
+                    <%= unconditional_description(page.routing_conditions.first) %>
                   </p>
                 <% end %>
                 <dd class="govuk-summary-list__actions govuk-!-padding-bottom-6">

app/components/page_list_component/view.rb

@@ -28,11 +28,21 @@ def condition_description(condition)
       end
     end
 
-    def condition_description2(condition)
-      if condition.answer_value.present?
-        I18n.t("page_conditions.condition_description2", goto_page_question_text: goto_page_text_for_condition(condition), answer_value: answer_value_text_for_condition(condition))
+    def unconditional_description(condition)
+      if condition.goto_page_id.present?
+        goto_page = @pages.find { |page| page.id == condition.goto_page_id }
+        I18n.t("page_conditions.unconditional_goto_page_text", goto_page_question_number: goto_page.position, goto_page_question_text: goto_page.question_text)
+      elsif condition.skip_to_end
+        I18n.t("page_conditions.unconditional_skip_to_end_text")
+      end
+    end
+
+    def condition_group_description(group)
+      if group.first.skip_to_end
+        I18n.t("page_conditions.condition_group_description_end_of_form")
       else
-        I18n.t("page_conditions.unconditional_description", goto_page_question_text: goto_page_text_for_condition(condition))
+        goto_page = @pages.find { |page| page.id == group.first.goto_page_id }
+        I18n.t("page_conditions.condition_group_description", goto_page_question_text: goto_page.question_text, goto_page_question_number: goto_page.position)
       end
     end
 
@@ -50,6 +60,15 @@ def answer_value_text_for_condition(condition)
       end
     end
 
+    def answer_value_text_for_condition2(condition)
+      if condition.answer_value.present?
+        answer_value = condition.answer_value == :none_of_the_above.to_s ? I18n.t("page_conditions.none_of_the_above") : condition.answer_value
+        I18n.t("page_conditions.condition_answer_value_text2", answer_value:)
+      else
+        I18n.t("page_conditions.condition_answer_value_text_with_errors")
+      end
+    end
+
     def goto_page_text_for_condition(condition)
       if condition.goto_page_id.present?
         goto_page = @pages.find { |page| page.id == condition.goto_page_id }
@@ -80,5 +99,9 @@ def skip_condition_route_page_text(condition)
       routing_page = @pages.find { |page| page.id == condition.routing_page_id }
       I18n.t("page_conditions.skip_condition_route_page_text", route_page_question_text: routing_page.question_text, route_page_question_number: routing_page.position)
     end
+
+    def answer_value_groups(page)
+      page.routing_conditions.group_by(&:goto_page_id).sort_by { |goto_page_id, _| goto_page_id || Float::INFINITY }
+    end
   end
 end

config/locales/en.yml

@@ -1360,6 +1360,7 @@ en:
     title: Page not found
   page_conditions:
     condition_answer_value_text: "“%{answer_value}”"
+    condition_answer_value_text2: "‘%{answer_value}’"
     condition_answer_value_text_with_errors: "[Answer not selected]"
     condition_check_page_text: "“%{check_page_question_text}”"
     condition_compact_html: If the answer is “%{answer_value}” go to %{goto_page_question_number}, “%{goto_page_question_text}”
@@ -1368,22 +1369,26 @@ en:
     condition_compact_html_secondary_skip: Go to %{goto_page_question_number}, “%{goto_page_question_text}”
     condition_compact_html_secondary_skip_to_end_of_form: Go to end of form
     condition_description: If %{check_page_question_text} is answered as %{answer_value} go to %{goto_page_question_text}
-    condition_description2: "%{answer_value} go to %{goto_page_question_text}"
     condition_goto_exit_page: exit page, “%{exit_page_heading}”
     condition_goto_page_end_of_form: end of form.
     condition_goto_page_text: "%{goto_page_question_number}, “%{goto_page_question_text}”"
     condition_goto_page_text_with_errors: "[Question not selected]"
+    condition_group_description: 'Go to %{goto_page_question_number}, ‘%{goto_page_question_text}’ if the answer is:'
+    condition_group_description_end_of_form: 'Go to the end of the form if the answer is:'
+    condition_list_key:
+      one: Question %{question_number}’s route
+      other: Question %{question_number}’s routes
     condition_name: Question %{question_number}’s routes
     edit_exit_page: Edit “%{exit_page_heading}”
     end_of_form: End of form
     exit_page: Add an exit page
     exit_page_label: An ‘exit page’ to leave the form
-    if_answer_is: 'If the answer is:'
     none_of_the_above: None of the above
     route: Route
     secondary_skip_description: After %{check_page_question_text} go to %{goto_page_question_text}
     skip_condition_route_page_text: "%{route_page_question_number}, “%{route_page_question_text}”"
-    unconditional_description: Go to %{goto_page_question_text}
+    unconditional_goto_page_text: Go to %{goto_page_question_number}, ‘%{goto_page_question_text}’
+    unconditional_skip_to_end_text: Go to the end of the form
   page_route_card:
     any_other_answer: Route for any other answer
     conditional_answer_value: "%{answer_value}"

db/seeds.rb

@@ -128,6 +128,7 @@
   # create some test groups
   end_to_end_group = Group.create! name: "End to end tests", organisation: gds, status: :active
   test_group = Group.create! name: "Test Group", organisation: gds, creator: default_user, status: :active
+  multiple_branches_test_group = Group.create! name: "Test Group with multiple branches", organisation: gds, creator: default_user, status: :active, multiple_branches_enabled: true
   Group.create! name: "Ministry of Tests forms", organisation: mot_org
   Group.create! name: "Ministry of Tests forms - secret!", organisation: mot_org, creator: mot_user
 
@@ -583,5 +584,5 @@
   GroupForm.create! group: test_group, form_id: branch_route_form.id # Branch routing form
   GroupForm.create! group: test_group, form_id: none_of_the_above_form.id # None of the above form
   GroupForm.create! group: test_group, form_id: welsh_form.id # Welsh form
-  GroupForm.create! group: test_group, form_id: multiple_branch_form.id
+  GroupForm.create! group: multiple_branches_test_group, form_id: multiple_branch_form.id
 end

spec/components/page_list_component/page_list_component_preview.rb

@@ -96,6 +96,7 @@ def with_multiple_branches
       (build :page, id: 2, position: 2, question_text: "What is your pet's phone number?", routing_conditions: routing_conditions_2),
       (build :page, id: 3, position: 3, question_text: "How many pets do you own?", routing_conditions: []),
       (build :page, id: 4, position: 4, question_text: "What kind of pet do you want?", routing_conditions: []),
+      (build :page, id: 5, position: 5, question_text: "What is your favourite colour?", routing_conditions: []),
     ]
 
     form = build(:form, :with_group, id: 1, pages:)