Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
17c9366
initial setup for 3571 FE
sdmiddletonSolirius Mar 19, 2026
c5f4176
Merge branch 'master' into HDPI-3571-current-circumstances-exceptiona…
sdmiddletonSolirius Mar 23, 2026
70ff797
Initial commit for additional circumstances views and data persistence
sdmiddletonSolirius Mar 23, 2026
c54045f
prettier fixes
sdmiddletonSolirius Mar 23, 2026
71440d4
data persistence and heading fix
sdmiddletonSolirius Mar 24, 2026
554ec70
initial hardship page setup
sdmiddletonSolirius Mar 24, 2026
e5cfb73
comment removal
sdmiddletonSolirius Mar 24, 2026
d1bf328
update curly apostrophe
sdmiddletonSolirius Mar 24, 2026
46207a0
Merge branch 'master' into HDPI-3571-current-circumstances-exceptiona…
sdmiddletonSolirius Mar 24, 2026
79ba227
minor blank space
sdmiddletonSolirius Mar 24, 2026
7443aef
refactoring
sdmiddletonSolirius Mar 24, 2026
5838406
refactoring index to match implementation across codebase
sdmiddletonSolirius Mar 24, 2026
0842578
fixing linting errors
sdmiddletonSolirius Mar 24, 2026
817a89f
Merge branch 'master' into HDPI-3571-current-circumstances-exceptiona…
sdmiddletonSolirius Mar 27, 2026
0550ad7
Align yes/no typing with backend enums and updating stepButtons macros
sdmiddletonSolirius Mar 27, 2026
8a7c70b
Merge branch 'master' into HDPI-3571-current-circumstances-exceptiona…
sdmiddletonSolirius Mar 30, 2026
4c4be18
quick dash amend on page title
sdmiddletonSolirius Mar 30, 2026
d4ebae3
updating enums again
sdmiddletonSolirius Mar 30, 2026
c4a93ee
updating enum values and casing
sdmiddletonSolirius Mar 30, 2026
5b1a4c2
Merge branch 'master' into HDPI-3571-current-circumstances-exceptiona…
sdmiddletonSolirius Mar 30, 2026
b338bb6
Merge branch 'master' into HDPI-3571-current-circumstances-exceptiona…
sdmiddletonSolirius Mar 30, 2026
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"caption": "cyRespond to a property possession claim",
"pageTitle": "cyExceptional hardship",
"introParagraph1": "cyExceptional hardship means experiencing serious difficulties that go beyond the normal difficulty of losing your home.",
"introParagraph2": "cyIf this applies to you, a judge might allow you to stay in your home for longer.",
"introParagraph3": "cyAny details you provide will be considered by a judge when making their decision, but it is up to them to decide if exceptional hardship applies in your case.",
"forExample": "cyFor example, you might have:",
"bullet1": "cygone through a divorce or separation",
"bullet2": "cylost your job or been made redundant",
"bullet3": "cyexperienced a bereavement or long-term illness",
"bullet4": "cybeen declared bankrupt",
"question": "cyWould you experience exceptional hardship if you were asked to leave your home?",
"options": {
"yes": "cyYes",
"no": "cyNo"
},
"textAreaLabel": "cyGive details about the exceptional hardship you’d experience",
"errors": {
"exceptionalHardship": "cyChoose yes or no",
"exceptionalHardshipDetails": "cyEnter details about the exceptional hardship you’d experience"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"caption": "cyRespond to a property possession claim",
"pageTitle": "cyYour circumstances",
"introParagraph": "cyYou can use this section to give details about any events or circumstances that have impacted your case that you think a judge should know about.",
"forExample": "cyFor example:",
"bullet1": "cysomeone in your household has an illness or disability",
"bullet2": "cychildren in your household attend a local school",
"bullet3": "cyyou work irregular hours, making it hard to find a new place to live",
"question": "cyWould you like to share anything about your circumstances?",
"options": {
"yes": "cyYes",
"no": "cyNo"
},
"textAreaLabel": "cyGive details about your circumstances",
"errors": {
"shareCircumstances": "cyChoose yes or no",
"circumstancesDetails": "cyEnter details about your circumstances"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"caption": "Respond to a property possession claim",
"pageTitle": "Exceptional hardship",
"introParagraph1": "Exceptional hardship means experiencing serious difficulties that go beyond the normal difficulty of losing your home.",
"introParagraph2": "If this applies to you, a judge might allow you to stay in your home for longer.",
"introParagraph3": "Any details you provide will be considered by a judge when making their decision, but it is up to them to decide if exceptional hardship applies in your case.",
"forExample": "For example, you might have:",
"bullet1": "gone through a divorce or separation",
"bullet2": "lost your job or been made redundant",
"bullet3": "experienced a bereavement or long-term illness",
"bullet4": "been declared bankrupt",
"question": "Would you experience exceptional hardship if you were asked to leave your home?",
"options": {
"yes": "Yes",
"no": "No"
},
"textAreaLabel": "Give details about the exceptional hardship you’d experience",
"errors": {
"exceptionalHardship": "Choose yes or no",
"exceptionalHardshipDetails": "Enter details about the exceptional hardship you’d experience"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"caption": "Respond to a property possession claim",
"pageTitle": "Your circumstances",
"introParagraph": "You can use this section to give details about any events or circumstances that have impacted your case that you think a judge should know about.",
"forExample": "For example:",
"bullet1": "someone in your household has an illness or disability",
"bullet2": "children in your household attend a local school",
"bullet3": "you work irregular hours, making it hard to find a new place to live",
"question": "Would you like to share anything about your circumstances?",
"options": {
"yes": "Yes",
"no": "No"
},
"textAreaLabel": "Give details about your circumstances",
"errors": {
"shareCircumstances": "Choose yes or no",
"circumstancesDetails": "Enter details about your circumstances"
}
}
17 changes: 12 additions & 5 deletions src/main/interfaces/ccdCase.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ export enum CaseState {
SUBMITTED = 'Submitted',
}

export type YesNoValue = 'YES' | 'NO' | null;
export type TenancyTypeCorrectValue = YesNoValue | 'NOT_SURE';
export type VerticalYesNoValue = 'YES' | 'NO' | null;
export type YesNoValue = 'Yes' | 'No';
export type TenancyTypeCorrectValue = VerticalYesNoValue | 'NOT_SURE';
export type ContactPreference = 'EMAIL' | 'POST' | null;

export type YesNoNotSureValue = 'YES' | 'NO' | 'NOT_SURE';
Expand Down Expand Up @@ -43,7 +44,7 @@ export interface PossessionClaimResponse {
firstName?: string;
lastName?: string;
address?: Address;
phoneNumberProvided?: YesNoValue;
phoneNumberProvided?: VerticalYesNoValue;
phoneNumber?: string;
emailAddress?: string;
};
Expand All @@ -53,13 +54,19 @@ export interface PossessionClaimResponse {
tenancyType?: string;
tenancyStartDateCorrect?: string;
tenancyStartDate?: string;
contactByPhone?: YesNoValue;
contactByText?: YesNoValue;
contactByPhone?: VerticalYesNoValue;
contactByText?: VerticalYesNoValue;
preferenceType?: ContactPreference;
freeLegalAdvice?: string;
defendantNameConfirmation?: string;
dateOfBirth?: string;
landlordRegistered?: YesNoNotSureValue;
householdCircumstances?: {
shareAdditionalCircumstances?: YesNoValue;
additionalCircumstancesDetails?: string;
exceptionalHardship?: YesNoValue;
exceptionalHardshipDetails?: string;
};
writtenTerms?: YesNoNotSureValue;
};
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,41 @@
{% extends "stepsTemplate.njk" %}
{% from "macros/stepButtons.njk" import stepButtons %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/radios/macro.njk" import govukRadios %}
{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
{% from "macros/csrf.njk" import csrfProtection %}
{% block pageTitle %}
{{ pageTitle }} – HM Courts & Tribunals Service – GOV.UK
{% endblock %}
{% block mainContent %}
{% if errorSummary %}
{{ govukErrorSummary(errorSummary) }}
{% endif %}
<h1 class="govuk-heading-l">Your circumstances (placeholder)</h1>
<p class="govuk-body">This is a placeholder for Your Circumstances step.</p>
<form method="post" action="{{ url }}">
{{ stepButtons(continue, saveForLater) }}

{% if caption %}
<span class="govuk-caption-l">{{ caption }}</span>
{% endif %}

<h1 class="govuk-heading-l">{{ pageTitle }}</h1>

<p class="govuk-body">{{ introParagraph }}</p>

<p class="govuk-body"> {{ forExample }}</p>

<ul class="govuk-list govuk-list--bullet">
<li>{{ bullet1 }}</li>
<li>{{ bullet2 }}</li>
<li>{{ bullet3 }}</li>
</ul>

<form method="post" action="{{ url }}" novalidate>
{% for field in fields %}
{% if field.componentType == 'radios' %}
{{ govukRadios(field.component) }}
{% endif %}
{% endfor %}

{{ stepButtons(saveAndContinue, saveForLater) }}
{{ csrfProtection(csrfToken) }}
</form>
{% endblock %}
97 changes: 95 additions & 2 deletions src/main/steps/respond-to-claim/current-circumstances/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,106 @@
import type { PossessionClaimResponse, YesNoValue } from '../../../interfaces/ccdCase.interface';
import type { StepDefinition } from '../../../interfaces/stepFormData.interface';
import { buildCcdCaseForPossessionClaimResponse } from '../../utils/populateResponseToClaimPayloadmap';
import { flowConfig } from '../flow.config';

import { createFormStep } from '@modules/steps';
import { createFormStep, getTranslationFunction } from '@modules/steps';

export const step: StepDefinition = createFormStep({
stepName: 'your-circumstances',
journeyFolder: 'respondToClaim',
stepDir: __dirname,
flowConfig,
fields: [],
translationKeys: {
pageTitle: 'pageTitle',
caption: 'caption',
},
fields: [
{
name: 'shareCircumstances',
type: 'radio',
required: true,
legendClasses: 'govuk-fieldset__legend--m',
translationKey: { label: 'question' },
errorMessage: 'errors.shareCircumstances',
options: [
{
value: 'yes',
translationKey: 'options.yes',
subFields: {
circumstancesDetails: {
name: 'circumstancesDetails',
type: 'character-count',
required: true,
maxLength: 500,
errorMessage: 'errors.circumstancesDetails',
translationKey: { label: 'textAreaLabel' },
attributes: {
rows: 5,
},
},
},
},
{
value: 'no',
translationKey: 'options.no',
},
],
},
],
customTemplate: `${__dirname}/currentCircumstances.njk`,
extendGetContent: req => {
const t = getTranslationFunction(req, 'your-circumstances', ['common']);

return {
introParagraph: t('introParagraph'),
forExample: t('forExample'),
bullet1: t('bullet1'),
bullet2: t('bullet2'),
bullet3: t('bullet3'),
};
},
beforeRedirect: async req => {
const shareCircumstances = req.body?.shareCircumstances as string | undefined;

if (!shareCircumstances || (shareCircumstances !== 'yes' && shareCircumstances !== 'no')) {
return;
}

const ccdMapping: Record<'yes' | 'no', YesNoValue> = { yes: 'Yes', no: 'No' };
const shareAdditionalCircumstances = ccdMapping[shareCircumstances];
const additionalCircumstancesDetails =
shareCircumstances === 'yes'
? (req.body?.['shareCircumstances.circumstancesDetails'] as string | undefined)
: undefined;

const possessionClaimResponse: PossessionClaimResponse = {
defendantResponses: {
householdCircumstances: {
shareAdditionalCircumstances,
additionalCircumstancesDetails,
},
},
};

await buildCcdCaseForPossessionClaimResponse(req, possessionClaimResponse);
},
getInitialFormData: req => {
const caseData = req.res?.locals?.validatedCase?.data;
const circumstances = caseData?.possessionClaimResponse?.defendantResponses?.householdCircumstances;
const existingAnswer = circumstances?.shareAdditionalCircumstances as string | undefined;

const mapping: Record<string, string> = { Yes: 'yes', No: 'no' };
const shareCircumstances = existingAnswer ? mapping[existingAnswer] : undefined;

if (!shareCircumstances) {
return {};
}

return {
shareCircumstances,
...(shareCircumstances === 'yes' && circumstances?.additionalCircumstancesDetails
? { 'shareCircumstances.circumstancesDetails': circumstances.additionalCircumstancesDetails }
: {}),
};
},
});
Original file line number Diff line number Diff line change
@@ -1,15 +1,43 @@
{% extends "stepsTemplate.njk" %}
{% from "macros/stepButtons.njk" import stepButtons %}
{% from "govuk/components/button/macro.njk" import govukButton %}
{% from "govuk/components/radios/macro.njk" import govukRadios %}
{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
{% from "macros/csrf.njk" import csrfProtection %}
{% block pageTitle %}
{{ pageTitle }} &ndash; HM Courts &amp; Tribunals Service &ndash; GOV.UK
{% endblock %}
{% block mainContent %}
{% if errorSummary %}
{{ govukErrorSummary(errorSummary) }}
{% endif %}
<h1 class="govuk-heading-l">Exceptional hardship (placeholder)</h1>
<p class="govuk-body">This is a placeholder for Exceptional Hardship step.</p>
<form method="post" action="{{ url }}">
{{ stepButtons(continue, saveForLater) }}

{% if caption %}
<span class="govuk-caption-l">{{ caption }}</span>
{% endif %}

<h1 class="govuk-heading-l">{{ pageTitle }}</h1>

<p class="govuk-body">{{ introParagraph1 }}</p>
<p class="govuk-body">{{ introParagraph2 }}</p>
<p class="govuk-body">{{ introParagraph3 }}</p>
<p class="govuk-body">{{ forExample }}</p>

<ul class="govuk-list govuk-list--bullet">
<li>{{ bullet1 }}</li>
<li>{{ bullet2 }}</li>
<li>{{ bullet3 }}</li>
<li>{{ bullet4 }}</li>
</ul>

<form method="post" action="{{ url }}" novalidate>
{% for field in fields %}
{% if field.componentType == 'radios' %}
{{ govukRadios(field.component) }}
{% endif %}
{% endfor %}

{{ stepButtons(saveAndContinue, saveForLater) }}
{{ csrfProtection(csrfToken) }}
</form>
{% endblock %}
Loading
Loading