diff --git a/frontend/audit-ci.jsonc b/frontend/audit-ci.jsonc index a63698ad31..ab9f23539e 100644 --- a/frontend/audit-ci.jsonc +++ b/frontend/audit-ci.jsonc @@ -1,15 +1,16 @@ { "high": true, "allowlist": [ - "json5", // jest, eslint, testcafe, next, babel + "json5", // jest, eslint, testcafe, next, babel "parse-url", // lerna "parse-path", // lerna "shell-quote", // next "loader-utils", // next "moment", // testcafe - "jsonwebtoken", // testcafe + "jsonwebtoken", // testcafe "http-cache-semantics", // testcafe "requestretry", // slack-node - "decode-uri-component" // testcafe, lerna + "decode-uri-component", // testcafe, lerna + "@babel/traverse" // jest ] } diff --git a/frontend/benefit/handler/browser-tests/page-model/HandlerPageComponent.ts b/frontend/benefit/handler/browser-tests/page-model/HandlerPageComponent.ts index 0bb4cd7c48..d12180f491 100644 --- a/frontend/benefit/handler/browser-tests/page-model/HandlerPageComponent.ts +++ b/frontend/benefit/handler/browser-tests/page-model/HandlerPageComponent.ts @@ -11,7 +11,7 @@ import sv from '../../public/locales/sv/common.json'; import HandlerTranslations from '../../test/i18n/handler-translations'; abstract class HandlerPageComponent extends TranslatedComponent { - public datatestId; + public datatestId: string; protected constructor(options?: Options) { super( diff --git a/frontend/benefit/handler/browser-tests/pages/single.testcafe.ts b/frontend/benefit/handler/browser-tests/pages/single.testcafe.ts index adbb54ae2c..2e88c0e23a 100644 --- a/frontend/benefit/handler/browser-tests/pages/single.testcafe.ts +++ b/frontend/benefit/handler/browser-tests/pages/single.testcafe.ts @@ -58,7 +58,6 @@ test('Page has a single application', async () => { fi.review.headings.heading3, fi.review.headings.heading4, fi.review.headings.heading5, - fi.review.headings.heading6, fi.review.headings.heading7, fi.review.headings.heading8, fi.review.headings.heading9, diff --git a/frontend/benefit/handler/public/locales/en/common.json b/frontend/benefit/handler/public/locales/en/common.json index 867134bb4f..3a42dfadc0 100644 --- a/frontend/benefit/handler/public/locales/en/common.json +++ b/frontend/benefit/handler/public/locales/en/common.json @@ -595,6 +595,9 @@ "fullApplication": { "title": "Alkuperäinen hakemus" }, + "employeeConsent": { + "title": "Suostumus" + }, "otherAttachment": { "title": "Muu liite" } @@ -664,7 +667,7 @@ "heading6": "Palkkatukipäätös", "heading7": "Haettu ajanjakso", "heading8": "Työsuhde", - "heading9": "Suostumus", + "heading9": "Työllistettävän henkilötietojen käsittely", "heading10": "Hakemuksen käsittely", "heading11": "Muut liitteet", "heading12": "Paperihakemuksen tiedot" @@ -867,6 +870,9 @@ "fullApplication": { "title": "Paperihakemus" }, + "employeeConsent": { + "title": "Suostumus" + }, "otherAttachment": { "title": "Muu liite" } diff --git a/frontend/benefit/handler/public/locales/sv/common.json b/frontend/benefit/handler/public/locales/sv/common.json index 867134bb4f..3a42dfadc0 100644 --- a/frontend/benefit/handler/public/locales/sv/common.json +++ b/frontend/benefit/handler/public/locales/sv/common.json @@ -595,6 +595,9 @@ "fullApplication": { "title": "Alkuperäinen hakemus" }, + "employeeConsent": { + "title": "Suostumus" + }, "otherAttachment": { "title": "Muu liite" } @@ -664,7 +667,7 @@ "heading6": "Palkkatukipäätös", "heading7": "Haettu ajanjakso", "heading8": "Työsuhde", - "heading9": "Suostumus", + "heading9": "Työllistettävän henkilötietojen käsittely", "heading10": "Hakemuksen käsittely", "heading11": "Muut liitteet", "heading12": "Paperihakemuksen tiedot" @@ -867,6 +870,9 @@ "fullApplication": { "title": "Paperihakemus" }, + "employeeConsent": { + "title": "Suostumus" + }, "otherAttachment": { "title": "Muu liite" } diff --git a/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx b/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx index f5e63a76c7..9b6b276282 100644 --- a/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx +++ b/frontend/benefit/handler/src/components/applicationReview/deminimisView/DeminimisView.tsx @@ -55,7 +55,9 @@ const DeminimisView: React.FC = ({ data }) => { <$GridCell $colSpan={3}> <$SummaryTableValue> - {formatFloatToCurrency(amount, 'EUR', 'FI-fi', 0)} + {amount + ? formatFloatToCurrency(amount, 'EUR', 'FI-fi', 0) + : ''} <$GridCell> @@ -72,12 +74,14 @@ const DeminimisView: React.FC = ({ data }) => { <$GridCell $colSpan={3}> <$SummaryTableLastLine> - {formatFloatToCurrency( - data.totalDeminimisAmount, - 'EUR', - 'FI-fi', - 0 - )} + {data?.totalDeminimisAmount + ? formatFloatToCurrency( + data.totalDeminimisAmount, + 'EUR', + 'FI-fi', + 0 + ) + : ''} diff --git a/frontend/benefit/handler/src/components/applicationReview/deminimisView/__tests__/DeminimisView.test.tsx b/frontend/benefit/handler/src/components/applicationReview/deminimisView/__tests__/DeminimisView.test.tsx index 7e0ea15988..186e467f15 100644 --- a/frontend/benefit/handler/src/components/applicationReview/deminimisView/__tests__/DeminimisView.test.tsx +++ b/frontend/benefit/handler/src/components/applicationReview/deminimisView/__tests__/DeminimisView.test.tsx @@ -12,6 +12,7 @@ describe('DeminimisView', () => { deMinimisAidSet: [ { grantedAt: '01-02-2021', granter: 'test granter', amount: 1000 }, ], + totalDeminimisAmount: '1000', }, };