+ You have added a list of options that is very large, exceeds 30 options. To add translations for this list you need to download a copy of your form and upload it with all of the translations for each option. We will only update translations added to the upload file, meaning if you have already added a translation you can leave it in the downloaded file or leave that cell blank and this will not change your current translation. +
+ <% end %> + <% hidden_selection_option_fields = [] %> <%= govuk_table(classes: @table_presenter.two_column_classes) do |table| %> <%= table.with_caption(size: 's', text: t("forms.welsh_translation.new.section_headings.selection_options", question_number: page_form.object.page.position), @@ -131,22 +138,29 @@ <%= table.with_body do |body| %> <% page_form.fields_for :selection_options_cy, page_form.object.selection_options_cy do |selection_options_form| %> - <%= body.with_row do |row| %> - <%= row.with_cell(text: page_form.object.page.answer_settings.selection_options[selection_options_form.index].name) %> - <%= row.with_cell do %> - <%= selection_options_form.hidden_field :id %> - <%= selection_options_form.govuk_text_field :name_cy, - id: selection_options_form.object.form_field_id(:name_cy), - label: { - text: t("helpers.label.forms_welsh_page_translation_input.selection_options_cy_html", question_number: page_form.object.page.position, option_number: selection_options_form.index + 1), for: selection_options_form.object.form_field_id(:name_cy), - lang: "cy" - } - %> + <% if selection_options_form.object.show_name_input? %> + <%= body.with_row do |row| %> + <%= row.with_cell(text: page_form.object.page.answer_settings.selection_options[selection_options_form.index].name) %> + <%= row.with_cell do %> + <%= selection_options_form.hidden_field :id %> + <%= selection_options_form.govuk_text_field :name_cy, + id: selection_options_form.object.form_field_id(:name_cy), + label: { + text: t("helpers.label.forms_welsh_page_translation_input.selection_options_cy_html", question_number: page_form.object.page.position, option_number: selection_options_form.index + 1), for: selection_options_form.object.form_field_id(:name_cy), + lang: "cy" + } + %> + <% end %> <% end %> + <% else %> + <% hidden_selection_option_fields << selection_options_form.hidden_field(:id) %> + <% hidden_selection_option_fields << selection_options_form.hidden_field(:name_cy) %> <% end %> <% end %> <% end %> <% end %> + + <%= safe_join(hidden_selection_option_fields) %> <% end %> <% end %> <% end %> diff --git a/app/views/forms/welsh_translation/show_upload.html.erb b/app/views/forms/welsh_translation/show_upload.html.erb new file mode 100644 index 0000000000..1056262757 --- /dev/null +++ b/app/views/forms/welsh_translation/show_upload.html.erb @@ -0,0 +1,21 @@ +<% set_page_title(t(".title")) %> +<% content_for :back_link, govuk_back_link_to(welsh_translation_path(current_form)) %> + +We’ll send an email to members of the current group to let them know the form has moved and they may no longer have access to it.
\n" diff --git a/config/locales/input_objects/welsh_translation_upload.yml b/config/locales/input_objects/welsh_translation_upload.yml new file mode 100644 index 0000000000..1fbf202eae --- /dev/null +++ b/config/locales/input_objects/welsh_translation_upload.yml @@ -0,0 +1,18 @@ +--- +en: + activemodel: + errors: + models: + forms/welsh_translation_upload_input: + attributes: + file: + blank: Choose a file + disallowed_type: The selected file must be a CSV, XLSX, or ODS + invalid_csv: The spreadsheet is not in the correct format. Download the content as a CSV file, fill in the translations, and upload it again. + helpers: + hint: + forms_welsh_translation_upload_input: + file: Supported file types are CSV, XLSX, and ODS + label: + forms_welsh_translation_upload_input: + file: Upload a spreadsheet with your Welsh translations diff --git a/config/routes.rb b/config/routes.rb index 28d0d5024c..537a2b09c3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -81,6 +81,8 @@ delete "/welsh-translation/delete" => "forms/welsh_translation#destroy", as: :welsh_translation_destroy post "/welsh-translation-preview" => "forms/welsh_translation#render_preview", as: :welsh_translation_render_preview get "/welsh-translation-download" => "forms/welsh_translation#download", as: :welsh_translation_download + get "/welsh-translation-upload" => "forms/welsh_translation#show_upload", as: :welsh_translation_show_upload + post "/welsh-translation-upload" => "forms/welsh_translation#upload", as: :welsh_translation_upload get "/submission-attachments" => "forms/submission_attachments#new", as: :submission_attachments post "/submission-attachments" => "forms/submission_attachments#create", as: :submission_attachments_create get "/batch-submissions" => "forms/batch_submissions#new", as: :batch_submissions diff --git a/spec/input_objects/forms/welsh_condition_translation_input_spec.rb b/spec/input_objects/forms/welsh_condition_translation_input_spec.rb index 3b91a11fad..27bebdc51d 100644 --- a/spec/input_objects/forms/welsh_condition_translation_input_spec.rb +++ b/spec/input_objects/forms/welsh_condition_translation_input_spec.rb @@ -218,8 +218,8 @@ def create_condition(attributes = {}) end it "returns the custom ID for each attribute" do - expect(welsh_condition_translation_input.form_field_id(:exit_page_markdown_cy)).to eq "forms_welsh_condition_translation_input_#{condition.id}_condition_translations_exit_page_markdown_cy" - expect(welsh_condition_translation_input.form_field_id(:exit_page_heading_cy)).to eq "forms_welsh_condition_translation_input_#{condition.id}_condition_translations_exit_page_heading_cy" + expect(welsh_condition_translation_input.form_field_id(:exit_page_markdown_cy)).to eq "condition_#{condition.id}_exit_page_markdown_cy" + expect(welsh_condition_translation_input.form_field_id(:exit_page_heading_cy)).to eq "condition_#{condition.id}_exit_page_heading_cy" end end diff --git a/spec/input_objects/forms/welsh_page_translation_input_spec.rb b/spec/input_objects/forms/welsh_page_translation_input_spec.rb index eaf59b06d5..90957d347a 100644 --- a/spec/input_objects/forms/welsh_page_translation_input_spec.rb +++ b/spec/input_objects/forms/welsh_page_translation_input_spec.rb @@ -460,6 +460,22 @@ def create_page(attributes = {}) expect(page.reload.answer_settings_cy.selection_options.second.name).to eq("welsh option 2") expect(page.reload.answer_settings_cy.selection_options.second.value).to eq("Option 2") end + + context "when the submitted selection options are not in index order" do + let(:new_input_data) do + super().merge({ selection_options_cy_attributes: { + "0" => { "id" => "1", "name_cy" => "welsh option 2" }, + "1" => { "id" => "0", "name_cy" => "welsh option 1" }, + } }) + end + + it "saves the selection options in the original English order" do + welsh_page_translation_input.submit + + expect(page.reload.answer_settings_cy.selection_options.map(&:name)).to eq(["welsh option 1", "welsh option 2"]) + expect(page.reload.answer_settings_cy.selection_options.map(&:value)).to eq(["Option 1", "Option 2"]) + end + end end context "when the page has a selection question with none of the above" do diff --git a/spec/input_objects/forms/welsh_selection_option_translation_input_spec.rb b/spec/input_objects/forms/welsh_selection_option_translation_input_spec.rb index 13234a1f59..cba87e34c4 100644 --- a/spec/input_objects/forms/welsh_selection_option_translation_input_spec.rb +++ b/spec/input_objects/forms/welsh_selection_option_translation_input_spec.rb @@ -107,4 +107,43 @@ end end end + + describe "#show_name_input?" do + context "when the page has 30 or fewer selection options" do + it "shows the input regardless of whether the name has a value" do + expect(welsh_selection_option_translation_input.show_name_input?).to be true + end + end + + context "when the page has more than 30 selection options" do + let(:page) { build(:page, :selection_with_autocomplete, id: 747) } + let(:selection_option_cy) { DataStruct.new(name: "Option 1", value: page.answer_settings.selection_options.first["value"]) } + + context "when the selection option already has a Welsh value" do + let(:new_input_data) { super().merge(name_cy: "Welsh option") } + + it "hides the input" do + expect(welsh_selection_option_translation_input.show_name_input?).to be false + end + end + + context "when the selection option does not have a Welsh value" do + let(:new_input_data) { super().merge(name_cy: "") } + + it "shows the input" do + expect(welsh_selection_option_translation_input.show_name_input?).to be true + end + end + + context "when the selection option has validation errors" do + let(:new_input_data) { super().merge(name_cy: "a" * 251) } + + it "shows the input" do + welsh_selection_option_translation_input.validate + + expect(welsh_selection_option_translation_input.show_name_input?).to be true + end + end + end + end end diff --git a/spec/requests/forms/welsh_translation_controller_spec.rb b/spec/requests/forms/welsh_translation_controller_spec.rb index 8afcec163b..d904e59d9d 100644 --- a/spec/requests/forms/welsh_translation_controller_spec.rb +++ b/spec/requests/forms/welsh_translation_controller_spec.rb @@ -293,8 +293,66 @@ it "returns a CSV with a header row and and content" do csv = CSV.parse(response.body) - expect(csv.first).to eq(["", "English content", "Welsh content"]) - expect(csv.second).to eq(["Form name", "A form with Welsh", "Welsh A form with Welsh"]) + expect(csv.first).to eq(["Identifier (do not change)", "Content", "English content", "Welsh content"]) + expect(csv.second).to eq(["name", "Form name", "A form with Welsh", "Welsh A form with Welsh"]) + end + end + + describe "#upload" do + let(:form) { create(:form, :ready_for_routing, welsh_completed: false) } + + let(:csv_data) do + CSV.generate do |csv| + csv << [WelshSpreadsheetImportService::ID_COLUMN, "Content", "English content", "Welsh content"] + csv << ["name", "Form name", form.name, "Fy Ffurflen"] + end + end + + let(:file) do + file = Tempfile.new(["translations", ".csv"]) + file.write(csv_data) + file.rewind + Rack::Test::UploadedFile.new(file.path, "text/csv", original_filename: "translations.csv") + end + + context "when a valid CSV is uploaded" do + before do + post welsh_translation_upload_path(id), params: { forms_welsh_translation_upload_input: { file: } } + end + + it "renders the new template" do + expect(response).to have_http_status(:ok) + expect(response).to render_template(:new) + end + + it "pre-populates form name from CSV" do + expect(response.body).to include("Fy Ffurflen") + end + end + + context "when no file is provided" do + before do + post welsh_translation_upload_path(id), params: { forms_welsh_translation_upload_input: { file: nil } } + end + + it "renders the upload file page with an error" do + expect(response).to have_http_status(:unprocessable_content) + expect(response).to render_template(:show_upload) + expect(response.body).to include(I18n.t("activemodel.errors.models.forms/welsh_translation_upload_input.attributes.file.blank")) + expect(flash).to be_empty + end + end + + context "when the user is not authorized" do + let(:current_user) { build :user } + + before do + post welsh_translation_upload_path(id), params: { file: } + end + + it "returns 403" do + expect(response).to have_http_status(:forbidden) + end end end end diff --git a/spec/services/welsh_csv_service_spec.rb b/spec/services/welsh_csv_service_spec.rb index 17eb6e4473..5a4b769733 100644 --- a/spec/services/welsh_csv_service_spec.rb +++ b/spec/services/welsh_csv_service_spec.rb @@ -5,15 +5,12 @@ let(:form) { build :form } it "contains the header row" do - expect(csv_rows(form)[0]).to contain_exactly( - "", - "English content", - "Welsh content", - ) + expect(csv_rows(form)[0]).to eq(["Identifier (do not change)", "Content", "English content", "Welsh content"]) end it "contains the form name" do expect(csv_rows(form)).to include([ + "name", "Form name", form.name, form.name_cy, @@ -25,6 +22,7 @@ it "contains the declaration" do expect(csv_rows(form)).to include([ + "declaration_markdown", "Declaration", "Declaration text", "Welsh Declaration text", @@ -37,6 +35,7 @@ it "contains the what happens next" do expect(csv_rows(form)).to include([ + "what_happens_next_markdown", "Information about what happens next", "What happens next text", "Welsh What happens next text", @@ -49,7 +48,8 @@ it "contains the payment URL" do expect(csv_rows(form)).to include([ - "GOV.UK Pay payment link", + "payment_url", + "GOV\u2060.\u2060UK Pay payment link", "https://www.gov.uk/payment", "https://www.gov.uk/payment_cy", ]) @@ -62,6 +62,7 @@ it "contains the support email" do expect(csv_rows(form)).to include([ + "support_email", "Contact details for support - email address", "support@example.gov.uk", "support@example.gov.uk", @@ -74,6 +75,7 @@ it "contains the support phone" do expect(csv_rows(form)).to include([ + "support_phone", "Contact details for support - phone number and opening times", "English support phone", "Welsh support phone", @@ -86,6 +88,7 @@ it "contains the support URL" do expect(csv_rows(form)).to include([ + "support_url", "Contact details for support - online contact link", "https://www.gov.uk/support", "https://www.gov.uk/support_cy", @@ -94,6 +97,7 @@ it "contains the support URL text" do expect(csv_rows(form)).to include([ + "support_url_text", "Contact details for support - online contact link text", "Text to describe the contact link", "Welsh Text to describe the contact link", @@ -116,6 +120,7 @@ it "contains the question text" do expect(csv_rows(form)).to include([ + "page_#{page.id}_question_text", "Question 1 - question text", "Question text", "Welsh question text", @@ -129,6 +134,7 @@ it "contains the hint text" do expect(csv_rows(form)).to include([ + "page_#{page.id}_hint_text", "Question 1 - hint text", "Hint text", "Welsh hint text", @@ -154,10 +160,12 @@ it "contains the options" do expect(csv_rows(form)).to include([ + "page_#{page.id}_option_0", "Question 1 - option 1", "Yes", "Ydy", ], [ + "page_#{page.id}_option_1", "Question 1 - option 2", "No", "Nac ydy", @@ -177,10 +185,12 @@ it "contains the guidance" do expect(csv_rows(form)).to include([ + "page_#{page.id}_guidance_markdown", "Question 1 - guidance text", "Markdown", "Welsh markdown", ], [ + "page_#{page.id}_page_heading", "Question 1 - page heading", "Page heading", "Welsh page heading", @@ -201,7 +211,8 @@ it "contains the none of the above question" do expect(csv_rows(form)).to include([ - "Question 1 - question or label if ‘None of the above’ is selected", + "page_#{page.id}_none_of_the_above_question", + "Question 1 - question or label if 'None of the above' is selected", "None of the above question?", "Welsh None of the above question?", ]) @@ -215,6 +226,7 @@ it "contains the exit page heading" do expect(csv_rows(form)).to include([ + "condition_#{condition.id}_exit_page_heading", "Question 1 - exit page heading", "Exit page heading", "Welsh exit page heading", @@ -261,25 +273,27 @@ it "returns a CSV with a header row and the expected rows" do csv = csv_rows(form) - expected_csv = [["", "English content", "Welsh content"], - ["Form name", "A form", "Welsh A form"], - ["Question 1 - question text", "None of the above question?", "Welsh None of the above question?"], - ["Question 1 - option 1", "Option 1", "Option 1"], - ["Question 1 - option 2", "Option 2", "Option 2"], - ["Question 1 - question or label if ‘None of the above’ is selected", "None of the above question?", "Welsh None of the above question?"], - ["Question 1 - exit page heading", "Exit page heading", "Welsh exit page heading"], - ["Question 1 - exit page content", "Exit page markdown", "Welsh exit page markdown"], - ["Question 2 - page heading", "Page heading", "Welsh Page heading"], - ["Question 2 - guidance text", "This is the guidance.", "Welsh This is the guidance."], - ["Question 2 - question text", "What?", "Welsh What?"], - ["Declaration", "Declaration text", ""], - ["Information about what happens next", "English what happens next", "Welsh what happens next"], - ["GOV.UK Pay payment link", "https://www.gov.uk/payment", "https://www.gov.uk/payment_cy"], - ["Link to privacy information for this form", "https://www.gov.uk/privacy", ""], - ["Contact details for support - email address", "support@example.gov.uk", "support@example.gov.uk"], - ["Contact details for support - phone number and opening times", "English support phone", "Welsh support phone"], - ["Contact details for support - online contact link", "https://www.gov.uk/support", "https://www.gov.uk/support_cy"], - ["Contact details for support - online contact link text", "Support URL text", "Welsh Support URL text"]] + expected_csv = [ + ["Identifier (do not change)", "Content", "English content", "Welsh content"], + ["name", "Form name", "A form", "Welsh A form"], + ["page_#{page.id}_question_text", "Question 1 - question text", "None of the above question?", "Welsh None of the above question?"], + ["page_#{page.id}_option_0", "Question 1 - option 1", "Option 1", "Option 1"], + ["page_#{page.id}_option_1", "Question 1 - option 2", "Option 2", "Option 2"], + ["page_#{page.id}_none_of_the_above_question", "Question 1 - question or label if 'None of the above' is selected", "None of the above question?", "Welsh None of the above question?"], + ["condition_#{condition.id}_exit_page_heading", "Question 1 - exit page heading", "Exit page heading", "Welsh exit page heading"], + ["condition_#{condition.id}_exit_page_markdown", "Question 1 - exit page content", "Exit page markdown", "Welsh exit page markdown"], + ["page_#{another_page.id}_page_heading", "Question 2 - page heading", "Page heading", "Welsh Page heading"], + ["page_#{another_page.id}_guidance_markdown", "Question 2 - guidance text", "This is the guidance.", "Welsh This is the guidance."], + ["page_#{another_page.id}_question_text", "Question 2 - question text", "What?", "Welsh What?"], + ["declaration_markdown", "Declaration", "Declaration text", ""], + ["what_happens_next_markdown", "Information about what happens next", "English what happens next", "Welsh what happens next"], + ["payment_url", "GOV\u2060.\u2060UK Pay payment link", "https://www.gov.uk/payment", "https://www.gov.uk/payment_cy"], + ["privacy_policy_url", "Link to privacy information for this form", "https://www.gov.uk/privacy", ""], + ["support_email", "Contact details for support - email address", "support@example.gov.uk", "support@example.gov.uk"], + ["support_phone", "Contact details for support - phone number and opening times", "English support phone", "Welsh support phone"], + ["support_url", "Contact details for support - online contact link", "https://www.gov.uk/support", "https://www.gov.uk/support_cy"], + ["support_url_text", "Contact details for support - online contact link text", "Support URL text", "Welsh Support URL text"], + ] expect(csv).to eq(expected_csv) end end diff --git a/spec/views/forms/welsh_translation/new.html.erb_spec.rb b/spec/views/forms/welsh_translation/new.html.erb_spec.rb index 235a3dea69..0e9d28f0be 100644 --- a/spec/views/forms/welsh_translation/new.html.erb_spec.rb +++ b/spec/views/forms/welsh_translation/new.html.erb_spec.rb @@ -232,7 +232,7 @@ def build_form(attributes = {}) let(:welsh_translation_input) { Forms::WelshTranslationInput.new(form:, page_translations: []).assign_form_values } it "does not render any page translation content" do - expect(rendered).not_to have_field(id: "forms_welsh_page_translation_input_#{page.id}_page_translations_question_text_cy", type: "text") + expect(rendered).not_to have_field(id: "page_#{page.id}_question_text_cy", type: "text") end it "renders message for no pages" do @@ -242,8 +242,8 @@ def build_form(attributes = {}) context "when the form has pages" do it "has a field for each page's Welsh question text" do - expect(rendered).to have_field("Enter Welsh question text for question #{page.position}", type: "text", id: "forms_welsh_page_translation_input_#{page.id}_page_translations_question_text_cy") - expect(rendered).to have_field("Enter Welsh question text for question #{another_page.position}", type: "text", id: "forms_welsh_page_translation_input_#{another_page.id}_page_translations_question_text_cy") + expect(rendered).to have_field("Enter Welsh question text for question #{page.position}", type: "text", id: "page_#{page.id}_question_text_cy") + expect(rendered).to have_field("Enter Welsh question text for question #{another_page.position}", type: "text", id: "page_#{another_page.id}_question_text_cy") end context "when a page has hint text" do @@ -252,7 +252,7 @@ def build_form(attributes = {}) it "shows the English text and Welsh field for pages with English hint text" do expect(rendered).to have_css("td", text: page.hint_text) - expect(rendered).to have_field("Enter Welsh hint text for question #{page.position}", type: "textarea", id: "forms_welsh_page_translation_input_#{page.id}_page_translations_hint_text_cy") + expect(rendered).to have_field("Enter Welsh hint text for question #{page.position}", type: "textarea", id: "page_#{page.id}_hint_text_cy") end it "does not show the Welsh field for pages without English hint text" do @@ -266,9 +266,9 @@ def build_form(attributes = {}) it "shows the English text and Welsh fields for pages with English page heading and guidance markdown" do expect(rendered).to have_css("td", text: another_page.page_heading) - expect(rendered).to have_field("Enter Welsh page heading for question #{another_page.position}", id: "forms_welsh_page_translation_input_#{another_page.id}_page_translations_page_heading_cy") + expect(rendered).to have_field("Enter Welsh page heading for question #{another_page.position}", id: "page_#{another_page.id}_page_heading_cy") expect(rendered).to have_css("td", text: another_page.guidance_markdown) - expect(rendered).to have_field("Enter Welsh guidance text for question #{another_page.position}", id: "forms_welsh_page_translation_input_#{another_page.id}_page_translations_guidance_markdown_cy") + expect(rendered).to have_field("Enter Welsh guidance text for question #{another_page.position}", id: "page_#{another_page.id}_guidance_markdown_cy") end it "does not show the Welsh field for pages without English page heading and guidance markdown" do @@ -291,6 +291,33 @@ def build_form(attributes = {}) expect(rendered).to have_css("td", text: page.answer_settings.selection_options.second["name"]) expect(rendered).to have_field("Enter Welsh option 2") end + + it "does not show the large list guidance text" do + expect(rendered).not_to have_text("You have added a list of options that is very large, exceeds 30 options.") + end + + context "when the page has more than 30 selection options" do + let(:page) { create :page, :selection_with_autocomplete } + + let(:welsh_translation_input) do + super().tap do |input| + selection_options_input = input.page_translations.find { |page_translation| page_translation.page == page } + + selection_options_input.selection_options_cy.each_with_index do |selection_option, index| + selection_option.name_cy = index < 2 ? "" : "Welsh option #{index + 1}" + end + end + end + + it "renders inputs only for blank selection options and preserves the rest with hidden fields" do + visible_selection_option_fields = "input[type='text'][id^='forms_welsh_selection_option_translation_input_#{page.id}_selection_options_cy_']" + hidden_selection_option_fields = "input[type='hidden'][name*='selection_options_cy'][name$='[name_cy]']" + + expect(rendered).to have_text("You have added a list of options that is very large, exceeds 30 options. To add translations for this list you need to download a copy of your form and upload it with all of the translations for each option. We will only update translations added to the upload file, meaning if you have already added a translation you can leave it in the downloaded file or leave that cell blank and this will not change your current translation.") + expect(rendered).to have_css(visible_selection_option_fields, count: 2) + expect(rendered).to have_css(hidden_selection_option_fields, count: 29, visible: :all) + end + end end context "when a page has a selection question with none of the above" do @@ -368,7 +395,7 @@ def build_form(attributes = {}) it "links the error summary to the invalid field" do error_message = I18n.t("activemodel.errors.models.forms/welsh_page_translation_input.attributes.question_text_cy.blank", question_number: page.position) - expect(rendered).to have_link(error_message, href: "#forms_welsh_page_translation_input_#{page.id}_page_translations_question_text_cy") + expect(rendered).to have_link(error_message, href: "#page_#{page.id}_question_text_cy") end it "adds an inline error message to the invalid field" do @@ -396,7 +423,7 @@ def build_form(attributes = {}) it "links the error summary to the invalid field" do error_message = I18n.t("activemodel.errors.models.forms/welsh_condition_translation_input.attributes.exit_page_heading_cy.blank", question_number: page.position) - expect(rendered).to have_link(error_message, href: "#forms_welsh_condition_translation_input_#{condition.id}_condition_translations_exit_page_heading_cy") + expect(rendered).to have_link(error_message, href: "#condition_#{condition.id}_exit_page_heading_cy") end it "adds an inline error message to the invalid field" do