Merge pull request #2650 from govuk-forms/add-content-to-make-english-live

Add content to make english live

Author: thomasiles

app/controllers/forms/make_live_controller.rb

@@ -31,7 +31,9 @@ def make_live_input_params
     end
 
     def render_new(status: :ok)
-      if current_form.is_live?
+      if current_form.live_welsh_form_document.present? && current_form.task_statuses[:welsh_language_status] == :in_progress
+        render "make_your_changes_to_english_live", status:, locals: { current_form: }
+      elsif current_form.is_live?
         render "make_your_changes_live", status:, locals: { current_form: }
       elsif current_form.is_archived?
         render "make_archived_draft_live", status:, locals: { current_form: }

app/models/form.rb

@@ -111,7 +111,7 @@ def ready_for_live
   end
 
   def all_ready_for_live?
-    ready_for_live && email_task_status_service.ready_for_live?
+    ready_for_live
   end
 
   delegate :incomplete_tasks, to: :task_status_service
@@ -141,11 +141,11 @@ def has_no_remaining_routes_available?
   end
 
   def all_incomplete_tasks
-    incomplete_tasks.concat(email_task_status_service.incomplete_email_tasks)
+    incomplete_tasks
   end
 
   def all_task_statuses
-    task_statuses.merge(email_task_status_service.email_task_statuses)
+    task_statuses
   end
 
   def page_number(page)
@@ -241,12 +241,6 @@ def group_form
     GroupForm.find_by_form_id(id)
   end
 
-  def email_task_status_service
-    # TODO: refactor this in favour of dependency injection
-    # it can also lead to use of `allow_any_instance_of` in testing
-    @email_task_status_service ||= EmailTaskStatusService.new(form: self)
-  end
-
   def steps
     ordered_pages = pages.includes(:routing_conditions).to_a
     ordered_pages.map.with_index do |page, index|

app/services/email_task_status_service.rb

@@ -200,15 +200,22 @@ def make_form_live_section_tasks
         status: @task_statuses[:share_preview_status],
         active: @form.pages.any?,
       },
-      {
-        task_name: live_task_name,
-        path: live_path,
-        status: @task_statuses[:make_live_status],
-        active: @form.all_ready_for_live?,
-      },
+      make_live_task,
     ]
   end
 
+  def make_live_task
+    status = @task_statuses[:make_live_status]
+    can_make_form_live = status == :not_started
+
+    {
+      task_name: live_task_name,
+      path: can_make_form_live ? make_live_path(@form.id) : "",
+      status: status,
+      active: can_make_form_live,
+    }
+  end
+
   def live_title_name
     return I18n.t("forms.task_list_create.make_form_live_section.title") if @form.is_archived?
 
@@ -225,12 +232,6 @@ def live_task_name
     I18n.t("forms.task_list_#{create_or_edit}.make_form_live_section.make_live")
   end
 
-  def live_path
-    return "" unless @form.all_ready_for_live?
-
-    make_live_path(@form.id)
-  end
-
   def statuses_by_user
     statuses = @task_statuses
 

app/services/form_task_list_service.rb

@@ -3,8 +3,12 @@ def initialize(form:)
     @form = form
   end
 
-  def mandatory_tasks_completed?
-    incomplete_tasks.empty?
+  def mandatory_tasks_completed?(ignore_missing_welsh: false)
+    if ignore_missing_welsh
+      incomplete_tasks.reject { |task| task == :missing_welsh_translations }.empty?
+    else
+      incomplete_tasks.empty?
+    end
   end
 
   def incomplete_tasks
@@ -15,6 +19,7 @@ def incomplete_tasks
       missing_contact_details: support_contact_details_status,
       share_preview_not_completed: share_preview_status,
       missing_welsh_translations: welsh_language_status,
+      missing_submission_email: submission_email_status,
     }.reject { |_k, v| %i[completed optional].include?(v) }.keys
   end
 
@@ -32,6 +37,21 @@ def task_statuses
       share_preview_status:,
       make_live_status:,
       welsh_language_status:,
+      submission_email_status:,
+      confirm_submission_email_status:,
+    }
+  end
+
+  def incomplete_email_tasks
+    {
+      missing_submission_email: submission_email_status,
+    }.reject { |_k, v| v == :completed }.keys
+  end
+
+  def email_task_statuses
+    {
+      submission_email_status:,
+      confirm_submission_email_status:,
     }
   end
 
@@ -114,7 +134,12 @@ def make_live_status
   end
 
   def make_live_status_for_draft
-    mandatory_tasks_completed? ? :not_started : :cannot_start
+    # If the form has a live Welsh version, we ignore missing Welsh translations
+    # and show the make live task and link. In this case, we will show a warning
+    # message on the make live page asking the user to update the Welsh before
+    # the form can be made live.
+    ignore_missing_welsh = @form.live_welsh_form_document.present?
+    mandatory_tasks_completed?(ignore_missing_welsh:) ? :not_started : :cannot_start
   end
 
   def welsh_translations_invalid
@@ -123,4 +148,22 @@ def welsh_translations_invalid
       translation_input.invalid?
     end
   end
+
+  def submission_email_status
+    {
+      email_set_without_confirmation: :completed,
+      not_started: :not_started,
+      sent: :in_progress,
+      confirmed: :completed,
+    }[@form.email_confirmation_status]
+  end
+
+  def confirm_submission_email_status
+    {
+      email_set_without_confirmation: :completed,
+      not_started: :cannot_start,
+      sent: :not_started,
+      confirmed: :completed,
+    }[@form.email_confirmation_status]
+  end
 end

app/services/task_status_service.rb

@@ -0,0 +1,16 @@
+<% set_page_title(t('page_titles.make_your_changes_to_english_live')) %>
+<% content_for :back_link, govuk_back_link_to(form_path, t("back_link.form_edit")) %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+      <h1 class="govuk-heading-l">
+        <span class="govuk-caption-l"><%= @current_form.name %></span>
+        <%= t("page_titles.make_your_changes_to_english_live") %>
+      </h1>
+
+      <%= t("make_your_changes_to_english_live.body_html", archive_welsh_link: archive_welsh_path) %>
+
+      <p> <%= govuk_link_to t("make_your_changes_to_english_live.continue_editing_link_text"), form_path %> </p>
+  </div>
+</div>
+

app/views/forms/make_live/make_your_changes_to_english_live.html.erb

@@ -1216,6 +1216,12 @@ en:
         <p>
           After you have made your form live, completed forms will be sent to <span class="govuk-!-text-break-word">%{submission_email}</span>.
         </p>
+  make_your_changes_to_english_live:
+    body_html: |
+      <p>You’ve updated your English form.<p>
+      <p>The English and Welsh versions must match before you can make your changes live.</p>
+      <p>If necessary, you can <a href="%{archive_welsh_link}">archive the Welsh version</a> to take it offline until you have new translations.</p>
+    continue_editing_link_text: Continue editing your form
   mark_complete:
     'false': No, I’ll come back later
     hint: Selecting ‘Yes’ will mark this task as complete. You’ll still be able to make changes if you need to.
@@ -1475,6 +1481,7 @@ en:
     make_archived_draft_live: Make your form live again
     make_changes_live: Make your changes live
     make_live: Make your form live
+    make_your_changes_to_english_live: Make the changes to your English form live
     missing_draft_question: There’s a problem with this page
     mou_signature_confirmation: You’ve agreed to the MOU
     mou_signature_new: GOV.UK Forms Memorandum of Understanding

config/locales/en.yml

@@ -942,35 +942,20 @@
 
   describe "#all_ready_for_live?" do
     before do
-      email_task_status_service = instance_double(EmailTaskStatusService)
-      allow(EmailTaskStatusService).to receive(:new).and_return(email_task_status_service)
-      allow(email_task_status_service).to receive(:ready_for_live?).and_return(email_tasks_completed)
-
       task_status_service = instance_double(TaskStatusService)
       allow(TaskStatusService).to receive(:new).and_return(task_status_service)
       allow(task_status_service).to receive(:mandatory_tasks_completed?).and_return(mandatory_tasks_completed)
     end
 
     context "when not all mandatory tasks have been completed" do
-      let(:email_tasks_completed) { true }
       let(:mandatory_tasks_completed) { false }
 
       it "returns false" do
         expect(form.all_ready_for_live?).to be false
       end
     end
 
-    context "when not all submission emails tasks have been completed" do
-      let(:email_tasks_completed) { false }
-      let(:mandatory_tasks_completed) { true }
-
-      it "returns false" do
-        expect(form.all_ready_for_live?).to be false
-      end
-    end
-
     context "when all mandatory tasks have been completed" do
-      let(:email_tasks_completed) { true }
       let(:mandatory_tasks_completed) { true }
 
       it "returns true" do

spec/models/form_spec.rb

@@ -17,16 +17,16 @@
       GroupForm.create!(form_id: form.id, group_id: group.id)
 
       login_as user
-
-      get make_live_path(form_id: form.id)
     end
 
     it "returns 200" do
+      get make_live_path(form_id: form.id)
       expect(response).to have_http_status(:ok)
     end
 
     context "when the form is being created for the first time" do
       it "renders make your form live" do
+        get make_live_path(form_id: form.id)
         expect(response).to render_template("make_your_form_live")
       end
     end
@@ -35,6 +35,7 @@
       let(:form) { create(:form, :live) }
 
       it "renders make your changes live" do
+        get make_live_path(form_id: form.id)
         expect(response).to render_template("make_your_changes_live")
       end
     end
@@ -43,6 +44,7 @@
       let(:form) { create(:form, :archived_with_draft) }
 
       it "renders make your changes live" do
+        get make_live_path(form_id: form.id)
         expect(response).to render_template("make_archived_draft_live")
       end
     end
@@ -51,9 +53,51 @@
       let(:group_role) { :editor }
 
       it "is forbidden" do
+        get make_live_path(form_id: form.id)
         expect(response).to have_http_status(:forbidden)
       end
     end
+
+    context "when the form has an existing live welsh form document" do
+      let(:form) do
+        create(:form, :with_welsh_translation,
+               support_email: "english@example.gov.uk",
+               support_email_cy: "welsh@example.gov.uk",
+               what_happens_next_markdown: "English what happens next",
+               what_happens_next_markdown_cy: "Welsh what happens next",
+               question_section_completed: true,
+               declaration_section_completed: true,
+               share_preview_completed: true,
+               privacy_policy_url: "https://www.gov.uk/english-privacy",
+               privacy_policy_url_cy: "https://www.gov.uk/welsh-privacy",
+               welsh_completed: true,
+               pages: [build(:page, question_text: "English question", question_text_cy: "Welsh question")])
+      end
+
+      before do
+        # Create the en and cy live FormDocuments
+        form.make_live!
+      end
+
+      context "and a complete welsh translations" do
+        it "renders make your changes live" do
+          get make_live_path(form_id: form.id)
+          expect(response).to render_template("make_your_changes_live")
+        end
+      end
+
+      context "and in progress welsh translations" do
+        before do
+          # Add a declaration in English only to the draft form
+          form.update!(declaration_markdown: "English declaration", share_preview_completed: true)
+        end
+
+        it "renders make your changes to english live" do
+          get make_live_path(form_id: form.id)
+          expect(response).to render_template("make_your_changes_to_english_live")
+        end
+      end
+    end
   end
 
   describe "#create" do