From 7103da2a6798df60f523dbda1ab8537c88c4b7a0 Mon Sep 17 00:00:00 2001 From: Benjamin Eskola Date: Mon, 16 Mar 2026 15:34:21 +0000 Subject: [PATCH 1/3] Remove leftover feature flag from 2022 --- .env.example | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.example b/.env.example index 10bb9ef6ac..c6cdcd6772 100644 --- a/.env.example +++ b/.env.example @@ -5,5 +5,4 @@ OTP_SECRET_ENCRYPTION_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx NOTIFY_API_KEY=xxxxx NOTIFY_EMAIL_TEMPLATE_ID=xxxxx NOTIFY_SMS_TEMPLATE_ID=xxxxx -GROUPED_PROPOSAL_DETAILS_FEATURE=enabled GOOGLE_TAG_MANAGER_ID=GTM-XXXXXXXX From 499436cde4a17adcb6152fcc43f5bf7e48318084 Mon Sep 17 00:00:00 2001 From: Benjamin Eskola Date: Wed, 18 Mar 2026 16:05:28 +0000 Subject: [PATCH 2/3] Fix `show_sidebar` spec helper --- spec/support/show_sidebar.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/support/show_sidebar.rb b/spec/support/show_sidebar.rb index 4503c2fc0d..8c903f9a75 100644 --- a/spec/support/show_sidebar.rb +++ b/spec/support/show_sidebar.rb @@ -11,6 +11,8 @@ ensure Rails.configuration.use_new_sidebar_layout = existing_value end + else + example.run end end end From a7ea070c5200551ea1ce3aa8e2035c0f38853a84 Mon Sep 17 00:00:00 2001 From: Benjamin Eskola Date: Wed, 18 Mar 2026 15:29:10 +0000 Subject: [PATCH 3/3] Do not redirect non-preapps to the preapp route --- .../validation_requests_controller.rb | 18 ++++++++++++++---- .../_form.html.erb | 10 ++-------- ...acement_document_validation_request_spec.rb | 4 +++- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/controllers/planning_applications/validation/validation_requests_controller.rb b/app/controllers/planning_applications/validation/validation_requests_controller.rb index f042b00f82..d0d7d8af72 100644 --- a/app/controllers/planning_applications/validation/validation_requests_controller.rb +++ b/app/controllers/planning_applications/validation/validation_requests_controller.rb @@ -254,11 +254,21 @@ def check_red_line_boundary_task_path end def check_and_request_documents_task_path - BopsPreapps::Engine.routes.url_helpers.task_path( - reference: @planning_application.reference, - slug: "check-and-validate/check-tag-and-confirm-documents/check-and-request-documents" - ) + return unless redirect_to_check_and_request_documents_task? + + if @planning_application.pre_application? + BopsPreapps::Engine.routes.url_helpers.task_path( + reference: @planning_application.reference, + slug: "check-and-validate/check-tag-and-confirm-documents/check-and-request-documents" + ) + else + task_path( + reference: @planning_application.reference, + slug: "check-and-validate/check-tag-and-confirm-documents/check-and-request-documents" + ) + end end + helper_method :check_and_request_documents_task_path def set_validation_request return if params[:id].blank? diff --git a/app/views/planning_applications/validation/replacement_document_validation_requests/_form.html.erb b/app/views/planning_applications/validation/replacement_document_validation_requests/_form.html.erb index 13f97acfb1..050ceed111 100644 --- a/app/views/planning_applications/validation/replacement_document_validation_requests/_form.html.erb +++ b/app/views/planning_applications/validation/replacement_document_validation_requests/_form.html.erb @@ -5,14 +5,8 @@ data: {unsaved_changes_target: "form", action: "submit->unsaved-changes#handleSubmit"} do |form| %> <%= form.hidden_field :old_document_id, value: @document.id %> - <% return_to = params[:return_to].presence || params[:redirect_to].presence %> - <% if return_to.nil? && @planning_application.pre_application? %> - <% return_to = BopsPreapps::Engine.routes.url_helpers.task_path( - reference: @planning_application.reference, - slug: "check-and-validate/check-tag-and-confirm-documents/check-and-request-documents" - ) %> - <% end %> - <%= form.hidden_field :return_to, value: return_to if return_to.present? %> + <% return_to = params[:return_to].presence || params[:redirect_to].presence || check_and_request_documents_task_path %> + <%= form.hidden_field :return_to, value: return_to %> <%= form.govuk_error_summary %> diff --git a/spec/system/planning_applications/replacement_document_validation_request_spec.rb b/spec/system/planning_applications/replacement_document_validation_request_spec.rb index 36e798d7c6..6715e9f83a 100644 --- a/spec/system/planning_applications/replacement_document_validation_request_spec.rb +++ b/spec/system/planning_applications/replacement_document_validation_request_spec.rb @@ -45,7 +45,7 @@ ) end - it "I can mark documents as invalid and edit/delete the validation request", :capybara do + it "I can mark documents as invalid and edit/delete the validation request", :capybara, show_sidebar: false do click_link "Check and validate" within "#main-content" do click_link "Review documents" @@ -595,6 +595,8 @@ request.save! request.old_document.archive("replaced by new document") + visit "/planning_applications/#{planning_application.reference}" + find("span", text: "Documents").click click_link "Manage documents"