HDPI 3789 tenancy notice welsh postcodes FE

.gitignore

@@ -25,6 +25,9 @@ npm-debug.log.*
 dist/
 public/
 src/main/views/govuk
+src/main/views/moj
+src/main/views/ui-component-lib
+src/main/assets
 coverage/
 smoke-output/
 functional-output/

eslint.config.js

@@ -174,6 +174,7 @@ module.exports = defineConfig([
   },
   globalIgnores([
     'src/main/views/govuk/**/*',
+    'src/main/views/moj/**/*',
     '**/jest.*.config.*',
     '**/__mocks__/**/*',
     'dist/*',

src/main/assets/locales/cy/respondToClaim/tenancyTypeDetails.json

@@ -5,6 +5,9 @@
   "insetText": "cyWhen they made their claim, {{orgname}} had to give details about the type of tenancy, occupation contract or licence agreement you signed to rent your property, and the date it began, if known.",
   "detailsHeading": "cyDetails given by ",
   "tenancyType": "cyThe property is let under {{tenancyTypeAgreementType}} tenancy agreement",
+  "tenancyTypeWalesStandard": "cyThe property is let under a standard occupation contract",
+  "tenancyTypeWalesSecure": "cyThe property is let under a secure occupation contract",
+  "tenancyTypeWales": "cyThe property is let under {{welshTenancyTypeAgreementType}} occupation contract",
   "tenancyTypeOther": "cyThe claimant provided the following information about your tenancy, occupation contract or licence agreement type: {{otherTenancyTypeDetails}}",
   "legend": "cyIs the tenancy, occupation contract or licence agreement type correct?",
   "yes": "cyYes",
@@ -15,6 +18,7 @@
     "tenancyTypeConfirm": "cySelect yes, no or I’m not sure",
     "tenancyDetails.correctType": "cyEnter the correct tenancy, occupation contract or licence type",
     "requiredText": "cyEnter the correct tenancy, licence or occupation contract details",
-    "defaultMaxLength": "cyThe correct tenancy, occupation contract or licence type must be {max} characters or fewer"
+    "defaultMaxLength": "cyThe correct tenancy, occupation contract or licence type must be {max} characters or fewer",
+    "correctTypeInvalidCharacters": "cyThe correct tenancy, occupation contract or licence type must only include letters a to z, and special characters such as hyphens, spaces and apostrophes"
   }
 }

src/main/assets/locales/en/respondToClaim/tenancyTypeDetails.json

@@ -5,6 +5,9 @@
   "insetText": "When they made their claim, {{orgname}} had to give details about the type of tenancy, occupation contract or licence agreement you signed to rent your property, and the date it began, if known.",
   "detailsHeading": "Details given by ",
   "tenancyType": "The property is let under {{tenancyTypeAgreementType}} tenancy agreement",
+  "tenancyTypeWalesStandard": "The property is let under a standard occupation contract",
+  "tenancyTypeWalesSecure": "The property is let under a secure occupation contract",
+  "tenancyTypeWales": "The property is let under {{welshTenancyTypeAgreementType}} occupation contract",
   "tenancyTypeOther": "The claimant provided the following information about your tenancy, occupation contract or licence agreement type: {{otherTenancyTypeDetails}}",
   "legend": "Is the tenancy, occupation contract or licence agreement type correct?",
   "yes": "Yes",
@@ -15,6 +18,7 @@
     "tenancyTypeConfirm": "Select if these tenancy, licence or occupation contract details are correct",
     "tenancyDetails.correctType": "Enter the correct tenancy, occupation contract or licence type",
     "requiredText": "Enter the correct tenancy, licence or occupation contract details",
-    "defaultMaxLength": "Tenancy, occupation contract or licence type must be 60 characters or less"
+    "defaultMaxLength": "Tenancy, occupation contract or licence type must be 60 characters or less",
+    "correctTypeInvalidCharacters": "The correct tenancy, occupation contract or licence type must only include letters a to z, and special characters such as hyphens, spaces and apostrophes"
   }
 }

src/main/assets/scss/main.scss

@@ -57,3 +57,12 @@
     margin-bottom: 30px;
   }
 }
+
+@include govuk-media-query($until: tablet) {
+  .govuk-footer__meta-item .govuk-footer__link {
+    display: inline-block;
+    line-height: 1.5;
+    padding-top: 4px;
+    padding-bottom: 4px;
+  }
+}

src/main/services/ccdCase.interface.ts

@@ -171,6 +171,7 @@ export interface CcdCaseData {
   tenancy_TypeOfTenancyLicence?: string;
   tenancy_DetailsOfOtherTypeOfTenancyLicence?: string;
   occupationLicenceTypeWales?: string;
+  otherLicenceTypeDetails?: string;
   licenceStartDate?: string;
   possessionClaimResponse?: PossessionClaimResponse;
   submitDraftAnswers?: string;

src/main/steps/respond-to-claim/flow.config.ts

@@ -10,7 +10,7 @@ import {
   isNoticeDateProvided,
   isNoticeServed,
   isTenancyStartDateKnown,
-  isWelshProperty,
+  isWalesProperty,
 } from '../utils';
 
 import type { JourneyFlowConfig } from '@modules/steps/stepFlow.interface';
@@ -175,11 +175,11 @@ export const flowConfig: JourneyFlowConfig = {
     'dispute-claim-interstitial': {
       routes: [
         {
-          condition: async (req: Request) => isWelshProperty(req),
+          condition: async (req: Request) => isWalesProperty(req),
           nextStep: 'landlord-registered',
         },
         {
-          condition: async (req: Request) => !(await isWelshProperty(req)),
+          condition: async (req: Request) => !isWalesProperty(req),
           nextStep: 'tenancy-type-details',
         },
       ],
@@ -208,8 +208,8 @@ export const flowConfig: JourneyFlowConfig = {
         },
       ],
       previousStep: async (req: Request) => {
-        const welshProperty = await isWelshProperty(req);
-        if (welshProperty) {
+        const walesProperty = isWalesProperty(req);
+        if (walesProperty) {
           return 'written-terms';
         }
         return 'dispute-claim-interstitial';

src/main/steps/respond-to-claim/legalrep.flow.config.ts

@@ -8,7 +8,7 @@ import {
   isNoticeDateProvided,
   isNoticeServed,
   isTenancyStartDateKnown,
-  isWelshProperty,
+  isWalesProperty,
 } from '../utils';
 
 import { flowConfig as citizenFlowConfig } from './flow.config';
@@ -117,11 +117,11 @@ export const legalrepFlowConfig: JourneyFlowConfig = {
     'dispute-claim-interstitial': {
       routes: [
         {
-          condition: async (req: Request) => isWelshProperty(req),
+          condition: async (req: Request) => isWalesProperty(req),
           nextStep: 'landlord-registered',
         },
         {
-          condition: async (req: Request) => !(await isWelshProperty(req)),
+          condition: async (req: Request) => !(await isWalesProperty(req)),
           nextStep: 'tenancy-type-details',
         },
       ],
@@ -150,7 +150,7 @@ export const legalrepFlowConfig: JourneyFlowConfig = {
         },
       ],
       previousStep: async (req: Request) => {
-        const welshProperty = await isWelshProperty(req);
+        const welshProperty = await isWalesProperty(req);
         if (welshProperty) {
           return 'written-terms';
         }

src/main/steps/respond-to-claim/tenancy-type-details/index.ts

@@ -1,6 +1,7 @@
 import type { Request } from 'express';
 
-import { createFormStep } from '../../../modules/steps';
+import { createFormStep, getTranslationFunction } from '../../../modules/steps';
+import { isWalesProperty } from '../../utils';
 import { buildCcdCaseForPossessionClaimResponse as buildAndSubmitPossessionClaimResponse } from '../../utils/populateResponseToClaimPayloadmap';
 import { flowConfig } from '../flow.config';
 
@@ -37,6 +38,14 @@ const fieldsConfig: FormFieldConfig[] = [
             translationKey: {
               label: 'correctTypeLabel',
             },
+            validator: (value: unknown): boolean | string => {
+              if (typeof value !== 'string' || !value.trim()) {
+                return true;
+              }
+
+              const invalidCharacters = /\p{Emoji_Presentation}|\p{Extended_Pictographic}|\u200D|\uFE0F/u;
+              return !invalidCharacters.test(value) || 'errors.correctTypeInvalidCharacters';
+            },
           },
         },
       },
@@ -65,7 +74,6 @@ const CCD_TO_TENANCY_TYPE_CONFIRM: Record<Exclude<YesNoNotSureValue, null>, stri
   NOT_SURE: 'notSure',
 };
 
-// TODO: Welsh translations for tenancy type text will be addressed in the next ticket
 const TENANCY_TYPE_TO_TEXT: Record<string, string> = {
   ASSURED_TENANCY: 'an assured',
   SECURE_TENANCY: 'a secure',
@@ -157,19 +165,37 @@ export const step: StepDefinition = createFormStep({
       (tenancyTypeConfirm === 'no' ? existingCorrectedTenancyType : '') ||
       '';
 
-    const orgName = req.res?.locals.validatedCase?.data?.possessionClaimResponse?.claimantOrganisations?.[0]
-      ?.value as string;
-    const tenancyTypeOfTenancyLicence = req.res?.locals.validatedCase?.data?.tenancy_TypeOfTenancyLicence as string;
-    const otherTenancyTypeDetails = req.res?.locals.validatedCase?.data
-      ?.tenancy_DetailsOfOtherTypeOfTenancyLicence as string;
+    const caseData = req.res?.locals.validatedCase?.data;
+    const walesProperty = isWalesProperty(caseData);
+    const orgName = caseData?.possessionClaimResponse?.claimantOrganisations?.[0]?.value as string;
+    const tenancyTypeOfTenancyLicence = caseData?.tenancy_TypeOfTenancyLicence as string;
+    const occupationLicenceTypeWales = caseData?.occupationLicenceTypeWales as string | undefined;
+    // Wales: flat keys from OccupationLicenceDetailsWales.
+    const otherTenancyTypeDetails = walesProperty
+      ? (caseData?.otherLicenceTypeDetails as string | undefined)
+      : (caseData?.tenancy_DetailsOfOtherTypeOfTenancyLicence as string | undefined);
+    // England: tenancy_* (TenancyLicenceDetails).
     const tenancyTypeAgreementType = TENANCY_TYPE_TO_TEXT[tenancyTypeOfTenancyLicence];
-
     const detailsHeading =
       typeof formContent.detailsHeading === 'string'
         ? `${formContent.detailsHeading}${orgName}${':'}`
         : formContent.detailsHeading;
-    const tenancyType =
-      tenancyTypeOfTenancyLicence === 'OTHER' ? formContent.tenancyTypeOther : formContent.tenancyType;
+
+    const t = getTranslationFunction(req, STEP_NAME, ['common']);
+    let tenancyType: unknown;
+    if (walesProperty) {
+      if (occupationLicenceTypeWales === 'OTHER') {
+        tenancyType = t('tenancyTypeOther', { otherTenancyTypeDetails });
+      } else if (occupationLicenceTypeWales === 'STANDARD_CONTRACT') {
+        tenancyType = t('tenancyTypeWalesStandard');
+      } else if (occupationLicenceTypeWales === 'SECURE_CONTRACT') {
+        tenancyType = t('tenancyTypeWalesSecure');
+      } else {
+        tenancyType = formContent.tenancyType;
+      }
+    } else {
+      tenancyType = tenancyTypeOfTenancyLicence === 'OTHER' ? formContent.tenancyTypeOther : formContent.tenancyType;
+    }
 
     return {
       ...formContent,

src/main/steps/utils/index.ts

@@ -1,5 +1,5 @@
 export { isDefendantNameKnown } from './isDefendantNameKnown';
-export { isWelshProperty } from './isWelshProperty';
+export { isWalesProperty } from './isWalesProperty';
 export { isNoticeDateProvided } from './isNoticeDateProvided';
 export { isRentArrearsClaim } from './isRentArrearsClaim';
 export { hasAnyRentArrearsGround } from './hasAnyRentArrearsGround';

src/main/steps/utils/isWalesProperty.ts

@@ -0,0 +1,27 @@
+import type { Request } from 'express';
+
+import type { CcdCaseData } from '@services/ccdCase.interface';
+
+/**
+ * Checks if property is located in Wales from CCD case data.
+ *
+ * Uses legislativeCountry field from CCD case data.
+ *
+ * Real data shows title case values:
+ * - England cases: "England"
+ * - Wales cases: "Wales"
+ *
+ * NOT uppercase "ENGLAND"/"WALES" as might be expected.
+ */
+export function isWalesProperty(req: Request): boolean;
+export function isWalesProperty(caseData: CcdCaseData | Record<string, unknown> | undefined): boolean;
+export function isWalesProperty(reqOrCaseData: Request | CcdCaseData | Record<string, unknown> | undefined): boolean {
+  const caseData =
+    reqOrCaseData && 'res' in reqOrCaseData
+      ? (reqOrCaseData as Request).res?.locals?.validatedCase?.data
+      : reqOrCaseData;
+  const legislativeCountry = (caseData as Record<string, unknown> | undefined)?.legislativeCountry;
+
+  // Case-insensitive comparison to handle any case variations
+  return (legislativeCountry as string | undefined)?.toUpperCase() === 'WALES';
+}

src/main/views/webpack/js.njk

@@ -1 +1 @@
-<script src="/main-dev.js"></script>
+ <script src="/main-dev.js"></script>

src/test/ui/data/api-data/submitCaseWales.api.data.ts

@@ -63,7 +63,7 @@ export const submitCaseApiDataWales = {
     //  CORRECTED: Wales requires SECURE_CONTRACT, not SECURE
     // SECURE = England (SECURE_TENANCY)
     // SECURE_CONTRACT = Wales (section 8 Housing (Wales) Act 2014)
-    occupationLicenceTypeWales: 'SECURE_CONTRACT',
+    occupationLicenceTypeWales: process.env.OCCUPATION_LICENCE_TYPE,
 
     licenceStartDate: '1990-11-10',
     licenceDocuments: [],
@@ -150,5 +150,96 @@ export const submitCaseApiDataWales = {
     },
   },
 
+  submitCaseRentOtherTenancy: {
+    legislativeCountry: 'Wales',
+    claimantType: {
+      value: {
+        code: 'COMMUNITY_LANDLORD',
+        label: 'Community landlord',
+      },
+      list_items: [
+        {
+          code: 'PRIVATE_LANDLORD',
+          label: 'Private landlord',
+        },
+        {
+          code: 'COMMUNITY_LANDLORD',
+          label: 'Community landlord',
+        },
+        {
+          code: 'MORTGAGE_LENDER',
+          label: 'Mortgage lender',
+        },
+        {
+          code: 'OTHER',
+          label: 'Other',
+        },
+      ],
+      valueCode: 'COMMUNITY_LANDLORD',
+    },
+    claimAgainstTrespassers: 'NO',
+    orgNameFound: 'YES',
+    claimantName: 'Possession Claims Solicitor Org',
+    isClaimantNameCorrect: 'YES',
+    walesRegistered: 'NOT_APPLICABLE',
+    walesLicensed: 'NOT_APPLICABLE',
+    walesLicensedAgentAppointed: 'NOT_APPLICABLE',
+    claimantContactEmail: 'pcs-solicitor-automation@test.com',
+    isCorrectClaimantContactEmail: 'YES',
+    orgAddressFound: 'YES',
+    organisationAddress: {
+      AddressLine1: 'Ministry Of Justice',
+      AddressLine2: 'Seventh Floor 102 Petty France',
+      PostTown: 'London',
+      PostCode: 'SW1H 9AJ',
+      Country: 'United Kingdom',
+    },
+    formattedClaimantContactAddress: 'Ministry Of Justice<br>Seventh Floor 102 Petty France<br>London<br>SW1H 9AJ',
+    isCorrectClaimantContactAddress: 'YES',
+    claimantProvidePhoneNumber: 'NO',
+    defendant1: {
+      nameKnown: 'NO',
+      addressKnown: 'NO',
+    },
+    addAnotherDefendant: 'NO',
+    occupationLicenceTypeWales: 'OTHER',
+    otherLicenceTypeDetails: 'Partnership agreement',
+    licenceStartDate: null,
+    licenceDocuments: [],
+    possessionGroundsWales_DiscretionaryGrounds: ['RENT_ARREARS_S157'],
+    possessionGroundsWales_MandatoryGrounds: [],
+    preActionProtocolCompleted: 'NO',
+    mediationAttempted: 'NO',
+    settlementAttempted: 'NO',
+    walesNoticeServed: 'YES',
+    walesTypeOfNoticeServed: null,
+    notice_NoticeServiceMethod: 'FIRST_CLASS_POST',
+    notice_NoticePostedDate: '2022-02-02',
+    notice_NoticeDocuments: [],
+    rentDetails_CurrentRent: '50000',
+    rentDetails_Frequency: 'MONTHLY',
+    rentDetails_CalculatedDailyCharge: '1643',
+    rentSectionPaymentFrequency: 'MONTHLY',
+    rentDetails_FormattedCalculatedDailyCharge: '£16.43',
+    rentDetails_PerDayCorrect: 'YES',
+    showRentArrearsPage: 'YES',
+    rentArrears_Total: '40000',
+    rentArrears_ThirdPartyPayments: 'NO',
+    arrearsJudgmentWanted: 'NO',
+    claimantNamePossessiveForm: 'Possession Claims Solicitor Org’s',
+    claimantCircumstancesSelect: 'NO',
+    hasDefendantCircumstancesInfo: 'NO',
+    prohibitedConductWalesClaim: 'NO',
+    claimingCostsWanted: 'NO',
+    additionalReasonsForPossession: {
+      hasReasons: 'NO',
+    },
+    hasUnderlesseeOrMortgagee: 'NO',
+    wantToUploadDocuments: 'NO',
+    applicationWithClaim: 'NO',
+    languageUsed: 'ENGLISH_AND_WELSH',
+    completionNextStep: 'SUBMIT_AND_PAY_NOW',
+  },
+
   submitCaseApiEndPoint: (): string => `/cases/${process.env.CASE_NUMBER}/events`,
 };