Skip to content

PDJB-1168: add change links to org landlord CYA page #1628

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

Open
TomHanmer29 wants to merge 19 commits into
base: main
Choose a base branch
from
Open

PDJB-1168: add change links to org landlord CYA page #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1a1497d
PDJB-1168: add change links
TomHanmer29 Jul 21, 2026
d290cbd
PDJB-1168: recombine cyas
TomHanmer29 Jul 24, 2026
1085831
PDJB-1168: fix org / individual change link
TomHanmer29 Jul 24, 2026
9c80e75
PDJB-1168: fix companys house CYA
TomHanmer29 Jul 24, 2026
aa2d861
PDJB-1168: fix gov body member change links
TomHanmer29 Jul 24, 2026
4aa19da
PDJB-1168: rebase fixes
TomHanmer29 Jul 29, 2026
ecba207
PDJB-1168: extract out nested task and update TODOs
TomHanmer29 Jul 29, 2026
b60759a
PDJB-1168: WIP individual landlord change journey
TomHanmer29 Jul 29, 2026
3c2b661
PDJB-1168: flag off cya change properly
TomHanmer29 Jul 30, 2026
b3b3bc1
PDJB-1168: change link tests
TomHanmer29 Jul 30, 2026
c287e3b
PDJB-1168: add TODOs for change pages
TomHanmer29 Jul 30, 2026
91a65fb
Merge remote-tracking branch 'origin/main' into feat/PDJB-1168-org-la…
TomHanmer29 Jul 31, 2026
4c9c606
PDJB-1168: restructure tasks to make them better for update journies
TomHanmer29 Jul 31, 2026
8890619
Merge remote-tracking branch 'origin/main' into feat/PDJB-1168-org-la…
TomHanmer29 Jul 31, 2026
547989b
PDJB-1168: fix tests
TomHanmer29 Jul 31, 2026
bea079e
PDJB-1168: strengthen cya conditions
TomHanmer29 Jul 31, 2026
58f50bf
PDJB-1168: revert task restructure
TomHanmer29 Jul 31, 2026
bdf0a1a
PDJB-1168: naming fixes
TomHanmer29 Jul 31, 2026
6874873
PDJB-1168: improve change link granularity
TomHanmer29 Jul 31, 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
61 changes: 12 additions & 49 deletions ...prsdb/webapp/journeys/landlordRegistration/states/LandlordRegistrationOrgLandlordState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,30 @@
package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states

import uk.gov.communities.prsdb.webapp.journeys.JourneyState
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.HasAnyGovBodyMembersStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteeDobStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteeEmailStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteeNameStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteePhoneStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgAddressStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityNumberEnglandAndWalesStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityNumberNorthernIrelandStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityNumberScotlandStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityRegisteredWithStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCompanyNumberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgEmailStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyDetailsStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMemberDobStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMemberListStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMemberNameStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMustProvideInfoStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyWhoToProvideStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgIsRegisteredCharityStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgIsRegisteredCompanyStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgMainContactStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgNameStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgPhoneNumberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgTypeStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.RemoveGovBodyMemberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.SaveGovBodyMemberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.SetStateForGovBodyMemberEditStep
import uk.gov.communities.prsdb.webapp.journeys.shared.tasks.AddressTask
import uk.gov.communities.prsdb.webapp.models.dataModels.GoverningBodyMemberDataModel
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.UpdateDetailsTodoStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.tasks.LeadTrusteeTask
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.tasks.OrgCharityTask
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.tasks.OrgCompaniesHouseTask
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.tasks.OrgGovBodyTask

interface LandlordRegistrationOrgLandlordState : JourneyState {
val orgNameStep: OrgNameStep
val orgAddressStep: OrgAddressStep
val orgEmailStep: OrgEmailStep
val orgPhoneNumberStep: OrgPhoneNumberStep
val orgTypeStep: OrgTypeStep
val orgIsRegisteredCompanyStep: OrgIsRegisteredCompanyStep
val orgCompanyNumberStep: OrgCompanyNumberStep
val orgIsRegisteredCharityStep: OrgIsRegisteredCharityStep
val orgCharityRegisteredWithStep: OrgCharityRegisteredWithStep
val orgCharityNumberEnglandAndWalesStep: OrgCharityNumberEnglandAndWalesStep
val orgCharityNumberNorthernIrelandStep: OrgCharityNumberNorthernIrelandStep
val orgCharityNumberScotlandStep: OrgCharityNumberScotlandStep
val leadTrusteeNameStep: LeadTrusteeNameStep
val leadTrusteeEmailStep: LeadTrusteeEmailStep
val leadTrusteePhoneStep: LeadTrusteePhoneStep
val leadTrusteeDobStep: LeadTrusteeDobStep
val trusteeAddressTask: AddressTask
val companiesHouseTask: OrgCompaniesHouseTask
val orgGovBodyTask: OrgGovBodyTask
val charityTask: OrgCharityTask
val leadTrusteeTask: LeadTrusteeTask
val orgMainContactStep: OrgMainContactStep
val orgGovBodyDetailsStep: OrgGovBodyDetailsStep
val orgGovBodyMustProvideInfoStep: OrgGovBodyMustProvideInfoStep
val orgGovBodyWhoToProvideStep: OrgGovBodyWhoToProvideStep
val orgGovBodyMemberNameStep: OrgGovBodyMemberNameStep
val orgGovBodyMemberDobStep: OrgGovBodyMemberDobStep
val govBodyMemberAddressTask: AddressTask
val orgGovBodyMemberListStep: OrgGovBodyMemberListStep
val hasAnyGovBodyMembersStep: HasAnyGovBodyMembersStep
val saveGovBodyMemberStep: SaveGovBodyMemberStep
val setStateForGovBodyMemberEditStep: SetStateForGovBodyMemberEditStep
val removeGovBodyMemberStep: RemoveGovBodyMemberStep
var governingBodyMembersMap: Map<Int, GoverningBodyMemberDataModel>?
var nextGoverningBodyMemberId: Int?
var editingGovBodyMemberId: Int?

// TODO PDJB-1237 PDJB-1238: remove this placeholder once the org type and companies house update journeys exist.
val updateDetailsTodoStep: UpdateDetailsTodoStep
}
6 changes: 2 additions & 4 deletions ...ommunities/prsdb/webapp/journeys/landlordRegistration/states/LandlordRegistrationState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states

import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.EmailStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.IndividualLandlordRegistrationCyaStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LandlordRegistrationCyaStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LandlordTypeStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgLandlordRegistrationCyaStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.PhoneNumberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.PrivacyNoticeStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.tasks.IdentityTask
Expand All @@ -22,6 +21,5 @@ interface LandlordRegistrationState :
val privacyNoticeStep: PrivacyNoticeStep
val identityTask: IdentityTask
override val finishCyaStep: FinishCyaJourneyStep
override val cyaStep: IndividualLandlordRegistrationCyaStep
val orgCyaStep: OrgLandlordRegistrationCyaStep
override val cyaStep: LandlordRegistrationCyaStep
}
16 changes: 16 additions & 0 deletions .../uk/gov/communities/prsdb/webapp/journeys/landlordRegistration/states/LeadTrusteeState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states

import uk.gov.communities.prsdb.webapp.journeys.JourneyState
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteeDobStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteeEmailStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteeNameStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.LeadTrusteePhoneStep
import uk.gov.communities.prsdb.webapp.journeys.shared.tasks.AddressTask

interface LeadTrusteeState : JourneyState {
val leadTrusteeNameStep: LeadTrusteeNameStep
val leadTrusteeDobStep: LeadTrusteeDobStep
val leadTrusteeEmailStep: LeadTrusteeEmailStep
val leadTrusteePhoneStep: LeadTrusteePhoneStep
val trusteeAddressTask: AddressTask
}
16 changes: 16 additions & 0 deletions ...n/uk/gov/communities/prsdb/webapp/journeys/landlordRegistration/states/OrgCharityState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states

import uk.gov.communities.prsdb.webapp.journeys.JourneyState
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityNumberEnglandAndWalesStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityNumberNorthernIrelandStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityNumberScotlandStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCharityRegisteredWithStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgIsRegisteredCharityStep

interface OrgCharityState : JourneyState {
val orgIsRegisteredCharityStep: OrgIsRegisteredCharityStep
val orgCharityRegisteredWithStep: OrgCharityRegisteredWithStep
val orgCharityNumberEnglandAndWalesStep: OrgCharityNumberEnglandAndWalesStep
val orgCharityNumberNorthernIrelandStep: OrgCharityNumberNorthernIrelandStep
val orgCharityNumberScotlandStep: OrgCharityNumberScotlandStep
}
10 changes: 10 additions & 0 deletions ...v/communities/prsdb/webapp/journeys/landlordRegistration/states/OrgCompaniesHouseState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states

import uk.gov.communities.prsdb.webapp.journeys.JourneyState
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgCompanyNumberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgIsRegisteredCompanyStep

interface OrgCompaniesHouseState : JourneyState {
val orgIsRegisteredCompanyStep: OrgIsRegisteredCompanyStep
val orgCompanyNumberStep: OrgCompanyNumberStep
}
32 changes: 32 additions & 0 deletions ...n/uk/gov/communities/prsdb/webapp/journeys/landlordRegistration/states/OrgGovBodyState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states

import uk.gov.communities.prsdb.webapp.journeys.JourneyState
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.HasAnyGovBodyMembersStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyDetailsStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMemberDobStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMemberListStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMemberNameStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyMustProvideInfoStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgGovBodyWhoToProvideStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.RemoveGovBodyMemberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.SaveGovBodyMemberStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.SetStateForGovBodyMemberEditStep
import uk.gov.communities.prsdb.webapp.journeys.shared.tasks.AddressTask
import uk.gov.communities.prsdb.webapp.models.dataModels.GoverningBodyMemberDataModel

interface OrgGovBodyState : JourneyState {
val orgGovBodyDetailsStep: OrgGovBodyDetailsStep
val orgGovBodyMustProvideInfoStep: OrgGovBodyMustProvideInfoStep
val orgGovBodyWhoToProvideStep: OrgGovBodyWhoToProvideStep
val orgGovBodyMemberNameStep: OrgGovBodyMemberNameStep
val orgGovBodyMemberDobStep: OrgGovBodyMemberDobStep
val govBodyMemberAddressTask: AddressTask
val orgGovBodyMemberListStep: OrgGovBodyMemberListStep
val hasAnyGovBodyMembersStep: HasAnyGovBodyMembersStep
val saveGovBodyMemberStep: SaveGovBodyMemberStep
val setStateForGovBodyMemberEditStep: SetStateForGovBodyMemberEditStep
val removeGovBodyMemberStep: RemoveGovBodyMemberStep
var governingBodyMembersMap: Map<Int, GoverningBodyMemberDataModel>?
var nextGoverningBodyMemberId: Int?
var editingGovBodyMemberId: Int?
}
8 changes: 4 additions & 4 deletions ...s/prsdb/webapp/journeys/landlordRegistration/stepConfig/HasAnyGovBodyMembersStepConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ package uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig
import uk.gov.communities.prsdb.webapp.annotations.webAnnotations.JourneyFrameworkComponent
import uk.gov.communities.prsdb.webapp.journeys.AbstractInternalStepConfig
import uk.gov.communities.prsdb.webapp.journeys.JourneyStep
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states.LandlordRegistrationOrgLandlordState
import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.states.OrgGovBodyState
import uk.gov.communities.prsdb.webapp.journeys.shared.AnyMembers

@JourneyFrameworkComponent
class HasAnyGovBodyMembersStepConfig : AbstractInternalStepConfig<AnyMembers, LandlordRegistrationOrgLandlordState>() {
override fun mode(state: LandlordRegistrationOrgLandlordState) =
class HasAnyGovBodyMembersStepConfig : AbstractInternalStepConfig<AnyMembers, OrgGovBodyState>() {
override fun mode(state: OrgGovBodyState) =
if (state.governingBodyMembersMap.isNullOrEmpty()) AnyMembers.NO_MEMBERS else AnyMembers.SOME_MEMBERS
}

@JourneyFrameworkComponent
final class HasAnyGovBodyMembersStep(
stepConfig: HasAnyGovBodyMembersStepConfig,
) : JourneyStep.InternalStep<AnyMembers, LandlordRegistrationOrgLandlordState>(stepConfig)
) : JourneyStep.InternalStep<AnyMembers, OrgGovBodyState>(stepConfig)
Loading
Loading