PDJB-942 - Provide Tenancy Details Later Changes by danielledias-MT · Pull Request #1641 · communitiesuk/prsdb-webapp

danielledias-MT · 2026-07-23T12:33:08Z

Ticket number

Goal of change

Populate Provide tenancy details later page. The 'Save and continue' button takes the Landlord to the CYA page, skipping the Rent pages, and marking Tenancy details as Complete.

Description of main change(s)

Provide tenancy details later page populated
Mark Tenancy details as Completed
Add a temp 'Provide this later' message to CYA
Updates journey routing so selecting 'Provide this later' skips rent pages and routes to CYA.
Moves numberOfHouseholds templates into templates/forms/restructureAndSkipping and keeps a legacy copy there.

Screenshots

**Occupied Property > Households > Provide this later**

Provide this later

Provide this later > CYA

Note: this will be updated to match Figma in the next PR.

CYA > Provide this later > Households

Tenancy details marked as Complete after provide later

Regression Test: Providing Households & Number of People information goes through to Bills

Anything you'd like to highlight to the reviewer?

There is another PR to update the CYA page as part of PDJB-942.
The Provide tenancy details later page for unoccupied properties has been removed from Figma. As Tenancy details is not required for unoccupied properties.

Checklist

Delete any that are not applicable, and add explanation below for any that are applicable but haven't been done

Screenshots of any UI changes have been added
New journey steps have been added to the appropriate journey integration test(s)
Test suite has been run in full locally and is passing
Branch has been rebased onto main and run locally, with everything working as expected (both for your new featureand any related functionality)
QA instructions have been added to the ticket (particularly if this is the last PR required to complete the ticket)
This feature is behind a feature flag. I've checked that there will be no change in function if the feature flag is disabled

…utes through to a new Provide this later page.

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

…flag is enabled / disabled

…s later button works

…ed for when the ff is disabled

…AndTenantsState

…-later-tenancy-details

…en there are no occupants

…ater to progress to cya

TomHanmer29

LGTM overall, just a few comments on style! Happy to approve after the bit with the feature flag in the journey framework is addressed, and please shout if there's anything you want to chat about around that, as it can be a little confusing :)

Travis-Softwire

I haven't reviewed the tests yet, but I think there are tweaks needed and I had a few questions so posting the review now. I'll come back when I've reviewed the tests as well with any further comments there

Travis-Softwire

And few more minor points on the tests

Travis-Softwire · 2026-07-28T12:00:33Z

+        val content = stepConfig.getStepSpecificContent(mockState)
+
+        // Assert
+        assertEquals("forms.buttons.saveAndContinue", content["submitButtonText"])


V. minor but I think elsewhere we split this into separate tests for content and the template

Done - split into separate tests

danielledias-MT · 2026-07-28T16:39:21Z

@TomHanmer29 @Travis-Softwire thanks for your reviews!
I still have one comment to addresses, I'll test things locally then I'll push changes when I'm ready tomorrow

TomHanmer29

One tiny point, and a quick check on the feature flagging. Otherwise happy, will leave to @Travis-Softwire to approve :)

Travis-Softwire

A few more points, all pretty minor. Should be good to go once they're addressed - the only one that I might want to see again if you disagree with the comment or the change is non-trivial is the point about forcing the user through the rent screens when they update the number of households - shout if that's a problem

Travis-Softwire · 2026-07-31T13:43:57Z

                HouseholdStep.ROUTE_SEGMENT, TenantsStep.ROUTE_SEGMENT -> {
-                    duplicableCheckAnswerTask(journey.householdsAndTenantsTask, { HouseHoldsAndTenantsDependencies(true) })
+                    if (featureFlagManager.checkFeature(PROPERTY_REGISTRATION_RESTRUCTURE_AND_SKIPPING)) {
+                        duplicableCheckAnswerTask(journey.tenancyDetailsTask)


Won't this force them through the rent section just to change the number of households or tenants? I don't think we want to do that

Yeah you are right - this is for the next PR for the new CYA designs. Will get this sorted

Travis-Softwire · 2026-07-31T13:47:20Z

            rentAmount = anyOrNull(),
            customPropertyType = anyOrNull(),
            markedJointLandlord = eq(true),
+            tenancyProvideLater = anyOrNull(),


Do we have tests that check we're correctly saving this when tenancyProvideLater is true?

Good spot, added a test

Travis-Softwire · 2026-07-31T13:48:28Z

        epcExemptionReason: EpcExemptionReason? = null,
        epcMeesExemptionReason: MeesExemptionReason? = null,
        epcProvideLater: Boolean? = null,
+        tenancyProvideLater: Boolean = false,


Out of interest, why are the other provide later's nullable with a default of null and this one is not nullable with a default of false?

I can't think of a valid reason, I'll update this to be consistent with the other provide later bools

Travis-Softwire · 2026-07-31T14:06:29Z

        mutableListOf<SummaryListRowViewModel>()
            .apply {
                val householdsStep = householdsAndTenantsState.households
+                if (householdsStep.outcome == HouseholdMode.PROVIDE_THIS_LATER) {


We also call this from in getCheckYourTenancyDetailsAnswersSummaryList which is also calling getRentBillsAndFurnishingsSummaryList which might not have been provided?

Fixed — added a guard in getCheckYourTenancyDetailsAnswersSummaryList so it only calls getRentBillsAndFurnishingsSummaryList when provideTenancyDetailsLater is false, mirroring the existing guard in getRestructuredOccupiedTenancyDetailsSummaryList.

Travis-Softwire · 2026-07-31T14:09:36Z

-        getCheckYourHouseHoldsAndTenantsAnswersSummaryList(state, state.householdsAndTenantsTask) +
-            getBedroomsRow(state) +
-            getRentBillsAndFurnishingsSummaryList(state, messageSource)
+        if (state.householdsAndTenantsTask.households.outcome == HouseholdMode.PROVIDE_THIS_LATER) {


Do we ever call this function if provide this later is turned on?

it can be called with provide-later on (when the property is occupied but tenancy details are being provided later)

Travis-Softwire · 2026-07-31T14:10:04Z

+            <p class="govuk-body" th:text="#{registerProperty.provideTenancyDetailsLater.whenToProvide.paragraph}">registerProperty.provideTenancyDetailsLater.whenToProvide.paragraph</p>
+
+            <p class="govuk-body" th:text="#{registerProperty.provideTenancyDetailsLater.reason}">registerProperty.provideTenancyDetailsLater.reason</p>
+            <ul class="govuk-list govuk-list--bullet" aria-label="We will need to know">


We should use a message key for the aria-label as well (if we actually need it? it's included in the content isn't it?)

Taking a look at Figma

I don't think we need this so will remove

Travis-Softwire · 2026-07-31T14:11:45Z

-                    nextStep { journey.taskListStep }
+                    nextDestination { _ ->
+                        when {
+                            state.provideTenancyDetailsLater -> Destination(state.cyaStep)


I think these should be journey.<> rather than state.<>

Travis-Softwire · 2026-07-31T14:13:20Z

                    withHeadingMessageKey("registerProperty.taskList.register.restructureAndSkipping.heading", false)
                } else {
-                    withHeadingMessageKey("registerProperty.taskList.register.old.heading")
+                    withHeadingMessageKey("registerProperty.taskList.register.heading")


I think the removing of the 'old' segment from this key might be a merge mistake?

Travis-Softwire · 2026-07-31T14:15:27Z


 interface PropertyRegistrationJourneyState :
    OccupationState,
+    TenancyDetailsState,


OccupationState already inherits TenancyDetailsState? Or is the idea that OccupationState will be broken up? If so but we're not ready to do that yet should it be a TODO?

Travis-Softwire · 2026-07-31T14:17:10Z

        val taskListPage =
            goToRestructuredPropertyRegistrationTaskList(
-                PropertyStateSessionBuilder.beforeTenancyDetails(),
+                beforeTenancyDetails(),


I think all the other calls to this use PropertyStateSessionBuilder.beforeTenancyDetails

danielledias-MT added 30 commits July 20, 2026 14:11

PDJB-942: Add 'Provide this later' button to Households page, this ro…

79b9354

…utes through to a new Provide this later page.

PDJB-942: Fix linting issues

d47f415

PDJB-942: Ensure submitNumberOfHouseholds works for when the feature …

180c5cd

…flag is enabled / disabled

PDJB-942: Remove enable feature flag as it is done in the BeforeEach

e77d08c

PDJB-942: Add happy path test on households page to check provide thi…

cfa0ee6

…s later button works

PDJB-942: Households - Check provide this later button is not display…

3ef5b59

…ed for when the ff is disabled

PDJB-942: Merge with main

4ef0d04

PDJB-942: Fix linting issue

6074bd9

PDJB-942: Update household test for when FF is enabled

e2b15cb

PDJB-942: Add single page test for provide tenancy details later

72a33f3

PDJB-942: Merge with main

fb0fddd

PDJB-942: Correct linting issues

4d2b04b

PDJB-942: Add allowProvideTenancyDetailsLaterRoute flag on Households…

0a84166

…AndTenantsState

PDJB-942: Correct linting issues

b6c707b

Merge remote-tracking branch 'origin/main' into feat/pdjb-942-provide…

f389351

…-later-tenancy-details

PDJB-942: Populate Provide Tenancy Details Later form

ddb191c

PDJB-942: Add tests

330bb0f

PDJB-942: Provide this later takes user to CYA

2259b44

PDJB-942: Ensure you go to bills after households

76a45ac

PDJB-942: Remove code comments, tenancy details is not requirement wh…

ba2dbdf

…en there are no occupants

PDJB-942: Merge with main

3bf525a

PDJB-942: Merge with main

286931d

PDJB-942: Revert change

4d209fd

PDJB-942: Revert changes

1752bb4

PDJB-942: Merge with main

3a79428

PDJB-942: Update tests

22353cf

PDJB-942: Ensure Tenancy details is marked as complete when provide l…

61d5ab7

…ater to progress to cya

PDJB-942: Add additional tests

32a2bce

PDJB-942: Add additional test

6a3b040

danielledias-MT added 5 commits July 24, 2026 14:23

PDJB-942: Tests

3f3a810

PDJB-942: Correct usings

5859bce

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

04e5c10

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

255cb2c

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

2963357

TomHanmer29 reviewed Jul 28, 2026

View reviewed changes

Travis-Softwire requested changes Jul 28, 2026

View reviewed changes

danielledias-MT added 2 commits July 29, 2026 11:11

PDJB-942: Address PR comments

0ebd18c

PDJB-942: Linting

00f3678

danielledias-MT force-pushed the feat/pdjb-provide-later-tenancy-details-part-2 branch from df6d8c0 to 00f3678 Compare July 29, 2026 11:18

danielledias-MT added 6 commits July 29, 2026 12:24

PDJB-942: Merge with main

2fa346a

PDJB-942: Merge with main

7a3f813

PDJB-942: Fix test setups

ca9cfa8

PDJB-942: Linting

5a61052

PDJB-942: remove .DS_Store from PR

a426b17

PDJB-942: Merge with main

1e8a607

TomHanmer29 reviewed Jul 29, 2026

View reviewed changes

Comment thread ...communities/prsdb/webapp/journeys/propertyRegistration/PropertyRegistrationJourneyFactory.kt Outdated

Comment thread ...communities/prsdb/webapp/journeys/propertyRegistration/PropertyRegistrationJourneyFactory.kt Outdated

danielledias-MT added 9 commits July 29, 2026 16:42

PDJB-942: Address PR comments

276ddc4

PDJB-942: Fix bug

4aff61d

PDJB-942 - Merge with main

72b2247

PDJB-942 - Linting

41b18f7

PDJB-942 - Merge with main

7dd73bd

PDJB-942 - update tests

f7b7be8

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

a5db270

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

b9e1b3c

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

2651997

Travis-Softwire approved these changes Jul 31, 2026

View reviewed changes

Merge branch 'main' into feat/pdjb-provide-later-tenancy-details-part-2

335515e

Uh oh!

Conversation

danielledias-MT commented Jul 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ticket number

Goal of change

Description of main change(s)

Anything you'd like to highlight to the reviewer?

Checklist

Uh oh!

TomHanmer29 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Travis-Softwire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Travis-Softwire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

danielledias-MT commented Jul 28, 2026

Uh oh!

TomHanmer29 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Travis-Softwire left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

danielledias-MT Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

danielledias-MT commented Jul 23, 2026 •

edited

Loading

danielledias-MT Jul 31, 2026 •

edited

Loading