Browse Source

feat: update routing and only display warnign text when errors will be cleared

pull/2142/head
natdeanlewissoftwire 2 years ago
parent
commit
9ca771cdbf
  1. 8
      app/models/forms/bulk_upload_lettings_resume/confirm.rb
  2. 10
      app/models/forms/bulk_upload_lettings_resume/fix_choice.rb
  3. 8
      app/models/forms/bulk_upload_sales_resume/confirm.rb
  4. 10
      app/models/forms/bulk_upload_sales_resume/fix_choice.rb
  5. 4
      app/views/bulk_upload_lettings_resume/confirm.html.erb
  6. 2
      app/views/bulk_upload_lettings_resume/fix_choice.html.erb
  7. 4
      app/views/bulk_upload_sales_resume/confirm.html.erb
  8. 2
      app/views/bulk_upload_sales_resume/fix_choice.html.erb

8
app/models/forms/bulk_upload_lettings_resume/confirm.rb

@ -19,6 +19,14 @@ module Forms
resume_bulk_upload_lettings_result_path(bulk_upload) resume_bulk_upload_lettings_result_path(bulk_upload)
end end
def error_report_path
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
summary_bulk_upload_lettings_result_path(bulk_upload)
else
bulk_upload_lettings_result_path(bulk_upload)
end
end
def save! def save!
ApplicationRecord.transaction do ApplicationRecord.transaction do
processor = BulkUpload::Processor.new(bulk_upload:) processor = BulkUpload::Processor.new(bulk_upload:)

10
app/models/forms/bulk_upload_lettings_resume/fix_choice.rb

@ -27,14 +27,18 @@ module Forms
when "create-fix-inline" when "create-fix-inline"
page_bulk_upload_lettings_resume_path(bulk_upload, page: "confirm") page_bulk_upload_lettings_resume_path(bulk_upload, page: "confirm")
when "upload-again" when "upload-again"
error_report_path
else
raise "invalid choice"
end
end
def error_report_path
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors? if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
summary_bulk_upload_lettings_result_path(bulk_upload) summary_bulk_upload_lettings_result_path(bulk_upload)
else else
bulk_upload_lettings_result_path(bulk_upload) bulk_upload_lettings_result_path(bulk_upload)
end end
else
raise "invalid choice"
end
end end
def recommendation def recommendation

8
app/models/forms/bulk_upload_sales_resume/confirm.rb

@ -19,6 +19,14 @@ module Forms
resume_bulk_upload_sales_result_path(bulk_upload) resume_bulk_upload_sales_result_path(bulk_upload)
end end
def error_report_path
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
summary_bulk_upload_sales_result_path(bulk_upload)
else
bulk_upload_sales_result_path(bulk_upload)
end
end
def save! def save!
ApplicationRecord.transaction do ApplicationRecord.transaction do
processor = BulkUpload::Processor.new(bulk_upload:) processor = BulkUpload::Processor.new(bulk_upload:)

10
app/models/forms/bulk_upload_sales_resume/fix_choice.rb

@ -27,14 +27,18 @@ module Forms
when "create-fix-inline" when "create-fix-inline"
page_bulk_upload_sales_resume_path(bulk_upload, page: "confirm") page_bulk_upload_sales_resume_path(bulk_upload, page: "confirm")
when "upload-again" when "upload-again"
error_report_path
else
raise "invalid choice"
end
end
def error_report_path
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors? if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors?
summary_bulk_upload_sales_result_path(bulk_upload) summary_bulk_upload_sales_result_path(bulk_upload)
else else
bulk_upload_sales_result_path(bulk_upload) bulk_upload_sales_result_path(bulk_upload)
end end
else
raise "invalid choice"
end
end end
def recommendation def recommendation

4
app/views/bulk_upload_lettings_resume/confirm.html.erb

@ -9,13 +9,15 @@
<p class="govuk-body"> <p class="govuk-body">
<%= logs_and_errors_warning(@bulk_upload) %> <%= logs_and_errors_warning(@bulk_upload) %>
<%= govuk_link_to "View the error report", deletion_report_bulk_upload_lettings_result_path %> <%= govuk_link_to "View the error report", @form.error_report_path %>
</p> </p>
<% if unique_answers_to_be_cleared(@bulk_upload).present? %>
<%= govuk_warning_text do %> <%= govuk_warning_text do %>
<%= deleted_errors_warning_text(@bulk_upload) %> <%= deleted_errors_warning_text(@bulk_upload) %>
<%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_result_path %> <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_result_path %>
<% end %> <% end %>
<% end %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>

2
app/views/bulk_upload_lettings_resume/fix_choice.html.erb

@ -19,7 +19,7 @@
</div> </div>
<div class="govuk-body"> <div class="govuk-body">
<%= govuk_link_to "View the error report", deletion_report_bulk_upload_lettings_result_path %> <%= govuk_link_to "View the error report", @form.error_report_path %>
</div> </div>
<%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %> <%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %>

4
app/views/bulk_upload_sales_resume/confirm.html.erb

@ -9,13 +9,15 @@
<p class="govuk-body"> <p class="govuk-body">
<%= logs_and_errors_warning(@bulk_upload) %> <%= logs_and_errors_warning(@bulk_upload) %>
<%= govuk_link_to "View the error report", deletion_report_bulk_upload_sales_result_path %> <%= govuk_link_to "View the error report", @form.error_report_path %>
</p> </p>
<% if unique_answers_to_be_cleared(@bulk_upload).present? %>
<%= govuk_warning_text do %> <%= govuk_warning_text do %>
<%= deleted_errors_warning_text(@bulk_upload) %> <%= deleted_errors_warning_text(@bulk_upload) %>
<%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_sales_result_path %> <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_sales_result_path %>
<% end %> <% end %>
<% end %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %>

2
app/views/bulk_upload_sales_resume/fix_choice.html.erb

@ -19,7 +19,7 @@
</div> </div>
<div class="govuk-body"> <div class="govuk-body">
<%= govuk_link_to "View the error report", deletion_report_bulk_upload_sales_result_path %> <%= govuk_link_to "View the error report", @form.error_report_path %>
</div> </div>
<%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %> <%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %>

Loading…
Cancel
Save