From 247a1a856039ab43d7fbfbe6181472235f05db81 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 3 Jul 2023 13:59:24 +0100
Subject: [PATCH] Add a cancel button to add stock owners/managing
 organisations page (#1741)

---
 .../add_managing_agent.html.erb                        |  5 ++++-
 .../add_stock_owner.html.erb                           |  5 ++++-
 .../organisation_relationships_controller_spec.rb      | 10 +++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/views/organisation_relationships/add_managing_agent.html.erb b/app/views/organisation_relationships/add_managing_agent.html.erb
index 173e845ad..8f53b1eeb 100644
--- a/app/views/organisation_relationships/add_managing_agent.html.erb
+++ b/app/views/organisation_relationships/add_managing_agent.html.erb
@@ -22,7 +22,10 @@
     question: Form::Question.new("", { "answer_options" => answer_options }, nil),
     f:,
   } %>
-  <%= f.govuk_submit "Add" %>
+  <div class="govuk-button-group govuk-!-margin-bottom-6">
+    <%= f.govuk_submit "Add" %>
+    <%= govuk_button_link_to("Cancel", managing_agents_organisation_path(@organisation), secondary: true) %>
+  </div>
   <%= govuk_details(summary_text: "Can't find the managing agent you're looking for?") do %>
     <ul class="govuk-list govuk-list--bullet">
       <li>Double check the spelling and try again</li>
diff --git a/app/views/organisation_relationships/add_stock_owner.html.erb b/app/views/organisation_relationships/add_stock_owner.html.erb
index e78e81b8a..f531eb7f7 100644
--- a/app/views/organisation_relationships/add_stock_owner.html.erb
+++ b/app/views/organisation_relationships/add_stock_owner.html.erb
@@ -22,7 +22,10 @@
     question: Form::Question.new("", { "answer_options" => answer_options }, nil),
     f:,
   } %>
-  <%= f.govuk_submit "Add" %>
+  <div class="govuk-button-group govuk-!-margin-bottom-6">
+    <%= f.govuk_submit "Add" %>
+    <%= govuk_button_link_to("Cancel", stock_owners_organisation_path(@organisation), secondary: true) %>
+  </div>
   <%= govuk_details(summary_text: "Can't find the stock owner you're looking for?") do %>
     <ul class="govuk-list govuk-list--bullet">
       <li>Double check the spelling and try again</li>
diff --git a/spec/requests/organisation_relationships_controller_spec.rb b/spec/requests/organisation_relationships_controller_spec.rb
index 78b894b7f..a93e77d76 100644
--- a/spec/requests/organisation_relationships_controller_spec.rb
+++ b/spec/requests/organisation_relationships_controller_spec.rb
@@ -62,6 +62,10 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
             it "shows an add button" do
               expect(page).to have_button("Add")
             end
+
+            it "shows a cancel button" do
+              expect(page).to have_link("Cancel", href: "/organisations/#{organisation.id}/stock-owners")
+            end
           end
         end
 
@@ -640,7 +644,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           expect(response.body).to include("Remove")
         end
 
-        context "when adding a stock owner" do
+        context "when adding a managing agent" do
           before do
             get "/organisations/#{organisation.id}/managing-agents/add", headers:, params: {}
           end
@@ -652,6 +656,10 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           it "shows an add button" do
             expect(page).to have_button("Add")
           end
+
+          it "shows a cancel button" do
+            expect(page).to have_link("Cancel", href: "/organisations/#{organisation.id}/managing-agents")
+          end
         end
       end
     end