Merge branch 'main' into OLH-2437

govuk-one-login · Feb 20, 2025 · de50c97 · de50c97
2 parents d8a2064 + b5535dd
commit de50c97
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 18 deletions.
diff --git a/clients/dfeApplyForTeacherTraining.ts b/clients/dfeApplyForTeacherTraining.ts
@@ -18,7 +18,7 @@ const dfeApplyForTeacherTraining: Client = {
       description: "Apply for a teacher training course to teach in England.",
       linkText: "Go to your Apply for teacher training account",
       linkUrl:
-        "https://www.apply-for-teacher-training.service.gov.uk/candidate/",
+        "https://www.apply-for-teacher-training.service.gov.uk/candidate/account",
     },
   },
 };

diff --git a/clients/hmrc.ts b/clients/hmrc.ts
@@ -17,12 +17,21 @@ const hmrc: Client = {
       header: "A service run by HM Revenue and Customs (HMRC)",
       linkText: "Find the HMRC service you need",
       linkUrl: "https://www.gov.uk/government/organisations/hm-revenue-customs",
+      hintText: "For example services about tax, childcare, or state pensions.",
+      paragraph1:
+        "At the moment, GOV.UK One Login cannot show you which HMRC service you’ve used.",
+      paragraph2: "We’re working to make this possible.",
     },
     cy: {
       header: "Gwasanaeth a weithredir gan Gyllid a Thollau EF (CThEF)",
       linkText: "Dod o hyd i wasanaeth CThEF rydych ei angen",
       linkUrl:
         "https://www.gov.uk/government/organisations/hm-revenue-customs.cy",
+      hintText:
+        "Er enghraifft gwasanaethau am dreth, gofal plant, neu bensiynau'r wladwriaeth.",
+      paragraph1:
+        "Ar hyn o bryd, ni all GOV.UK One Login ddangos i chi pa wasanaeth CThEF rydych wedi'i ddefnyddio.",
+      paragraph2: "Rydym yn gweithio i wneud hyn yn bosibl.",
     },
   },
 };

diff --git a/interfaces/client.interface.ts b/interfaces/client.interface.ts
@@ -11,6 +11,9 @@ interface Translations {
   description?: string;
   linkText: string;
   linkUrl: EnvironmentValue<string>;
+  hintText?: string;
+  paragraph1?: string;
+  paragraph2?: string;
 }
 
 interface BaseClient {

diff --git a/interfaces/translations.interface.ts b/interfaces/translations.interface.ts
@@ -3,6 +3,9 @@ export interface Translation {
     description?: string;
     link_text: string;
     link_href: string;
+    hint_text?: string;
+    paragraph1?: string;
+    paragraph2?: string;
 }
 
 export type TranslationsObject = Record<string, Translation>;
diff --git a/scripts/generate b/scripts/generate
@@ -1,20 +1,14 @@
 #!/usr/bin/env bun
 import { writeFileSync, readFileSync } from "fs";
 import { Client } from "../interfaces/client.interface";
+import { Translation } from '../interfaces/translations.interface'
 import {
   getAllowedAccountListClientIDs,
   clientsToShowInSearchProd,
   hmrcClientIds,
   rsaAllowList,
 } from "../../di-account-management-frontend/src/config";
 
-interface Translation {
-  header: string;
-  description?: string;
-  link_text: string;
-  link_href: string;
-}
-
 interface IDs {
   production: string;
   integration: string;
@@ -88,6 +82,9 @@ function transformTranslate(
     description: client.description,
     linkText: client.link_text,
     linkUrl: generateLinkObject(ids, language),
+    ...client.hint_text && { hintText: client.hint_text },
+    ...client.paragraph1 && { paragraph1: client.paragraph1 },
+    ...client.paragraph2 && { paragraph2: client.paragraph2 },
   };
 }
 

diff --git a/src/get-translations.ts b/src/get-translations.ts
@@ -8,7 +8,10 @@ const convertToTranslation = (translations: Client["translations"]["en"], enviro
         header: translations.header,
         link_text: translations.linkText,
         link_href: getValueForEnvironment(environment, translations.linkUrl),
-        description: translations.description || undefined
+        ...translations.description && { description: translations.description },
+        ...translations.hintText && { hint_text: translations.hintText },
+        ...translations.paragraph1 && { paragraph1: translations.paragraph1 },
+        ...translations.paragraph2 && { paragraph2: translations.paragraph2 }
     }
 }
 

diff --git a/tests/get-translations.test.ts b/tests/get-translations.test.ts
@@ -10,7 +10,6 @@ jest.mock('../clients', () => ({
                 header: 'header en',
                 linkText: 'link text en',
                 linkUrl: 'link url en',
-                description: 'description en'
             },
             cy: {
                 header: 'header cy',
@@ -19,7 +18,6 @@ jest.mock('../clients', () => ({
                     production: 'link url cy production',
                     nonProduction: 'link url cy non production'
                 },
-                description: 'description cy'
             }
         },
         clientId: 'welshClient',
@@ -45,58 +43,102 @@ jest.mock('../clients', () => ({
         isHmrc: false,
         isReportSuspiciousActivityEnabled: false,
         showInClientSearch: true
+    },
+    hmrcClient: {
+        isAvailableInWelsh: false,
+        translations: {
+            en: {
+                header: 'header en',
+                linkText: 'link text en',
+                linkUrl: 'link url en',
+                description: 'description en',
+                hintText: 'hint text en',
+                paragraph1: 'paragraph 1 en',
+                paragraph2: 'paragraph 2 en'
+            },
+        },
+        clientId: 'englishClient',
+        clientType: 'account',
+        isAllowed: true,
+        isHmrc: false,
+        isReportSuspiciousActivityEnabled: false,
+        showInClientSearch: true
     }
 }));
 
 describe('getTranslations', () => {
     test('should return translations in english', async () => {
         const translations = getTranslations('test', 'en');
-        expect(translations).toEqual({
+        expect(translations).toStrictEqual({
             cyClient: {
                 header: 'header en',
                 link_text: 'link text en',
                 link_href: 'link url en',
-                description: 'description en'
             },
             enClient: {
                 header: 'header en',
                 link_text: 'link text en',
                 link_href: 'link url en',
                 description: 'description en'
-            }
+            },
+            hmrcClient: {
+                description: "description en",
+                header: "header en",
+                hint_text: "hint text en",
+                link_href: "link url en",
+                link_text: "link text en",
+                paragraph1: "paragraph 1 en",
+                paragraph2: "paragraph 2 en",
+            },
         });
     });
     test('should return transaltions in welsh', async () => {
         const translations = getTranslations('test', 'cy');
-        expect(translations).toEqual({
+        expect(translations).toStrictEqual({
             cyClient: {
                 header: 'header cy',
                 link_text: 'link text cy',
                 link_href: 'link url cy non production',
-                description: 'description cy'
             },
             enClient: {
                 header: 'header en',
                 link_text: 'link text en',
                 link_href: 'link url en',
                 description: 'description en'
+            },
+            hmrcClient: {
+                description: "description en",
+                header: "header en",
+                hint_text: "hint text en",
+                link_href: "link url en",
+                link_text: "link text en",
+                paragraph1: "paragraph 1 en",
+                paragraph2: "paragraph 2 en",
             }
         });
     })
     test('should return correct environment varialbes', async () => {
         const translations = getTranslations('production', 'cy');
-        expect(translations).toEqual({
+        expect(translations).toStrictEqual({
             cyClient: {
                 header: 'header cy',
                 link_text: 'link text cy',
                 link_href: 'link url cy production',
-                description: 'description cy'
             },
             enClient: {
                 header: 'header en',
                 link_text: 'link text en',
                 link_href: 'link url en',
                 description: 'description en'
+            },
+            hmrcClient: {
+                description: "description en",
+                header: "header en",
+                hint_text: "hint text en",
+                link_href: "link url en",
+                link_text: "link text en",
+                paragraph1: "paragraph 1 en",
+                paragraph2: "paragraph 2 en",
             }
         });
     })