feat: fix back persistence behaviour and update similar issues elsewhere, also remove redundant back text in govuk back links

3 years ago · 86344357ff
22 changed files with 6 additions and 34 deletions
--- a/app/views/devise/two_factor_authentication/resend.html.erb
+++ b/app/views/devise/two_factor_authentication/resend.html.erb
@ -1,7 +1,7 @@
 <% content_for :title, "Resend security code" %>

 <% content_for :before_content do %>
-  <%= govuk_back_link(href: "javascript:history.back()") %>
+  <%= govuk_back_link(href: :back) %>
 <% end %>

 <%= form_with(url: send("resend_code_#{resource_name}_two_factor_authentication_path"), html: { method: :get }) do |f| %>
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@ -1,7 +1,7 @@
 <% content_for :title, @page.header.presence || @page.questions.first.header.html_safe %>

 <% content_for :before_content do %>
-  <%= govuk_back_link(href: "javascript:history.back()") %>
+  <%= govuk_back_link(href: :back) %>
 <% end %>

 <div data-controller="govukfrontend"></div>
--- a/app/views/locations/availability.erb
+++ b/app/views/locations/availability.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: params[:referrer] == "check_answers" ? scheme_location_check_answers_path(@scheme, @location, route: params[:route]) : scheme_location_mobility_standards_path(@scheme, @location, route: params[:route]),
        ) %>
 <% end %>
--- a/app/views/locations/check_answers.html.erb
+++ b/app/views/locations/check_answers.html.erb
@ -3,7 +3,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: case params[:route]
          when "locations"
            scheme_locations_path(@scheme)
--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@ -4,7 +4,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: "/schemes/#{@scheme.id}",
  ) %>
 <% end %>
--- a/app/views/locations/local_authority.html.erb
+++ b/app/views/locations/local_authority.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: case params[:referrer]
              when "check_local_authority"
                scheme_location_check_answers_path(@scheme, @location, route: params[:route])
--- a/app/views/locations/mobility_standards.html.erb
+++ b/app/views/locations/mobility_standards.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: params[:referrer] == "check_answers" ? scheme_location_check_answers_path(@scheme, @location, route: params[:route]) : scheme_location_type_of_unit_path(@scheme, @location, route: params[:route]),
      ) %>
 <% end %>
--- a/app/views/locations/name.html.erb
+++ b/app/views/locations/name.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: case params[:referrer]
              when "check_answers"
                scheme_location_check_answers_path(@scheme, @location, route: params[:route])
--- a/app/views/locations/postcode.html.erb
+++ b/app/views/locations/postcode.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: if params[:referrer] == "check_answers"
                scheme_location_check_answers_path(@scheme, @location, route: params[:route])
              else
--- a/app/views/locations/show.html.erb
+++ b/app/views/locations/show.html.erb
@ -3,7 +3,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: scheme_locations_path(@scheme),
  ) %>
 <% end %>
--- a/app/views/locations/toggle_active.html.erb
+++ b/app/views/locations/toggle_active.html.erb
@ -3,7 +3,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: scheme_location_path(@location.scheme, @location),
  ) %>
 <% end %>
--- a/app/views/locations/type_of_unit.html.erb
+++ b/app/views/locations/type_of_unit.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: params[:referrer] == "check_answers" ? scheme_location_check_answers_path(@scheme, @location, route: params[:route]) : scheme_location_units_path(@scheme, @location, route: params[:route]),
      ) %>
 <% end %>
--- a/app/views/locations/units.html.erb
+++ b/app/views/locations/units.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: params[:referrer] == "check_answers" ? scheme_location_check_answers_path(@scheme, @location, route: params[:route]) : scheme_location_name_path(@scheme, @location, route: params[:route]),
      ) %>
 <% end %>
--- a/app/views/schemes/confirm_secondary.html.erb
+++ b/app/views/schemes/confirm_secondary.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/primary-client-group",
  ) %>
 <% end %>
--- a/app/views/schemes/details.html.erb
+++ b/app/views/schemes/details.html.erb
@ -1,10 +1,7 @@
 <% content_for :title, "Create a new supported housing scheme" %>

 <% content_for :before_content do %>
-  <%= govuk_back_link(
-        text: "Back",
-        href: :back,
-      ) %>
+   <%= govuk_back_link(href: :back) %>
 <% end %>

 <%= form_for(@scheme, method: :patch) do |f| %>
--- a/app/views/schemes/edit_name.html.erb
+++ b/app/views/schemes/edit_name.html.erb
@ -1,10 +1,7 @@
 <% content_for :title, "Scheme details" %>

 <% content_for :before_content do %>
-  <%= govuk_back_link(
-    text: "Back",
-    href: :back,
-  ) %>
+  <%= govuk_back_link(href: :back) %>
 <% end %>

 <%= form_for(@scheme, method: :patch) do |f| %>
--- a/app/views/schemes/new.html.erb
+++ b/app/views/schemes/new.html.erb
@ -6,10 +6,7 @@
      <% content_for :title, "Create a new supported housing scheme" %>

      <% content_for :before_content do %>
-        <%= govuk_back_link(
-              text: "Back",
-              href: "javascript:history.go(-1);",
-            ) %>
+        <%= govuk_back_link(href: :back) %>
      <% end %>

      <h1 class="govuk-heading-l">
--- a/app/views/schemes/primary_client_group.html.erb
+++ b/app/views/schemes/primary_client_group.html.erb
@ -7,10 +7,7 @@
 <% end %>

 <% content_for :before_content do %>
-  <%= govuk_back_link(
-    text: "Back",
-    href: back_button_path,
-  ) %>
+  <%= govuk_back_link(href: back_button_path) %>
 <% end %>

 <%= form_for(@scheme, method: :patch) do |f| %>
--- a/app/views/schemes/secondary_client_group.html.erb
+++ b/app/views/schemes/secondary_client_group.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/confirm-secondary-client-group",
  ) %>
 <% end %>
--- a/app/views/schemes/show.html.erb
+++ b/app/views/schemes/show.html.erb
@ -3,7 +3,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: "/schemes",
  ) %>
 <% end %>
--- a/app/views/schemes/support.html.erb
+++ b/app/views/schemes/support.html.erb
@ -2,7 +2,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-    text: "Back",
    href: request.query_parameters["check_answers"] ? "/schemes/#{@scheme.id}/check-answers" : "/schemes/#{@scheme.id}/secondary-client-group",
  ) %>
 <% end %>
--- a/app/views/schemes/toggle_active.html.erb
+++ b/app/views/schemes/toggle_active.html.erb
@ -3,7 +3,6 @@

 <% content_for :before_content do %>
  <%= govuk_back_link(
-        text: "Back",
        href: scheme_details_path(@scheme),
      ) %>
 <% end %>