Merge pull request #2717 from govuk-forms/add-separate-make-live-confirmations-for-each-language

Add separate make live confirmations for each language

Author: DavidBiddle

app/controllers/forms/make_language_live_controller.rb

@@ -0,0 +1,77 @@
+module Forms
+  class MakeLanguageLiveController < FormsController
+    def new
+      authorize current_form, :can_make_language_live?
+      return redirect_to form_path(form_id: current_form.id) unless current_form.can_make_language_live?(language: params[:language])
+
+      @make_language_live_input = MakeLiveInput.new(form: current_form)
+
+      render_new
+    end
+
+    def create
+      authorize current_form, :can_make_language_live?
+
+      @make_language_live_input = MakeLiveInput.new(**make_language_live_input_params)
+
+      return render_new(status: :unprocessable_content) unless @make_language_live_input.valid?
+      return redirect_to form_path(@make_language_live_input.form.id) unless @make_language_live_input.confirmed?
+      return redirect_to form_path(form_id: current_form.id) unless current_form.can_make_language_live?(language: params[:language])
+
+      @make_form_live_service = MakeFormLiveService.call(current_form:, current_user:, language: params[:language])
+      @make_form_live_service.make_language_live
+
+      if current_form.state_previously_changed?
+        OrgAdminAlertsService.new(form: current_form, current_user:).form_made_live
+      end
+
+      redirect_to make_language_live_show_confirmation_path
+    end
+
+    def show_confirmation
+      authorize current_form, :can_make_language_live?
+      @go_to_make_welsh_live_input = GoToMakeWelshLiveInput.new
+
+      render_confirmation
+    end
+
+    def submit_confirmation
+      authorize current_form, :can_make_language_live?
+
+      @go_to_make_welsh_live_input = GoToMakeWelshLiveInput.new(**go_to_make_welsh_live_input_params)
+
+      return render_confirmation(status: :unprocessable_content) unless @go_to_make_welsh_live_input.valid?
+
+      if @go_to_make_welsh_live_input.confirmed?
+        redirect_to make_language_live_path(language: "cy")
+      else
+        redirect_to form_path
+      end
+    end
+
+  private
+
+    def make_language_live_input_params
+      params.require(:forms_make_live_input).permit(:confirm).merge(form: current_form, language: params[:language])
+    end
+
+    def render_new(status: :ok)
+      render "new", status:, locals: { current_form:, language: params[:language] }
+    end
+
+    def render_confirmation(status: :ok)
+      @make_form_live_service = MakeFormLiveService.call(current_form:, current_user:, language: params[:language])
+
+      render "confirmation", status:, locals: {
+        current_form:,
+        confirmation_page_title: @make_form_live_service.page_title,
+        confirmation_page_body: @make_form_live_service.confirmation_page_body,
+        language: params[:language],
+      }
+    end
+
+    def go_to_make_welsh_live_input_params
+      params.require(:forms_go_to_make_welsh_live_input).permit(:confirm)
+    end
+  end
+end

app/controllers/forms/make_live_controller.rb

@@ -31,7 +31,7 @@ def make_live_input_params
     end
 
     def render_new(status: :ok)
-      if current_form.live_welsh_form_document.present? && current_form.task_statuses[:welsh_language_status] == :in_progress
+      if current_form.live_welsh_form_document.present? && current_form.all_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: }

app/input_objects/forms/go_to_make_welsh_live_input.rb

@@ -0,0 +1,2 @@
+class Forms::GoToMakeWelshLiveInput < ConfirmActionInput
+end

app/input_objects/forms/make_live_input.rb

@@ -1,5 +1,5 @@
 class Forms::MakeLiveInput < ConfirmActionInput
-  attr_accessor :form
+  attr_accessor :form, :language
 
   validate :required_parts_of_form_completed
 
@@ -8,12 +8,17 @@ class Forms::MakeLiveInput < ConfirmActionInput
   def required_parts_of_form_completed
     # we are valid and didn't need to save
     return unless confirmed?
-    return if form.all_ready_for_live?
+    return if form.all_ready_for_live?(ignore_missing_welsh:)
 
-    form.all_incomplete_tasks.each do |section|
+    form.all_incomplete_tasks(ignore_missing_welsh:).each do |section|
       errors.add(:confirm, section.to_sym)
     end
 
     errors.empty?
   end
+
+  def ignore_missing_welsh
+    # Ignore missing Welsh if we're only making the English version live
+    language == "en"
+  end
 end

app/models/form.rb

@@ -115,17 +115,13 @@ def marking_complete_with_errors
     errors.add(:base, :has_validation_errors, message: "Form has routing validation errors") if question_section_completed && has_routing_errors
   end
 
-  def ready_for_live
-    task_status_service.mandatory_tasks_completed?
+  def all_ready_for_live?(ignore_missing_welsh: false)
+    task_status_service.mandatory_tasks_completed?(ignore_missing_welsh:)
   end
 
-  def all_ready_for_live?
-    ready_for_live
-  end
-
-  delegate :incomplete_tasks, to: :task_status_service
+  delegate :all_incomplete_tasks, to: :task_status_service
 
-  delegate :task_statuses, to: :task_status_service
+  delegate :all_task_statuses, to: :task_status_service
 
   def group
     group_form&.group
@@ -149,14 +145,6 @@ def has_no_remaining_routes_available?
     qualifying_route_pages.none? && has_routing_conditions
   end
 
-  def all_incomplete_tasks
-    incomplete_tasks
-  end
-
-  def all_task_statuses
-    task_statuses
-  end
-
   def page_number(page)
     return pages.length + 1 if page.nil?
     return pages.length + 1 if page.id.nil?
@@ -238,6 +226,12 @@ def next_page_after(current_page)
     pair&.last
   end
 
+  def can_make_language_live?(language:)
+    return can_make_english_version_live? if language == "en"
+
+    can_make_welsh_version_live? if language == "cy"
+  end
+
 private
 
   def set_external_id
@@ -281,6 +275,30 @@ def after_make_live
     FormDocumentSyncService.new(self).synchronize_live_form
   end
 
+  def before_make_english_live
+    before_make_live
+  end
+
+  def after_make_english_live
+    FormDocumentSyncService.new(self).synchronize_only_live_english_form
+  end
+
+  def before_make_welsh_live
+    before_make_live
+  end
+
+  def after_make_welsh_live
+    FormDocumentSyncService.new(self).synchronize_only_live_welsh_form
+  end
+
+  def can_make_english_version_live?
+    has_draft_version && all_ready_for_live?(ignore_missing_welsh: true) && live_welsh_form_document.blank?
+  end
+
+  def can_make_welsh_version_live?
+    has_live_version && all_ready_for_live? && welsh_completed? && live_form_document.present? && live_welsh_form_document.blank?
+  end
+
   def after_archive
     FormDocumentSyncService.new(self).synchronize_archived_form
   end

app/policies/form_policy.rb

@@ -30,6 +30,12 @@ def can_make_form_live?
     false
   end
 
+  def can_make_language_live?
+    return can_view_form? if form.group&.active? && can_administer_group?
+
+    false
+  end
+
   def can_administer_group?
     user.super_admin? || user.is_organisations_admin?(form.group&.organisation) || user.is_group_admin?(form.group)
   end

app/services/form_document_sync_service.rb

@@ -52,6 +52,44 @@ def synchronize_archived_welsh_form
     end
   end
 
+  def synchronize_only_live_english_form
+    FormDocument.transaction do
+      # If we've already made the Welsh version live, changes to the Welsh version must be made live at the same time by calling a different method
+      raise ActiveRecord::RecordNotFound, "Cannot make changes to only the live English form if there is already a live Welsh version." if FormDocument.where(form:, tag: LIVE_TAG, language: "cy").exists?
+
+      content = form_content("en", live_at: form.updated_at)
+      update_or_create_form_document(LIVE_TAG, content, "en")
+
+      # Update the content of the live English version to to not include Welsh in available_languages
+      FormDocument.where(form:, tag: [LIVE_TAG], language: "en").find_each do |live_document|
+        live_document.content["available_languages"] = %w[en]
+        live_document.save!
+      end
+
+      # A new live version replaces any previous archived version
+      delete_form_documents_by_tag(ARCHIVED_TAG)
+    end
+  end
+
+  def synchronize_only_live_welsh_form
+    FormDocument.transaction do
+      # Ensure we only make Welsh version live if there is already an existing live English version
+      raise ActiveRecord::RecordNotFound, "Cannot make Welsh version live unless there is already a live English version." unless FormDocument.where(form:, tag: LIVE_TAG, language: "en").exists?
+
+      content = form_content("cy", live_at: form.updated_at)
+      update_or_create_form_document(LIVE_TAG, content, "cy")
+
+      # Update the content of the live English version to show that it now supports Welsh
+      FormDocument.where(form:, tag: [LIVE_TAG], language: "en").find_each do |live_document|
+        live_document.content["available_languages"] = %w[en cy]
+        live_document.save!
+      end
+
+      # A new live version replaces any previous archived version
+      delete_form_documents_by_tag(ARCHIVED_TAG)
+    end
+  end
+
   def update_draft_form_document
     synchronize_documents_for_tag(DRAFT_TAG)
   end
@@ -79,6 +117,7 @@ def update_or_create_form_document(tag, content, language)
       language:,
     )
     form_document.content = content
+
     form_document.save!
   end
 

app/services/make_form_live_service.rb

@@ -5,12 +5,13 @@ def call(**args)
     end
   end
 
-  def initialize(current_form:, current_user:)
+  def initialize(current_form:, current_user:, language: nil)
     @current_form = current_form
     @current_form_was_live = current_form.is_live?
     @current_form_was_archived = current_form.is_archived?
     @current_live_form = FormDocument::Content.from_form_document(current_form.live_form_document) if current_form.is_live?
     @current_user = current_user
+    @language = language
   end
 
   def make_live
@@ -26,9 +27,19 @@ def make_live
     end
   end
 
+  def make_language_live
+    if @language == "en"
+      make_english_live
+    else
+      make_welsh_live
+    end
+  end
+
   def page_title
     return I18n.t("page_titles.your_form_is_live") if @current_form_was_archived
+    return I18n.t("page_titles.your_welsh_form_is_live") if @current_form_was_live && @language == "cy"
     return I18n.t("page_titles.your_changes_are_live") if @current_form_was_live
+    return I18n.t("page_titles.your_english_form_is_live") if @language == "en"
 
     I18n.t("page_titles.your_form_is_live")
   end
@@ -37,13 +48,22 @@ def confirmation_page_body
     return I18n.t("make_changes_live.confirmation.body_html_cy").html_safe if @current_form_was_live && @current_form.has_welsh_translation?
     return I18n.t("make_changes_live.confirmation.body_html").html_safe if @current_form_was_live
 
+    return I18n.t("make_live.confirmation.body_individual_language_html").html_safe if @language.present?
     return I18n.t("make_live.confirmation.body_html_cy").html_safe if @current_form.has_welsh_translation?
 
     I18n.t("make_live.confirmation.body_html").html_safe
   end
 
 private
 
+  def make_english_live
+    @current_form.make_english_version_live!
+  end
+
+  def make_welsh_live
+    @current_form.make_welsh_version_live!
+  end
+
   def live_form_submission_email_has_changed
     @current_form_was_live && @current_live_form.submission_email != @current_form.submission_email
   end

app/services/task_status_service.rb

@@ -5,14 +5,12 @@ def initialize(form:, current_user:)
   end
 
   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
+    all_incomplete_tasks(ignore_missing_welsh:).empty?
   end
 
-  def incomplete_tasks
+  def all_incomplete_tasks(ignore_missing_welsh: false)
+    keys_to_skip = [(:missing_welsh_translations if ignore_missing_welsh)]
+    values_to_skip = %i[completed optional]
     {
       missing_pages: pages_status,
       missing_what_happens_next: what_happens_next_status,
@@ -21,10 +19,10 @@ def incomplete_tasks
       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
+    }.reject { |k, v| keys_to_skip.include?(k) || values_to_skip.include?(v) }.keys
   end
 
-  def task_statuses
+  def all_task_statuses
     {
       name_status:,
       pages_status:,

app/state_machines/form_state_machine.rb

@@ -30,7 +30,21 @@ module FormStateMachine
         before :before_make_live
         after :after_make_live
 
-        transitions from: %i[draft live_with_draft archived archived_with_draft], to: :live, guard: :ready_for_live
+        transitions from: %i[draft live_with_draft archived archived_with_draft], to: :live, guard: :all_ready_for_live?
+      end
+
+      event :make_english_version_live do
+        before :before_make_english_live
+        after :after_make_english_live
+
+        transitions from: %i[draft live live_with_draft archived_with_draft], to: :live, guard: :can_make_english_version_live?
+      end
+
+      event :make_welsh_version_live do
+        before :before_make_welsh_live
+        after :after_make_welsh_live
+
+        transitions from: %i[live live_with_draft], to: :live, guard: :can_make_welsh_version_live?
       end
 
       event :create_draft_from_live_form do