check if title text exists in display_title_text (#633)

* check if title text exists in display_title_text

* lint

* Remove all strings from title text in interruption screen

app/helpers/interruption_screen_helper.rb

@@ -22,20 +22,18 @@ module InterruptionScreenHelper
   end
 
   def display_title_text(title_text, case_log)
-    if title_text["arguments"]
+    return "" if title_text.nil?
-      translation_params = {}
+
-      title_text["arguments"].each do |argument|
+    translation_params = {}
-        value = if argument["label"]
+    arguments = title_text["arguments"] || {}
-                  case_log.form.get_question(argument["key"], case_log).answer_label(case_log).downcase
+    arguments.each do |argument|
-                else
+      value = if argument["label"]
-                  case_log.public_send(argument["key"])
+                case_log.form.get_question(argument["key"], case_log).answer_label(case_log).downcase
-                end
+              else
-        translation_params[argument["i18n_template"].to_sym] = value
+                case_log.public_send(argument["key"])
-      end
+              end
-      translation = I18n.t(title_text["translation"], **translation_params)
+      translation_params[argument["i18n_template"].to_sym] = value
-    else
-      translation = I18n.t(title_text)
     end
-    translation.to_s
+    I18n.t(title_text["translation"], **translation_params).to_s
   end
 end

config/forms/2021_2022.json

@@ -6884,7 +6884,7 @@
             },
             "net_income_value_check": {
               "depends_on": [{ "net_income_soft_validation_triggered?": true }],
-              "title_text": "soft_validations.net_income.title_text",
+              "title_text": { "translation": "soft_validations.net_income.title_text" },
               "informative_text": {
                 "translation": "soft_validations.net_income.hint_text",
                 "arguments": [
@@ -7779,6 +7779,16 @@
             },
             "min_rent_value_check": {
               "depends_on": [{ "rent_in_soft_min_range?": true }],
+              "title_text": {
+                "translation": "soft_validations.rent.min.title_text",
+                "arguments": [
+                  {
+                    "key": "brent",
+                    "label": true,
+                    "i18n_template": "brent"
+                  }
+                ]
+              },
               "informative_text": {
                 "translation": "soft_validations.rent.min.hint_text",
                 "arguments": [
@@ -7791,11 +7801,6 @@
                     "key": "soft_min_for_period",
                     "label": false,
                     "i18n_template": "soft_min_for_period"
-                  },
-                  {
-                    "key": "brent",
-                    "label": true,
-                    "i18n_template": "brent"
                   }
                 ]
               },
@@ -7818,6 +7823,16 @@
             },
             "max_rent_value_check": {
               "depends_on": [{ "rent_in_soft_max_range?": true }],
+              "title_text": {
+                "translation": "soft_validations.rent.max.title_text",
+                "arguments": [
+                  {
+                    "key": "brent",
+                    "label": true,
+                    "i18n_template": "brent"
+                  }
+                ]
+              },
               "informative_text": {
                 "translation": "soft_validations.rent.max.hint_text",
                 "arguments": [
@@ -7830,11 +7845,6 @@
                     "key": "soft_max_for_period",
                     "label": false,
                     "i18n_template": "soft_max_for_period"
-                  },
-                  {
-                    "key": "brent",
-                    "label": true,
-                    "i18n_template": "brent"
                   }
                 ]
               },

config/forms/2022_2023.json

@@ -6928,7 +6928,7 @@
             },
             "net_income_value_check": {
               "depends_on": [{ "net_income_soft_validation_triggered?": true }],
-              "title_text": "soft_validations.net_income.title_text",
+              "title_text": { "translation": "soft_validations.net_income.title_text" },
               "informative_text": {
                 "translation": "soft_validations.net_income.hint_text",
                 "arguments": [
@@ -7820,6 +7820,16 @@
             },
             "min_rent_value_check": {
               "depends_on": [{ "rent_in_soft_min_range?": true }],
+              "title_text": {
+                "translation": "soft_validations.rent.min.title_text",
+                "arguments": [
+                  {
+                    "key": "brent",
+                    "label": true,
+                    "i18n_template": "brent"
+                  }
+                ]
+              },
               "informative_text": {
                 "translation": "soft_validations.rent.min.hint_text",
                 "arguments": [
@@ -7832,11 +7842,6 @@
                     "key": "soft_min_for_period",
                     "label": false,
                     "i18n_template": "soft_min_for_period"
-                  },
-                  {
-                    "key": "brent",
-                    "label": true,
-                    "i18n_template": "brent"
                   }
                 ]
               },
@@ -7859,6 +7864,16 @@
             },
             "max_rent_value_check": {
               "depends_on": [{ "rent_in_soft_max_range?": true }],
+              "title_text": {
+                "translation": "soft_validations.rent.max.title_text",
+                "arguments": [
+                  {
+                    "key": "brent",
+                    "label": true,
+                    "i18n_template": "brent"
+                  }
+                ]
+              },
               "informative_text": {
                 "translation": "soft_validations.rent.max.hint_text",
                 "arguments": [
@@ -7871,11 +7886,6 @@
                     "key": "soft_max_for_period",
                     "label": false,
                     "i18n_template": "soft_max_for_period"
-                  },
-                  {
-                    "key": "brent",
-                    "label": true,
-                    "i18n_template": "brent"
                   }
                 ]
               },

config/locales/en.yml

@@ -240,9 +240,11 @@ en:
         message: "Net income is higher than expected based on the lead tenant’s working situation. Are you sure this is correct?"
     rent:
       min:
-        hint_text: '<h1 class="govuk-heading-l app-panel--interruption">You told us the rent is %{brent}</h1><p>The minimum rent for this type of property in %{la} is £%{soft_min_for_period}.</p>'
+        title_text: "You told us the rent is %{brent}"
+        hint_text: "The minimum rent for this type of property in %{la} is £%{soft_min_for_period}."
       max:
-        hint_text: '<h1 class="govuk-heading-l app-panel--interruption">You told us the rent is %{brent}</h1><p>The maximum rent for this type of property in %{la} is £%{soft_max_for_period}.</p>'
+        title_text: "You told us the rent is %{brent}"
+        hint_text: "The maximum rent for this type of property in %{la} is £%{soft_max_for_period}."
     retirement:
       min:
         title: "You told us this person is under %{age} and retired"

spec/fixtures/forms/2021_2022.json

@@ -600,7 +600,7 @@
               },
               "net_income_value_check": {
                 "depends_on": [{ "net_income_soft_validation_triggered?": true }],
-                "title_text": "soft_validations.net_income.title_text",
+                "title_text": { "translation": "soft_validations.net_income.title_text" },
                 "informative_text": {
                   "translation": "soft_validations.net_income.hint_text",
                   "arguments": [{

spec/helpers/interruption_screen_helper_spec.rb

@@ -100,7 +100,7 @@ RSpec.describe InterruptionScreenHelper do
   describe "display_title_text" do
     context "when title text has no arguments" do
       it "returns the correct title text" do
-        title_text = "test.title_text.no_argument"
+        title_text = { "translation" => "test.title_text.no_argument" }
         expect(display_title_text(title_text, case_log))
           .to eq(I18n.t("test.title_text.no_argument"))
       end
@@ -122,5 +122,17 @@ RSpec.describe InterruptionScreenHelper do
           .to eq(I18n.t("test.title_text.one_argument", ecstat1: case_log.form.get_question("ecstat1", case_log).answer_label(case_log).downcase))
       end
     end
+
+    context "when title text is not defined" do
+      it "returns an empty string" do
+        expect(display_title_text(nil, case_log)).to eq("")
+      end
+    end
+
+    context "when title text is empty string" do
+      it "returns an empty string" do
+        expect(display_title_text("", case_log)).to eq("")
+      end
+    end
   end
 end