Skip to content

CCM-10630: Give error summary focus on appearance & adjust letter errors #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ClareJonesBJSS merged 2 commits into from
Aug 11, 2025
Merged

CCM-10630: Give error summary focus on appearance & adjust letter errors #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ee1ee6
CCM-10630: Give error summary focus on appearance & adjust letter errors
ClareJonesBJSS Aug 8, 2025
cc5f0ce
CCM-10630: Code review feedback
ClareJonesBJSS Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions frontend/jest.setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@ createMocks();

// set feature flag
process.env.NEXT_PUBLIC_ENABLE_PROOFING = 'true';

// mock unimplemented scrollIntoView
if (typeof window !== 'undefined') {
window.HTMLElement.prototype.scrollIntoView = jest.fn();
}
2 changes: 1 addition & 1 deletion frontend/src/__tests__/components/forms/ChooseTemplate/ChooseTemplate.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe('Choose template page', () => {
it('renders error component', () => {
const mockUseActionState = jest.fn().mockReturnValue([
{
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
page: ['Component error message'],
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/__tests__/components/forms/ChooseTemplate/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test('submit form - validation error', async () => {
);

expect(response).toEqual({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
templateType: ['Select a template type'],
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/__tests__/components/forms/CopyTemplate/CopyTemplate.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe('Choose template page', () => {
it('renders error component', () => {
const mockUseActionState = jest.fn().mockReturnValue([
{
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
page: ['Component error message'],
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/__tests__/components/forms/CopyTemplate/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test('submit form - validation error', async () => {
);

expect(response).toEqual({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
templateType: ['Select a template type'],
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/__tests__/components/forms/EmailTemplateForm/EmailTemplateForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test('renders page with preloaded field values', () => {
const container = render(
<EmailTemplateForm
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
subject: 'template-subject-line',
message: 'template-message',
Expand All @@ -41,7 +41,7 @@ test('renders page without back link for initial state with id - edit mode', ()
const container = render(
<EmailTemplateForm
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
subject: 'template-subject-line',
message: 'template-message',
Expand All @@ -56,7 +56,7 @@ test('renders page one error', () => {
const container = render(
<EmailTemplateForm
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
emailTemplateName: ['Template name error'],
Expand All @@ -75,7 +75,7 @@ test('renders page with multiple errors', () => {
const container = render(
<EmailTemplateForm
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
emailTemplateName: ['Template name error'],
Expand All @@ -96,7 +96,7 @@ test('Client-side validation triggers', () => {
const container = render(
<EmailTemplateForm
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
subject: 'template-subject-line',
message: 'template-message',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/__tests__/components/forms/EmailTemplateForm/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('CreateEmailTemplate server actions', () => {

expect(response).toEqual({
...initialState,
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
emailTemplateName: ['Enter a template name'],
Expand All @@ -59,7 +59,7 @@ describe('CreateEmailTemplate server actions', () => {

expect(response).toEqual({
...initialState,
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
emailTemplateMessage: ['Template message too long'],
Expand Down
12 changes: 6 additions & 6 deletions ...nd/src/__tests__/components/forms/LetterTemplateForm.test.tsx/LetterTemplateForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test('renders page with preloaded field values', () => {
const container = render(
<LetterTemplateForm
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
letterType: 'x1',
language: 'ar',
Expand All @@ -44,7 +44,7 @@ test('shows right-to-left language warning when language changes', () => {
const container = render(
<LetterTemplateForm
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
letterType: 'x1',
language: initialLanguage,
Expand All @@ -69,7 +69,7 @@ test('hides right-to-left language warning when language changes', () => {
const container = render(
<LetterTemplateForm
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
letterType: 'x1',
language: initialLanguage,
Expand All @@ -91,7 +91,7 @@ test('renders page one error', () => {
const container = render(
<LetterTemplateForm
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
letterTemplateName: ['Template name error'],
Expand All @@ -110,7 +110,7 @@ test('renders page with multiple errors', () => {
const container = render(
<LetterTemplateForm
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
letterTemplateName: ['Template name error'],
Expand All @@ -133,7 +133,7 @@ test('Client-side validation triggers', () => {
const container = render(
<LetterTemplateForm
initialState={mockDeep<TemplateFormState<LetterTemplate>>({
validationError: undefined,
errorState: undefined,
name: undefined,
letterType: undefined,
language: undefined,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('UploadLetterTemplate server actions', () => {

expect(response).toEqual({
...initialState,
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
letterTemplateName: ['Enter a template name'],
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/__tests__/components/forms/NhsAppTemplateForm/NhsAppTemplateForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ test('renders page', async () => {
const container = render(
<NhsAppTemplateForm
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
message: 'template-message',
})}
Expand All @@ -55,7 +55,7 @@ test('renders page with preloaded field values', () => {
const container = render(
<NhsAppTemplateForm
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
message: 'template-message',
})}
Expand All @@ -68,7 +68,7 @@ test('renders page without back link for initial state with id - edit mode', ()
const container = render(
<NhsAppTemplateForm
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
message: 'template-message',
id: 'template-id',
Expand All @@ -82,7 +82,7 @@ test('renders page one error', () => {
const container = render(
<NhsAppTemplateForm
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
nhsAppTemplateName: ['Template name error'],
Expand All @@ -100,7 +100,7 @@ test('renders page with multiple errors', () => {
const container = render(
<NhsAppTemplateForm
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
nhsAppTemplateName: ['Template name error'],
Expand All @@ -119,7 +119,7 @@ test('Client-side validation triggers', () => {
const container = render(
<NhsAppTemplateForm
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'template-name',
message: 'template-message',
})}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/__tests__/components/forms/NhsAppTemplateForm/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('CreateNHSAppTemplate server actions', () => {

expect(response).toEqual({
...initialState,
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
nhsAppTemplateName: ['Enter a template name'],
Expand All @@ -62,7 +62,7 @@ describe('CreateNHSAppTemplate server actions', () => {

expect(response).toEqual({
...initialState,
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
nhsAppTemplateMessage: ['Template message too long'],
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/__tests__/components/forms/PreviewEmailTemplate/PreviewEmailTemplate.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('Preview email form renders', () => {
const container = render(
<PreviewEmailTemplate
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'test-template-email',
templateStatus: 'NOT_YET_SUBMITTED',
subject: 'template-subject-line',
Expand All @@ -60,7 +60,7 @@ describe('Preview email form renders', () => {
const container = render(
<PreviewEmailTemplate
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'test-template-email',
templateStatus: 'NOT_YET_SUBMITTED',
subject: 'template-subject-line',
Expand All @@ -77,7 +77,7 @@ describe('Preview email form renders', () => {
const container = render(
<PreviewEmailTemplate
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
previewEmailTemplateAction: ['Select an option'],
Expand All @@ -99,7 +99,7 @@ describe('Preview email form renders', () => {
render(
<PreviewEmailTemplate
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'test-template-email',
templateStatus: 'NOT_YET_SUBMITTED',
subject: 'template-subject-line',
Expand Down Expand Up @@ -130,7 +130,7 @@ describe('Preview email form renders', () => {
render(
<PreviewEmailTemplate
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'test-template-email',
templateStatus: 'NOT_YET_SUBMITTED',
subject: 'template-subject-line',
Expand All @@ -154,7 +154,7 @@ describe('Preview email form renders', () => {
const container = render(
<PreviewEmailTemplate
initialState={mockDeep<TemplateFormState<EmailTemplate>>({
validationError: undefined,
errorState: undefined,
name: 'test-template-email',
templateStatus: 'NOT_YET_SUBMITTED',
subject: 'template-subject-line',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('previewEmailTemplateAction server action', () => {

expect(response).toEqual({
...initialState,
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
previewEmailTemplateAction: ['Select an option'],
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/PreviewNHSAppTemplate.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('Preview nhs app form renders', () => {
const container = render(
<PreviewNHSAppTemplate
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
id: 'template-id',
name: 'test-template-nhs app',
templateStatus: 'NOT_YET_SUBMITTED',
Expand All @@ -59,7 +59,7 @@ describe('Preview nhs app form renders', () => {
const container = render(
<PreviewNHSAppTemplate
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
id: 'template-id',
name: 'test-template-nhs app',
templateStatus: 'NOT_YET_SUBMITTED',
Expand All @@ -75,7 +75,7 @@ describe('Preview nhs app form renders', () => {
const container = render(
<PreviewNHSAppTemplate
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: {
errorState: {
formErrors: [],
fieldErrors: {
previewNHSAppTemplateAction: ['Select an option'],
Expand All @@ -96,7 +96,7 @@ describe('Preview nhs app form renders', () => {
render(
<PreviewNHSAppTemplate
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
id: 'template-id',
name: 'test-template-nhs app',
templateStatus: 'NOT_YET_SUBMITTED',
Expand Down Expand Up @@ -126,7 +126,7 @@ describe('Preview nhs app form renders', () => {
render(
<PreviewNHSAppTemplate
initialState={mockDeep<TemplateFormState<NHSAppTemplate>>({
validationError: undefined,
errorState: undefined,
id: 'template-id',
name: 'test-template-nhs app',
templateStatus: 'NOT_YET_SUBMITTED',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('previewNhsAppTemplateAction', () => {
templateStatus: 'NOT_YET_SUBMITTED',
name: 'Example name',
message: 'Example message',
validationError: undefined,
errorState: undefined,
createdAt: '2025-01-13T10:19:25.579Z',
updatedAt: '2025-01-13T10:19:25.579Z',
};
Expand All @@ -31,7 +31,7 @@ describe('previewNhsAppTemplateAction', () => {

expect(newState).toEqual({
...currentState,
validationError: {
errorState: {
fieldErrors: {
previewNHSAppTemplateAction: ['Select an option'],
},
Expand Down
Loading