Skip to content

Commit 8564b35

Browse files
nicki-nhsnicki-nhs
committed
Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-10893-header-with-account-info
2 parents 8a436b6 + 68b441f commit 8564b35

File tree

66 files changed

+29216
-21335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+29216
-21335
lines changed

‎data-migration/user-transfer/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dependencies": {
3-
"@aws-sdk/client-dynamodb": "^3.806.0",
4-
"@aws-sdk/client-s3": "^3.810.0",
5-
"@aws-sdk/client-sts": "^3.810.0",
3+
"@aws-sdk/client-dynamodb": "^3.864.0",
4+
"@aws-sdk/client-s3": "^3.864.0",
5+
"@aws-sdk/client-sts": "^3.864.0",
66
"yargs": "^17.7.2"
77
},
88
"description": "Transfers template ownership from one user to another",
99
"devDependencies": {
10-
"@aws-sdk/types": "^3.775.0",
10+
"@aws-sdk/types": "^3.862.0",
1111
"@tsconfig/node20": "^20.1.5",
1212
"@types/node": "^20.17.32",
1313
"jest": "^29.7.0",

‎frontend/jest.setup.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ createMocks();
3333

3434
// set feature flag
3535
process.env.NEXT_PUBLIC_ENABLE_PROOFING = 'true';
36+
37+
// mock unimplemented scrollIntoView
38+
if (typeof window !== 'undefined') {
39+
window.HTMLElement.prototype.scrollIntoView = jest.fn();
40+
}

‎frontend/src/__tests__/components/forms/ChooseTemplate/ChooseTemplate.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('Choose template page', () => {
6666
it('renders error component', () => {
6767
const mockUseActionState = jest.fn().mockReturnValue([
6868
{
69-
validationError: {
69+
errorState: {
7070
formErrors: [],
7171
fieldErrors: {
7272
page: ['Component error message'],

‎frontend/src/__tests__/components/forms/ChooseTemplate/server-action.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test('submit form - validation error', async () => {
1616
);
1717

1818
expect(response).toEqual({
19-
validationError: {
19+
errorState: {
2020
formErrors: [],
2121
fieldErrors: {
2222
templateType: ['Select a template type'],

‎frontend/src/__tests__/components/forms/CopyTemplate/CopyTemplate.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('Choose template page', () => {
7070
it('renders error component', () => {
7171
const mockUseActionState = jest.fn().mockReturnValue([
7272
{
73-
validationError: {
73+
errorState: {
7474
formErrors: [],
7575
fieldErrors: {
7676
page: ['Component error message'],

‎frontend/src/__tests__/components/forms/CopyTemplate/server-action.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ test('submit form - validation error', async () => {
3838
);
3939

4040
expect(response).toEqual({
41-
validationError: {
41+
errorState: {
4242
formErrors: [],
4343
fieldErrors: {
4444
templateType: ['Select a template type'],

‎frontend/src/__tests__/components/forms/EmailTemplateForm/EmailTemplateForm.test.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test('renders page with preloaded field values', () => {
2727
const container = render(
2828
<EmailTemplateForm
2929
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
30-
validationError: undefined,
30+
errorState: undefined,
3131
name: 'template-name',
3232
subject: 'template-subject-line',
3333
message: 'template-message',
@@ -41,7 +41,7 @@ test('renders page without back link for initial state with id - edit mode', ()
4141
const container = render(
4242
<EmailTemplateForm
4343
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
44-
validationError: undefined,
44+
errorState: undefined,
4545
name: 'template-name',
4646
subject: 'template-subject-line',
4747
message: 'template-message',
@@ -56,7 +56,7 @@ test('renders page one error', () => {
5656
const container = render(
5757
<EmailTemplateForm
5858
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
59-
validationError: {
59+
errorState: {
6060
formErrors: [],
6161
fieldErrors: {
6262
emailTemplateName: ['Template name error'],
@@ -75,7 +75,7 @@ test('renders page with multiple errors', () => {
7575
const container = render(
7676
<EmailTemplateForm
7777
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
78-
validationError: {
78+
errorState: {
7979
formErrors: [],
8080
fieldErrors: {
8181
emailTemplateName: ['Template name error'],
@@ -96,7 +96,7 @@ test('Client-side validation triggers', () => {
9696
const container = render(
9797
<EmailTemplateForm
9898
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
99-
validationError: undefined,
99+
errorState: undefined,
100100
name: 'template-name',
101101
subject: 'template-subject-line',
102102
message: 'template-message',

‎frontend/src/__tests__/components/forms/EmailTemplateForm/server-action.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('CreateEmailTemplate server actions', () => {
3535

3636
expect(response).toEqual({
3737
...initialState,
38-
validationError: {
38+
errorState: {
3939
formErrors: [],
4040
fieldErrors: {
4141
emailTemplateName: ['Enter a template name'],
@@ -59,7 +59,7 @@ describe('CreateEmailTemplate server actions', () => {
5959

6060
expect(response).toEqual({
6161
...initialState,
62-
validationError: {
62+
errorState: {
6363
formErrors: [],
6464
fieldErrors: {
6565
emailTemplateMessage: ['Template message too long'],

‎frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/LetterTemplateForm.test.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test('renders page with preloaded field values', () => {
2727
const container = render(
2828
<LetterTemplateForm
2929
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
30-
validationError: undefined,
30+
errorState: undefined,
3131
name: 'template-name',
3232
letterType: 'x1',
3333
language: 'ar',
@@ -44,7 +44,7 @@ test('shows right-to-left language warning when language changes', () => {
4444
const container = render(
4545
<LetterTemplateForm
4646
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
47-
validationError: undefined,
47+
errorState: undefined,
4848
name: 'template-name',
4949
letterType: 'x1',
5050
language: initialLanguage,
@@ -69,7 +69,7 @@ test('hides right-to-left language warning when language changes', () => {
6969
const container = render(
7070
<LetterTemplateForm
7171
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
72-
validationError: undefined,
72+
errorState: undefined,
7373
name: 'template-name',
7474
letterType: 'x1',
7575
language: initialLanguage,
@@ -91,7 +91,7 @@ test('renders page one error', () => {
9191
const container = render(
9292
<LetterTemplateForm
9393
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
94-
validationError: {
94+
errorState: {
9595
formErrors: [],
9696
fieldErrors: {
9797
letterTemplateName: ['Template name error'],
@@ -110,7 +110,7 @@ test('renders page with multiple errors', () => {
110110
const container = render(
111111
<LetterTemplateForm
112112
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
113-
validationError: {
113+
errorState: {
114114
formErrors: [],
115115
fieldErrors: {
116116
letterTemplateName: ['Template name error'],
@@ -133,7 +133,7 @@ test('Client-side validation triggers', () => {
133133
const container = render(
134134
<LetterTemplateForm
135135
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
136-
validationError: undefined,
136+
errorState: undefined,
137137
name: undefined,
138138
letterType: undefined,
139139
language: undefined,

‎frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('UploadLetterTemplate server actions', () => {
2929

3030
expect(response).toEqual({
3131
...initialState,
32-
validationError: {
32+
errorState: {
3333
formErrors: [],
3434
fieldErrors: {
3535
letterTemplateName: ['Enter a template name'],

0 commit comments

Comments
 (0)