From 5c3d376f5c2d1308600b45ba8605255402a60446 Mon Sep 17 00:00:00 2001 From: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Date: Tue, 28 Jan 2025 18:00:26 +0000 Subject: [PATCH 1/5] CIV-0000 pointing to new camunda image path (#5303) * pointing to new image path * setting camunda for wa --- charts/civil-ccd/values.enableWA.preview.template.yaml | 1 + charts/civil-ccd/values.template.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/civil-ccd/values.enableWA.preview.template.yaml b/charts/civil-ccd/values.enableWA.preview.template.yaml index bf4a326871..cddb2cdd93 100644 --- a/charts/civil-ccd/values.enableWA.preview.template.yaml +++ b/charts/civil-ccd/values.enableWA.preview.template.yaml @@ -97,6 +97,7 @@ wa: disabled: true camunda-bpm: java: + image: hmctsprivatetemp.azurecr.io/camunda/bpm:latest environment: CAMUNDA_DB_USER_NAME: "hmcts" CAMUNDA_DB_PASSWORD: ${POSTGRES_PASSWORD} diff --git a/charts/civil-ccd/values.template.yaml b/charts/civil-ccd/values.template.yaml index bbd04ddc5d..ac07750d33 100644 --- a/charts/civil-ccd/values.template.yaml +++ b/charts/civil-ccd/values.template.yaml @@ -6,7 +6,7 @@ civil-translation: am-org-role-mapping-service: enabled: false - + civil-general-applications: java: image: 'hmctspublic.azurecr.io/civil/general-applications:latest' @@ -345,6 +345,7 @@ camunda-bpm: enabled: true java: imagePullPolicy: Always + image: hmctsprivatetemp.azurecr.io/camunda/bpm:latest ingressHost: camunda-${SERVICE_FQDN} disableKeyVaults: true releaseNameOverride: ${SERVICE_NAME}-camunda From 903356498588fdd97c23356fda5de81bfa4407e3 Mon Sep 17 00:00:00 2001 From: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Date: Thu, 30 Jan 2025 07:06:20 +0000 Subject: [PATCH 2/5] CIV-16311 HMC NRO Release (#5273) * Moved hmc-nro field changes to the correct prod and non prod files * Re removed hmc-nro nonprod file * pointing to new image path --------- Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> --- .../FinalOrders-MINTI-nonprod.json | 25 ++ .../FinalOrders-MINTI-prod.json | 20 + .../ManageStay-caseworkerEvents-nonprod.json | 20 + ...mPaidInFull-SettleDiscontinue-nonprod.json | 80 ++++ ...Discontinue-SettleDiscontinue-nonprod.json | 70 ++++ ...tionIntegrationFields-HMC-NRO-nonprod.json | 357 ------------------ ...rkAllocationIntegrationFields-HMC-NRO.json | 162 ++++++++ 7 files changed, 377 insertions(+), 357 deletions(-) delete mode 100644 ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO-nonprod.json create mode 100644 ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO.json diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json index 9b9070961e..8f12638430 100644 --- a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json @@ -1,4 +1,29 @@ [ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 98, + "DisplayContext": "READONLY", + "PageID": "TrackAllocation", + "PageDisplayOrder": 1, + "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", + "RetainHiddenValue": "Y", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "DisplayContext": "READONLY", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 99, + "DisplayContext": "READONLY", + "PageID": "TrackAllocation", + "PageDisplayOrder": 1, + "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", + "RetainHiddenValue": "Y", + "Publish": "Y" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-prod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-prod.json index ba71d8da21..16a74f1a53 100644 --- a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-prod.json +++ b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-prod.json @@ -584,5 +584,25 @@ "DisplayContext": "COMPLEX", "PageID": "FinalOrderPreview", "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/ManageStay-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/ManageStay-caseworkerEvents-nonprod.json index a67e6af33d..f66029ee60 100644 --- a/ccd-definition/CaseEventToFields/ManageStay-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/ManageStay-caseworkerEvents-nonprod.json @@ -85,5 +85,25 @@ "PageDisplayOrder": 2, "ShowSummaryChangeOption": "N", "PageShowCondition": "manageStayOption = \"REQUEST_UPDATE\"" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "MANAGE_STAY", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "MANAGE_STAY", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/SettleClaimPaidInFull-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/SettleClaimPaidInFull-SettleDiscontinue-nonprod.json index 7afc6f9e67..39b3214e2e 100644 --- a/ccd-definition/CaseEventToFields/SettleClaimPaidInFull-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/SettleClaimPaidInFull-SettleDiscontinue-nonprod.json @@ -86,5 +86,85 @@ "ShowSummaryChangeOption": "N", "FieldShowCondition": "markPaidForAllClaimants=\"DO NOT SHOW IN UI\"", "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json index 91aa08883a..8eddf851d3 100644 --- a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json @@ -129,5 +129,75 @@ "ShowSummaryChangeOption": "N", "FieldShowCondition":"confirmOrderGivesPermission=\"DO NOT SHOW ON UI\"", "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 1, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 1, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 1, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO-nonprod.json deleted file mode 100644 index 0a35729685..0000000000 --- a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO-nonprod.json +++ /dev/null @@ -1,357 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "CREATE_SDO", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "CREATE_SDO", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "COURT_OFFICER_ORDER", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "COURT_OFFICER_ORDER", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "CaseFieldID": "allocatedTrack", - "PageFieldDisplayOrder": 98, - "DisplayContext": "READONLY", - "PageID": "TrackAllocation", - "PageDisplayOrder": 1, - "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", - "RetainHiddenValue": "Y", - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "DisplayContext": "READONLY", - "CaseFieldID": "responseClaimTrack", - "PageFieldDisplayOrder": 99, - "DisplayContext": "READONLY", - "PageID": "TrackAllocation", - "PageDisplayOrder": 1, - "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", - "RetainHiddenValue": "Y", - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "CaseFieldID": "orderType", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "CaseFieldID": "caseManagementOrderSelection", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_SCHEDULED_RETRIGGER", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_SCHEDULED_RETRIGGER", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 1, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "allocatedTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "responseClaimTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 1, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 1, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "allocatedTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "responseClaimTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", - "CaseFieldID": "allocatedTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", - "CaseFieldID": "responseClaimTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM", - "CaseFieldID": "allocatedTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM", - "CaseFieldID": "responseClaimTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_FEE_UNPAID", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_FEE_UNPAID", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_FEE_UNPAID", - "CaseFieldID": "allocatedTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_FEE_UNPAID", - "CaseFieldID": "responseClaimTrack", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "MANAGE_STAY", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "MANAGE_STAY", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - } -] diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO.json new file mode 100644 index 0000000000..596a09b3b3 --- /dev/null +++ b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-NRO.json @@ -0,0 +1,162 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CREATE_SDO", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CREATE_SDO", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "COURT_OFFICER_ORDER", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "COURT_OFFICER_ORDER", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderType", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "caseManagementOrderSelection", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED_RETRIGGER", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED_RETRIGGER", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_FEE_UNPAID", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_FEE_UNPAID", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_FEE_UNPAID", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_FEE_UNPAID", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + } +] From f05f288c96c6c7a3835761474afdb8a92b34a175 Mon Sep 17 00:00:00 2001 From: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Date: Thu, 30 Jan 2025 10:30:51 +0000 Subject: [PATCH 3/5] CIV-16297 Hearing date for order after hearing (#5263) * CIV-16297 Hearing date for order after hearing * api test updates * api test updates * point to service PR * moving back to latest image * skip e2es * rename files --------- Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> --- .../AuthorisationCaseField-MINTI-nonprod.json | 24 +++++++++ .../FinalOrders-MINTI-nonprod.json | 43 +++++++++++++++ .../FinalOrders-MINTI-nonprod.json | 34 ++++++++++-- .../CaseField/CaseField-MINTI-nonprod.json | 16 ++++++ ...fterHearing_HearingDate-MINTI-nonprod.json | 53 +++++++++++++++++++ ...erAfterHearingDateTypes-MINTI-nonprod.json | 20 +++++++ e2e/fixtures/events/finalOrder.js | 6 ++- ...pec_minti_finalOrder_upload_bundle_test.js | 2 +- 8 files changed, 190 insertions(+), 8 deletions(-) create mode 100644 ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json create mode 100644 ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json create mode 100644 ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json index 17e0035cb3..638b386b59 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json @@ -352,6 +352,30 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "orderAfterHearingDate", + "AccessControl": [ + { + "UserRoles": [ + "judge-profile" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "showOrderAfterHearingDatePage", + "AccessControl": [ + { + "UserRoles": [ + "judge-profile" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "confirmListingTickBox", diff --git a/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json new file mode 100644 index 0000000000..e597ded19c --- /dev/null +++ b/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json @@ -0,0 +1,43 @@ +[ + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "dateType", + "FieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "EventElementLabel": "Enter date(s) of hearing" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "date", + "FieldDisplayOrder": 2, + "DisplayContext": "MANDATORY" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "fromDate", + "FieldDisplayOrder": 3, + "DisplayContext": "MANDATORY" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "toDate", + "FieldDisplayOrder": 4, + "DisplayContext": "MANDATORY" + }, + { + "ID": "OrderAfterHearingDate", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "ListElementCode": "bespokeDates", + "FieldDisplayOrder": 5, + "DisplayContext": "MANDATORY" + } +] diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json index 8f12638430..6291ddb7dd 100644 --- a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json @@ -35,6 +35,17 @@ "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", "ShowSummaryChangeOption": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "showOrderAfterHearingDatePage", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "TrackAllocation", + "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"", + "ShowSummaryChangeOption": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", @@ -706,12 +717,25 @@ "ShowSummaryChangeOption": "Y", "PageShowCondition": "finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\"" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "orderAfterHearingDate", + "PageLabel": "Order Made", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 1, + "DisplayContext": "COMPLEX", + "PageID": "OrderAfterHearingDate", + "ShowSummaryChangeOption": "Y", + "PageShowCondition": "showOrderAfterHearingDatePage=\"Yes\"", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/hearing-date-order" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "downloadTemplateLabel1", "PageLabel": "Download template", - "PageDisplayOrder": 5, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "DownloadTemplate", @@ -722,7 +746,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "finalOrderDownloadTemplateDocument", - "PageDisplayOrder": 5, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "DownloadTemplate", @@ -733,7 +757,7 @@ "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "downloadTemplateLabel2", "PageLabel": "Download template", - "PageDisplayOrder": 5, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 3, "DisplayContext": "READONLY", "PageID": "DownloadTemplate", @@ -744,7 +768,7 @@ "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "uploadOrderDocumentFromTemplateLabel", "PageLabel": "Upload order", - "PageDisplayOrder": 6, + "PageDisplayOrder": 7, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "UploadOrder", @@ -755,7 +779,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "uploadOrderDocumentFromTemplate", - "PageDisplayOrder": 6, + "PageDisplayOrder": 7, "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "UploadOrder", diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json index 49fdb56c22..28bef148c9 100644 --- a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json +++ b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json @@ -209,5 +209,21 @@ "FieldType": "TaskManagementLocationTab", "SecurityClassification": "Public", "Searchable": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "orderAfterHearingDate", + "Label": " ", + "FieldType": "OrderAfterHearingDate", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "showOrderAfterHearingDatePage", + "Label": " ", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json b/ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json new file mode 100644 index 0000000000..7e0f154ae3 --- /dev/null +++ b/ccd-definition/ComplexTypes/DQ/1_OrderAfterHearing_HearingDate-MINTI-nonprod.json @@ -0,0 +1,53 @@ +[ + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "dateType", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "OrderAfterHearingDateType", + "ElementLabel": "Enter date(s) of hearing", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "date", + "FieldType": "Date", + "ElementLabel": "Date", + "SecurityClassification": "Public", + "HintText": "For example 16 4 2021", + "FieldShowCondition": "dateType = \"SINGLE_DATE\"", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "fromDate", + "FieldType": "Date", + "ElementLabel": "Date from", + "SecurityClassification": "Public", + "HintText": "For example 16 4 2021", + "FieldShowCondition": "dateType = \"DATE_RANGE\"", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "toDate", + "FieldType": "Date", + "ElementLabel": "Date to", + "SecurityClassification": "Public", + "FieldShowCondition": "dateType = \"DATE_RANGE\"", + "HintText": "For example 16 4 2021", + "Searchable": "N" + }, + { + "ID": "OrderAfterHearingDate", + "ListElementCode": "bespokeDates", + "FieldType": "TextArea", + "ElementLabel": "Enter a bespoke range of dates for hearing", + "HintText": "For example, 16 4 2021, 19-20 4 2021 and 11-12 5 2021", + "SecurityClassification": "Public", + "FieldShowCondition": "dateType = \"BESPOKE_RANGE\"", + "Searchable": "N" + } +] + + diff --git a/ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json b/ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json new file mode 100644 index 0000000000..10870a2c7c --- /dev/null +++ b/ccd-definition/FixedLists/OrderAfterHearingDateTypes-MINTI-nonprod.json @@ -0,0 +1,20 @@ +[ + { + "ID": "OrderAfterHearingDateType", + "ListElementCode": "SINGLE_DATE", + "ListElement": "Single date", + "DisplayOrder": 1 + }, + { + "ID": "OrderAfterHearingDateType", + "ListElementCode": "DATE_RANGE", + "ListElement": "Date range", + "DisplayOrder": 2 + }, + { + "ID": "OrderAfterHearingDateType", + "ListElementCode": "BESPOKE_RANGE", + "ListElement": "Bespoke range", + "DisplayOrder": 3 + } +] diff --git a/e2e/fixtures/events/finalOrder.js b/e2e/fixtures/events/finalOrder.js index 5b567469ab..0959286587 100644 --- a/e2e/fixtures/events/finalOrder.js +++ b/e2e/fixtures/events/finalOrder.js @@ -99,7 +99,8 @@ const createIntermediateDownloadOrder = () => { TrackAllocation: { finalOrderTrackToggle: 'INTERMEDIATE_CLAIM', finalOrderAllocateToTrack: 'Yes', - finalOrderTrackAllocation: 'INTERMEDIATE_CLAIM' + finalOrderTrackAllocation: 'INTERMEDIATE_CLAIM', + showOrderAfterHearingDatePage: 'No' }, IntermediateTrackComplexityBand: { finalOrderIntermediateTrackComplexityBand: { @@ -133,7 +134,8 @@ const createMultiDownloadOrder = () => { TrackAllocation: { finalOrderTrackToggle: 'MULTI_CLAIM', finalOrderAllocateToTrack: 'Yes', - finalOrderTrackAllocation: 'MULTI_CLAIM' + finalOrderTrackAllocation: 'MULTI_CLAIM', + showOrderAfterHearingDatePage: 'No' }, SelectTemplate: { finalOrderDownloadTemplateOptions: { diff --git a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js index 52c44481c2..009074b96d 100644 --- a/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js +++ b/e2e/tests/ui_tests/minti/unSpec_minti_finalOrder_upload_bundle_test.js @@ -11,7 +11,7 @@ const judgeUser = config.judgeUserWithRegionId1; const hearingCenterAdminToBeUsed = config.hearingCenterAdminWithRegionId1; let civilCaseReference; -Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle @non-prod-e2e-ft'); +Feature('Intermediate and Multi tracks - Download order template Journey - Upload Bundle'); Scenario('1v2 Same Solicitor Int Track - Download order template - Upload Bundle', async ({api, I}) => { const mpScenario = 'ONE_V_TWO_ONE_LEGAL_REP'; From 45dc41e19dc8fc5aa9452e5894c3d3044abee875 Mon Sep 17 00:00:00 2001 From: AbuSalamHMCTS <138011124+AbuSalamHMCTS@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:25:26 +0000 Subject: [PATCH 4/5] DTSCCI-1095 create page objects and content for add litigation friend (#5214) * DTSCCI-1095 Create Page Objects and Content for Add Litigation Friend * DTSCCI-1095 Create Page Objects and Content for Add Litigation Friend * update page object for add defendant litigation friend to match coding standards --------- Co-authored-by: AbuSalam22 <136581242+AbuSalam22@users.noreply.github.com> Co-authored-by: kdaHMCTS <128375235+kdaHMCTS@users.noreply.github.com> Co-authored-by: kdaHMCTS --- ...efendant-litigation-friend-page-factory.ts | 33 +++++++++++++++++ ...add-defendant-litigation-friend-content.ts | 1 + ...rm-add-defendant-litigation-friend-page.ts | 17 +++++++++ .../defendant-2-litigation-friend-content.ts | 12 +++++++ .../defendant-2-litigation-friend-page.ts | 35 +++++++++++++++++++ .../litigation-friend-content.ts | 12 +++++++ .../litigation-friend-page.ts | 35 +++++++++++++++++++ ...it-add-defendant-litigation-friend-page.ts | 15 ++++++++ .../create-claim/create-claim-page-factory.ts | 7 +++- .../claimant-litigation-friend-page.ts | 7 ++-- .../ui/page-factory-fixtures.ts | 5 +++ .../add-defendant-litigation-friend-steps.ts | 21 +++++++++++ 12 files changed, 194 insertions(+), 6 deletions(-) create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/submit-add-defendant-litigation-friend/submit-add-defendant-litigation-friend-page.ts create mode 100644 playwright-e2e/steps/ui/exui/solicitor-events/add-defendant-litigation-friend-steps.ts diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory.ts new file mode 100644 index 0000000000..cd6fdb8812 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory.ts @@ -0,0 +1,33 @@ +import BasePageFactory from '../../../../base/base-page-factory'; +import partys from '../../../../constants/partys'; +import LitigationFriendFragment from '../../fragments/litigation-friend/litigation-friend-fragment'; +import ConfirmAddDefendantLitigationFriendPage from './unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-page'; +import Defendant2LitigationFriendPage from './unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-page'; +import LitigationFriendPage from './unspec/litigation-friend/litigation-friend-page'; +import SubmitAddDefendantLitigationFriendPage from './unspec/submit-add-defendant-litigation-friend/submit-add-defendant-litigation-friend-page'; + +export default class AddDefendantLitigationFriendPageFactory extends BasePageFactory { + get litigationFriendPage() { + const litigationFriendFragment = new LitigationFriendFragment( + this.page, + partys.DEFENDANT_1_LITIGATION_FRIEND, + ); + return new LitigationFriendPage(this.page, litigationFriendFragment); + } + + get defendant2LitigationFriendPage() { + const litigationFriendFragment = new LitigationFriendFragment( + this.page, + partys.DEFENDANT_2_LITIGATION_FRIEND, + ); + return new Defendant2LitigationFriendPage(this.page, litigationFriendFragment); + } + + get submitAddDefendantLitigationFriend() { + return new SubmitAddDefendantLitigationFriendPage(this.page); + } + + get confirmAddDefendantLitigationFriend() { + return new ConfirmAddDefendantLitigationFriendPage(this.page); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-content.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-content.ts new file mode 100644 index 0000000000..74a036fb21 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-content.ts @@ -0,0 +1 @@ +export const confirmationHeading = 'You have added litigation friend details'; diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-page.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-page.ts new file mode 100644 index 0000000000..a034df7dca --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/confirm-add-defendant-litigation-friend/confirm-add-defendant-litigation-friend-page.ts @@ -0,0 +1,17 @@ +import BasePage from '../../../../../../base/base-page'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data'; +import ExuiPage from '../../../../exui-page/exui-page'; +import { confirmationHeading } from './confirm-add-defendant-litigation-friend-content'; + +export default class ConfirmAddDefendantLitigationFriendPage extends ExuiPage(BasePage) { + async verifyContent(ccdCaseData: CCDCaseData) { + await super.runVerifications([ + super.verifyHeadings(ccdCaseData), + super.expectHeading(confirmationHeading), + ]); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-content.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-content.ts new file mode 100644 index 0000000000..3b2fbcde50 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-content.ts @@ -0,0 +1,12 @@ +import { Party } from '../../../../../../models/partys'; + +export const subheadings = { + litigationDetails: 'Defendant 2 litigation details', +}; + +export const radioButtons = { + address: { + label: + "Is the address of the Defendant's litigation friend the same as the address of the Defendant?", + }, +}; diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-page.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-page.ts new file mode 100644 index 0000000000..c1fde2fc18 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/defendant-2-litigation-friend/defendant-2-litigation-friend-page.ts @@ -0,0 +1,35 @@ +import { Page } from 'playwright-core'; +import BasePage from '../../../../../../base/base-page'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps'; +import ExuiPage from '../../../../exui-page/exui-page'; +import LitigationFriendFragment from '../../../../fragments/litigation-friend/litigation-friend-fragment'; +import { radioButtons, subheadings } from './defendant-2-litigation-friend-content'; + +@AllMethodsStep() +export default class Defendant2LitigationFriendPage extends ExuiPage(BasePage) { + private litigationFriendFragment: LitigationFriendFragment; + + constructor(page: Page, litigationFriendFragment: LitigationFriendFragment) { + super(page); + this.litigationFriendFragment = litigationFriendFragment; + } + + async verifyContent() { + await super.runVerifications([ + super.verifyHeadings(), + this.litigationFriendFragment.verifyContent(), + super.expectSubheading(subheadings.litigationDetails), + super.expectText(radioButtons.address.label), + ]); + } + + async enterLitigationFriendDetails() { + await this.litigationFriendFragment.enterLitigationFriendDetails(); + await this.litigationFriendFragment.chooseNoSameAddress(); + await this.litigationFriendFragment.uploadCertificateOfSuitability(); + } + + async submit() { + await super.clickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-content.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-content.ts new file mode 100644 index 0000000000..d5b00bc46f --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-content.ts @@ -0,0 +1,12 @@ +import { Party } from '../../../../../../models/partys'; + +export const subheadings = { + litigationDetails: 'Defendant litigation details', +}; + +export const radioButtons = { + address: { + label: + "Is the address of the Defendant's litigation friend the same as the address of the Defendant?", + }, +}; diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-page.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-page.ts new file mode 100644 index 0000000000..fc4e5add48 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/litigation-friend/litigation-friend-page.ts @@ -0,0 +1,35 @@ +import { Page } from 'playwright-core'; +import BasePage from '../../../../../../base/base-page'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps'; +import ExuiPage from '../../../../exui-page/exui-page'; +import LitigationFriendFragment from '../../../../fragments/litigation-friend/litigation-friend-fragment'; +import { radioButtons, subheadings } from './litigation-friend-content'; + +@AllMethodsStep() +export default class LitigationFriendPage extends ExuiPage(BasePage) { + private litigationFriendFragment: LitigationFriendFragment; + + constructor(page: Page, litigationFriendFragment: LitigationFriendFragment) { + super(page); + this.litigationFriendFragment = litigationFriendFragment; + } + + async verifyContent() { + await super.runVerifications([ + super.verifyHeadings(), + super.expectSubheading(subheadings.litigationDetails), + this.litigationFriendFragment.verifyContent(), + super.expectText(radioButtons.address.label), + ]); + } + + async enterLitigationFriendDetails() { + await this.litigationFriendFragment.enterLitigationFriendDetails(); + await this.litigationFriendFragment.chooseNoSameAddress(); + await this.litigationFriendFragment.uploadCertificateOfSuitability(); + } + + async submit() { + await super.clickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/submit-add-defendant-litigation-friend/submit-add-defendant-litigation-friend-page.ts b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/submit-add-defendant-litigation-friend/submit-add-defendant-litigation-friend-page.ts new file mode 100644 index 0000000000..44c1c3e981 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/add-defendant-litigation-friend/unspec/submit-add-defendant-litigation-friend/submit-add-defendant-litigation-friend-page.ts @@ -0,0 +1,15 @@ +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; + +@AllMethodsStep() +export default class SubmitAddDefendantLitigationFriendPage extends ExuiPage(BasePage) { + async verifyContent(ccdCaseData: CCDCaseData) { + await super.runVerifications([super.verifyHeadings(ccdCaseData)]); + } + + async submit() { + await super.clickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/create-claim/create-claim-page-factory.ts b/playwright-e2e/pages/exui/solicitor-events/create-claim/create-claim-page-factory.ts index fc92eb15e5..c048d9cf69 100644 --- a/playwright-e2e/pages/exui/solicitor-events/create-claim/create-claim-page-factory.ts +++ b/playwright-e2e/pages/exui/solicitor-events/create-claim/create-claim-page-factory.ts @@ -59,6 +59,7 @@ import StatementOfTruthFragment from '../../fragments/statement-of-truth/stateme import SubmitCreateClaimPage from './common/submit-create-claim/submit-create-claim-page.ts'; import ConfirmCreateClaimSpecPage from './lr-spec/confirm-create-claim-spec/confirm-create-claim-spec-page.ts'; import ConfirmCreateClaimPage from './unspec/confirm-create-claim/confirm-create-claim-page.ts'; +import LitigationFriendFragment from '../../fragments/litigation-friend/litigation-friend-fragment.ts'; export default class CreateClaimPageFactory extends BasePageFactory { get caseFilterPage() { @@ -116,7 +117,11 @@ export default class CreateClaimPageFactory extends BasePageFactory { } get claimantLitigationFriendPage() { - return new ClaimantLitigationFriendPage(this.page); + const litigationFriendFragment = new LitigationFriendFragment( + this.page, + partys.CLAIMANT_1_LITIGATION_FRIEND, + ); + return new ClaimantLitigationFriendPage(this.page, litigationFriendFragment); } get claimantSolicitorOrganisationPage() { diff --git a/playwright-e2e/pages/exui/solicitor-events/create-claim/unspec/claimant-litigation-friend/claimant-litigation-friend-page.ts b/playwright-e2e/pages/exui/solicitor-events/create-claim/unspec/claimant-litigation-friend/claimant-litigation-friend-page.ts index 09ea6caa89..a6db75d6d4 100644 --- a/playwright-e2e/pages/exui/solicitor-events/create-claim/unspec/claimant-litigation-friend/claimant-litigation-friend-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/create-claim/unspec/claimant-litigation-friend/claimant-litigation-friend-page.ts @@ -10,12 +10,9 @@ import partys from '../../../../../../constants/partys'; export default class ClaimantLitigationFriendPage extends ExuiPage(BasePage) { private litigationFriendFragment: LitigationFriendFragment; - constructor(page: Page) { + constructor(page: Page, litigationFriendFragment: LitigationFriendFragment) { super(page); - this.litigationFriendFragment = new LitigationFriendFragment( - page, - partys.CLAIMANT_1_LITIGATION_FRIEND, - ); + this.litigationFriendFragment = litigationFriendFragment; } async verifyContent() { diff --git a/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts b/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts index 9c39c303cf..d92a6ec114 100644 --- a/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts +++ b/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts @@ -9,6 +9,7 @@ import DefendantResponsePageFactory from '../../pages/exui/solicitor-events/resp import ClaimantResponsePageFactory from '../../pages/exui/solicitor-events/response/claimant-response/claimant-response-page-factory'; import InformAgreedExtensionDatePageFactory from '../../pages/exui/solicitor-events/inform-agreed-extension-date/inform-agreed-extension-date-page-factory'; import CreateCaseFlagsPageFactory from '../../pages/exui/caseworker-events/create-case-flags/create-case-flags-page-factory'; +import AddDefendantLitigationFriendPageFactory from '../../pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory'; type PageFactoryFixtures = { _pageUtilsFactory: PageUtilsFactory; @@ -21,6 +22,7 @@ type PageFactoryFixtures = { _defendantResponsePageFactory: DefendantResponsePageFactory; _claimantResponsePageFactory: ClaimantResponsePageFactory; _createCaseFlagsPageFactory: CreateCaseFlagsPageFactory; + _addDefendantLitigationFriendPageFactory: AddDefendantLitigationFriendPageFactory; }; export const test = base.extend({ @@ -53,5 +55,8 @@ export const test = base.extend({ }, _createCaseFlagsPageFactory: async ({ page }, use) => { await use(new CreateCaseFlagsPageFactory(page)); + }, + _addDefendantLitigationFriendPageFactory: async ({ page }, use) => { + await use(new AddDefendantLitigationFriendPageFactory(page)); } }); diff --git a/playwright-e2e/steps/ui/exui/solicitor-events/add-defendant-litigation-friend-steps.ts b/playwright-e2e/steps/ui/exui/solicitor-events/add-defendant-litigation-friend-steps.ts new file mode 100644 index 0000000000..8264726403 --- /dev/null +++ b/playwright-e2e/steps/ui/exui/solicitor-events/add-defendant-litigation-friend-steps.ts @@ -0,0 +1,21 @@ +import BaseExuiSteps from '../../../../base/base-exui-steps'; +import { AllMethodsStep } from '../../../../decorators/test-steps'; +import TestData from '../../../../models/test-data'; +import ExuiDashboardPageFactory from '../../../../pages/exui/exui-dashboard/exui-dashboard-page-factory'; +import RequestsFactory from '../../../../requests/requests-factory'; +import AddDefendantLitigationFriendPageFactory from '../../../../pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory'; + +@AllMethodsStep() +export default class AddDefendantLitigationFriendSteps extends BaseExuiSteps { + private addDefendantLitigationFriendPageFactory: AddDefendantLitigationFriendPageFactory; + + constructor( + addDefendantLitigationFriendPageFactory: AddDefendantLitigationFriendPageFactory, + exuiDashboardPageFactory: ExuiDashboardPageFactory, + requestsFactory: RequestsFactory, + testData: TestData, + ) { + super(exuiDashboardPageFactory, requestsFactory, testData); + this.addDefendantLitigationFriendPageFactory = addDefendantLitigationFriendPageFactory; + } +} From cb45683067f28de3343d9913da6ea1bc32570d7c Mon Sep 17 00:00:00 2001 From: Tia Greaney <50294563+tiagreaney@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:08:48 +0000 Subject: [PATCH 5/5] DTSCCI-1278 Create Page Objects and Content for Acknowledge Claim (#5176) * DTSCCI-1100 Create Page Objects and Content for Acknowledge Claim * Unspec 1v2 SS fast * Unspec 2v1 fast and small track * Unspec 1v2 fast and small track * update page objects to make them match others * fix lint issue --------- Co-authored-by: kdaHMCTS <128375235+kdaHMCTS@users.noreply.github.com> Co-authored-by: kdaHMCTS --- .../acknowledge-claim-page-factory.ts | 68 +++++++++++++ .../confirm-acknowledge-claim-content.ts | 1 + .../confirm-acknowledge-claim-page.ts | 27 +++++ .../confirm-name-and-address-1v2-page.ts | 41 ++++++++ .../confirm-name-and-address-content.ts | 7 ++ .../confirm-name-and-address-page.ts | 37 +++++++ .../response-intention-1v2SS-page.ts | 31 ++++++ .../response-intention-2v1-page.ts | 31 ++++++ .../response-intention-content.ts | 19 ++++ .../response-intention-page.ts | 41 ++++++++ ...or-references-acknowledge-claim-content.ts | 3 + ...citor-references-acknowledge-claim-page.ts | 43 ++++++++ .../submit-acknowledge-claim-page.ts | 15 +++ ...-inform-agreed-extension-date-spec-page.ts | 1 + .../extension-date-spec-page.ts | 2 +- .../extension-date/extension-date-page.ts | 20 +--- .../defendant-response-page-factory.ts | 35 +++++-- ...=> respondent-response-type-1v2SS-page.ts} | 10 +- .../respondent-response-type-2v1-page.ts | 8 +- .../respondent-response-type-content.ts | 16 +-- .../respondent-response-type-page.ts | 5 +- ...-references-defendant-response-content.ts} | 0 ...itor-references-defendant-response-page.ts | 40 ++++++++ .../solicitor-references-page.ts | 27 ----- .../mediation-availability-page.ts | 18 ++-- .../mediation-contact-information-page.ts | 24 +++-- .../ui/page-factory-fixtures.ts | 5 + .../acknowledge-claim-steps.ts | 21 ++++ .../mediation-availability-content.ts | 99 ------------------- 29 files changed, 512 insertions(+), 183 deletions(-) create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/acknowledge-claim-page-factory.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-1v2-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-1v2SS-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-2v1-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-content.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-page.ts create mode 100644 playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/submit-acknowledge-claim/submit-acknowledge-claim-page.ts rename playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/{respondent-response-type-1v2-page.ts => respondent-response-type-1v2SS-page.ts} (74%) rename playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/{solicitor-references/solicitor-references-content.ts => solicitor-references-defendant-response/solicitor-references-defendant-response-content.ts} (100%) create mode 100644 playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-page.ts delete mode 100644 playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references/solicitor-references-page.ts create mode 100644 playwright-e2e/steps/ui/exui/solicitor-events/acknowledge-claim-steps.ts delete mode 100644 playwright-e2e/steps/ui/exui/solicitor-events/defendant-response/lr-spec/mediation-availability/mediation-availability-content.ts diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/acknowledge-claim-page-factory.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/acknowledge-claim-page-factory.ts new file mode 100644 index 0000000000..68fdc2244c --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/acknowledge-claim-page-factory.ts @@ -0,0 +1,68 @@ +import BasePageFactory from '../../../../base/base-page-factory'; +import partys from '../../../../constants/partys'; +import DateFragment from '../../fragments/date/date-fragment'; +import SolicitorReferenceFragment from '../../fragments/solicitor-reference/solicitor-reference-fragment'; +import ConfirmAcknowledgeClaimPage from './unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-page'; +import ConfirmNameAndAddressPage from './unspec/confirm-name-and-address/confirm-name-and-address-page'; +import ResponseIntention1v2SSPage from './unspec/response-intention/response-intention-1v2SS-page'; +import ResponseIntention2v1Page from './unspec/response-intention/response-intention-2v1-page'; +import ResponseIntentionPage from './unspec/response-intention/response-intention-page'; +import SolicitorReferencesAcknowledgeClaimPage from './unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-page'; +import SubmitAcknowledgeClaimPage from './unspec/submit-acknowledge-claim/submit-acknowledge-claim-page'; + +export default class AcknowledgeClaimPageFactory extends BasePageFactory { + get confirmNameAndAddressPage() { + const dateFragment = new DateFragment(this.page); + return new ConfirmNameAndAddressPage(this.page, dateFragment); + } + + get responseIntensionDefendant1Page() { + return new ResponseIntentionPage(this.page, partys.DEFENDANT_1); + } + + get responseIntensionDefendant2Page() { + return new ResponseIntentionPage(this.page, partys.DEFENDANT_2); + } + + get responseIntention2v1Page() { + return new ResponseIntention2v1Page(this.page); + } + + get responseIntention1v2SSPage() { + return new ResponseIntention1v2SSPage(this.page); + } + + get solicitorReferencesAcknowledgeClaimDefendant1Page() { + const solicitorReferenceFragment = new SolicitorReferenceFragment( + this.page, + partys.DEFENDANT_1, + partys.DEFENDANT_SOLICITOR_1, + ); + return new SolicitorReferencesAcknowledgeClaimPage( + this.page, + solicitorReferenceFragment, + partys.DEFENDANT_1, + ); + } + + get solicitorReferencesAcknowledgeClaimDefendant2Page() { + const solicitorReferenceFragment = new SolicitorReferenceFragment( + this.page, + partys.DEFENDANT_2, + partys.DEFENDANT_SOLICITOR_2, + ); + return new SolicitorReferencesAcknowledgeClaimPage( + this.page, + solicitorReferenceFragment, + partys.DEFENDANT_2, + ); + } + + get submitAcknowledgeClaimPage() { + return new SubmitAcknowledgeClaimPage(this.page); + } + + get confirmAcknowledgeClaimPage() { + return new ConfirmAcknowledgeClaimPage(this.page); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-content.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-content.ts new file mode 100644 index 0000000000..030d304efc --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-content.ts @@ -0,0 +1 @@ +export const confirmationHeading = 'You have acknowledged the claim'; diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-page.ts new file mode 100644 index 0000000000..641036fa1f --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-acknowledge-claim/confirm-acknowledge-claim-page.ts @@ -0,0 +1,27 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import { confirmationHeading } from './confirm-acknowledge-claim-content.ts'; +import DateHelper from '../../../../../../helpers/date-helper.ts'; + +@AllMethodsStep() +export default class ConfirmAcknowledgeClaimPage extends ExuiPage(BasePage) { + async verifyContent(ccdCaseData: CCDCaseData) { + const responseDeadline = DateHelper.addToDate(ccdCaseData.respondent1ResponseDeadline, { + days: 14, + addDayAfter4pm: true, + workingDay: true, + }); + await super.runVerifications([ + super.verifyHeadings(ccdCaseData), + super.expectHeading(confirmationHeading), + super.expectSubheading(ccdCaseData.legacyCaseReference), + super.expectText(DateHelper.formatDateToString(responseDeadline)), + ]); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-1v2-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-1v2-page.ts new file mode 100644 index 0000000000..e3dd5568bb --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-1v2-page.ts @@ -0,0 +1,41 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import DateFragment from '../../../../fragments/date/date-fragment.ts'; +import { Page } from 'playwright-core'; +import { ClaimantDefendantPartyType } from '../../../../../../models/claimant-defendant-party-types.ts'; +import partys from '../../../../../../constants/partys.ts'; +import { inputs, heading } from './confirm-name-and-address-content.ts'; + +@AllMethodsStep() +export default class ConfirmNameAndAddress1v2Page extends ExuiPage(BasePage) { + private dateFragment: DateFragment; + + constructor(page: Page, dateFragment: DateFragment) { + super(page); + this.dateFragment = dateFragment; + } + + async verifyContent(ccdCaseData: CCDCaseData) { + super.runVerifications([ + super.expectHeading(heading), + super.expectHeading(ccdCaseData.id), + super.expectHeading(ccdCaseData.caseNamePublic), + this.dateFragment.verifyContent(), + super.expectText(inputs.dateOfBirth.label, { count: 2 }), + ]); + } + + async enterDefendant1DateOfBirth(partyType: ClaimantDefendantPartyType) { + await this.dateFragment.enterDateOfBirth(partys.DEFENDANT_1, partyType, 0); + } + + async enterDefendant2DateOfBirth(partyType: ClaimantDefendantPartyType) { + await this.dateFragment.enterDateOfBirth(partys.DEFENDANT_2, partyType, 1); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-content.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-content.ts new file mode 100644 index 0000000000..4f0d0e7f02 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-content.ts @@ -0,0 +1,7 @@ +export const heading = 'Confirm defendant details'; + +export const inputs = { + dateOfBirth: { + label: 'Date of birth (Optional)', + }, +}; diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-page.ts new file mode 100644 index 0000000000..16afcfbb07 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/confirm-name-and-address/confirm-name-and-address-page.ts @@ -0,0 +1,37 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import DateFragment from '../../../../fragments/date/date-fragment.ts'; +import { Page } from 'playwright-core'; +import { ClaimantDefendantPartyType } from '../../../../../../models/claimant-defendant-party-types.ts'; +import partys from '../../../../../../constants/partys.ts'; +import { inputs, heading } from './confirm-name-and-address-content.ts'; + +@AllMethodsStep() +export default class ConfirmNameAndAddressPage extends ExuiPage(BasePage) { + private dateFragment: DateFragment; + + constructor(page: Page, dateFragment: DateFragment) { + super(page); + this.dateFragment = dateFragment; + } + + async verifyContent(ccdCaseData: CCDCaseData) { + super.runVerifications([ + super.expectHeading(heading), + super.expectHeading(ccdCaseData.id), + super.expectHeading(ccdCaseData.caseNamePublic), + super.expectText(inputs.dateOfBirth.label, { index: 0 }), + ]); + } + + //Need to decide how I am going to pass partyType Data, could be pass by ccdCaseData or store a reference in test data. + async enterDefendantDateOfBirth(partyType: ClaimantDefendantPartyType) { + await this.dateFragment.enterDateOfBirth(partys.DEFENDANT_1, partyType); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-1v2SS-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-1v2SS-page.ts new file mode 100644 index 0000000000..1200fa84ae --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-1v2SS-page.ts @@ -0,0 +1,31 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import { radioButtons } from './response-intention-content.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import partys from '../../../../../../constants/partys.ts'; + +@AllMethodsStep() +export default class ResponseIntention1v2SSPage extends ExuiPage(BasePage) { + async verifyContent(ccdCaseData: CCDCaseData) { + super.runVerifications([ + super.verifyHeadings(ccdCaseData), + super.expectLabel(radioButtons.fullDefence.label, { count: 2 }), + super.expectLabel(radioButtons.partAdmit.label, { count: 2 }), + super.expectLabel(radioButtons.contestJurisdiction.label, { count: 2 }), + ]); + } + + async selectRejectAll() { + await super.clickBySelector( + radioButtons.fullDefence.selector(partys.DEFENDANT_1, partys.CLAIMANT_1), + ); + await super.clickBySelector( + radioButtons.fullDefence.selector(partys.DEFENDANT_2, partys.CLAIMANT_1), + ); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-2v1-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-2v1-page.ts new file mode 100644 index 0000000000..a334dd8ea7 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-2v1-page.ts @@ -0,0 +1,31 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import { radioButtons } from './response-intention-content.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import partys from '../../../../../../constants/partys.ts'; + +@AllMethodsStep() +export default class ResponseIntention2v1Page extends ExuiPage(BasePage) { + async verifyContent(ccdCaseData: CCDCaseData) { + super.runVerifications([ + super.verifyHeadings(ccdCaseData), + super.expectLabel(radioButtons.fullDefence.label, { count: 2 }), + super.expectLabel(radioButtons.partAdmit.label, { count: 2 }), + super.expectLabel(radioButtons.contestJurisdiction.label, { count: 2 }), + ]); + } + + async selectRejectAll() { + await super.clickBySelector( + radioButtons.fullDefence.selector(partys.DEFENDANT_1, partys.CLAIMANT_1), + ); + await super.clickBySelector( + radioButtons.fullDefence.selector(partys.DEFENDANT_1, partys.CLAIMANT_2), + ); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-content.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-content.ts new file mode 100644 index 0000000000..c1ba48c45c --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-content.ts @@ -0,0 +1,19 @@ +import { Party } from '../../../../../../models/partys'; + +export const radioButtons = { + fullDefence: { + label: 'Defend all of the claim', + selector: (defendantParty: Party, claimantParty: Party) => + `#${defendantParty.oldKey}ClaimResponseIntentionType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-FULL_DEFENCE`, + }, + partAdmit: { + label: 'Defend part of the claim', + selector: (defendantParty: Party, claimantParty: Party) => + `#${defendantParty.oldKey}ClaimResponseIntentionType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-PART_DEFENCE`, + }, + contestJurisdiction: { + label: 'Contest jurisdiction', + selector: (defendantParty: Party, claimantParty: Party) => + `#${defendantParty.oldKey}ClaimResponseIntentionType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-CONTEST_JURISDICTION`, + }, +}; diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-page.ts new file mode 100644 index 0000000000..3b034242d5 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/response-intention/response-intention-page.ts @@ -0,0 +1,41 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import { radioButtons } from './response-intention-content.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import { Party } from '../../../../../../models/partys.ts'; +import { Page } from 'playwright-core'; +import partys from '../../../../../../constants/partys.ts'; +import StringHelper from '../../../../../../helpers/string-helper.ts'; + +@AllMethodsStep() +export default class ResponseIntentionPage extends ExuiPage(BasePage) { + private defendantParty: Party; + + constructor(page: Page, defendantParty: Party) { + super(page); + this.defendantParty = defendantParty; + } + + async verifyContent(ccdCaseData: CCDCaseData) { + super.runVerifications( + [ + super.verifyHeadings(ccdCaseData), + super.expectLabel(radioButtons.fullDefence.label), + super.expectLabel(radioButtons.partAdmit.label), + super.expectLabel(radioButtons.contestJurisdiction.label), + ], + { axePageInsertName: StringHelper.capitalise(this.defendantParty.key) }, + ); + } + + async selectRejectAll() { + await super.clickBySelector( + radioButtons.fullDefence.selector(this.defendantParty, partys.CLAIMANT_1), + ); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-content.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-content.ts new file mode 100644 index 0000000000..c817d61e4d --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-content.ts @@ -0,0 +1,3 @@ +export const subheadings = { + yourFileReference: 'Your File Reference', +}; diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-page.ts new file mode 100644 index 0000000000..eaad1dbfa8 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/solicitor-references-acknowledge-claim/solicitor-references-acknowledge-claim-page.ts @@ -0,0 +1,43 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import { subheadings } from './solicitor-references-acknowledge-claim-content.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; +import SolicitorReferenceFragment from '../../../../fragments/solicitor-reference/solicitor-reference-fragment.ts'; +import { Page } from 'playwright-core'; +import { Party } from '../../../../../../models/partys.ts'; +import StringHelper from '../../../../../../helpers/string-helper.ts'; + +@AllMethodsStep() +export default class SolicitorReferencesAcknowledgeClaimPage extends ExuiPage(BasePage) { + private defendantParty: Party; + private defendantSolicitorReferenceFragment: SolicitorReferenceFragment; + + constructor( + page: Page, + defendantSolicitorReferenceFragment: SolicitorReferenceFragment, + defendantParty: Party, + ) { + super(page); + this.defendantParty = defendantParty; + this.defendantSolicitorReferenceFragment = defendantSolicitorReferenceFragment; + } + + async verifyContent() { + await super.runVerifications( + [ + super.verifyHeadings(), + super.expectSubheading(subheadings.yourFileReference), + this.defendantSolicitorReferenceFragment.verifyContent(), + ], + { axePageInsertName: StringHelper.capitalise(this.defendantParty.key) }, + ); + } + + async enterReference() { + await this.defendantSolicitorReferenceFragment.enterReference(); + } + + async submit() { + await super.clickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/submit-acknowledge-claim/submit-acknowledge-claim-page.ts b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/submit-acknowledge-claim/submit-acknowledge-claim-page.ts new file mode 100644 index 0000000000..ecfdbc4d5d --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/acknowledge-claim/unspec/submit-acknowledge-claim/submit-acknowledge-claim-page.ts @@ -0,0 +1,15 @@ +import BasePage from '../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../decorators/test-steps.ts'; +import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; +import ExuiPage from '../../../../exui-page/exui-page.ts'; + +@AllMethodsStep() +export default class SubmitAcknowledgeClaimPage extends ExuiPage(BasePage) { + async verifyContent(ccdCaseData: CCDCaseData) { + await super.runVerifications([super.verifyHeadings(ccdCaseData)]); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/confirm-inform-agreed-extension-date-spec/confirm-inform-agreed-extension-date-spec-page.ts b/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/confirm-inform-agreed-extension-date-spec/confirm-inform-agreed-extension-date-spec-page.ts index d4f3cccce4..84c0803347 100644 --- a/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/confirm-inform-agreed-extension-date-spec/confirm-inform-agreed-extension-date-spec-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/confirm-inform-agreed-extension-date-spec/confirm-inform-agreed-extension-date-spec-page.ts @@ -12,6 +12,7 @@ export default class ConfirmInformAgreedExtensionDateSpecPage extends ExuiPage(B const date = DateHelper.addToDate(ccdCaseData.respondent1ResponseDeadline, { days: 28, workingDay: true, + addDayAfter4pm: true, }); await super.runVerifications([ super.verifyHeadings(ccdCaseData), diff --git a/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/extension-date-spec/extension-date-spec-page.ts b/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/extension-date-spec/extension-date-spec-page.ts index 5992b32a3c..5924c13211 100644 --- a/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/extension-date-spec/extension-date-spec-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/lr-spec/extension-date-spec/extension-date-spec-page.ts @@ -3,7 +3,6 @@ import BasePage from '../../../../../../base/base-page'; import { AllMethodsStep } from '../../../../../../decorators/test-steps'; import DateHelper from '../../../../../../helpers/date-helper'; import CCDCaseData from '../../../../../../models/ccd/ccd-case-data'; -import { Party } from '../../../../../../models/partys'; import ExuiPage from '../../../../exui-page/exui-page'; import DateFragment from '../../../../fragments/date/date-fragment'; import { inputs } from './extension-date-spec-content'; @@ -28,6 +27,7 @@ export default class ExtensionDateSpecPage extends ExuiPage(BasePage) { const extensionDate = DateHelper.addToDate(ccdCaseData.respondent1ResponseDeadline, { days: 28, workingDay: true, + addDayAfter4pm: true, }); await this.dateFragment.enterDate(extensionDate, inputs.extensionDate.selectorKey); } diff --git a/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/unspec/extension-date/extension-date-page.ts b/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/unspec/extension-date/extension-date-page.ts index 3509f14ce4..20b5bfaeaa 100644 --- a/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/unspec/extension-date/extension-date-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/inform-agreed-extension-date/unspec/extension-date/extension-date-page.ts @@ -7,25 +7,7 @@ import { paragraphs } from './extension-date-content'; @AllMethodsStep() export default class ExtensionDatePage extends ExuiPage(BasePage) { - async verifyContent() { - throw new Error('Method not implemented.'); - } - - async verifyContentDefendant1(ccdCaseData: CCDCaseData) { - const extensionDate = DateHelper.addToDate(ccdCaseData.claimDetailsNotificationDate, { - days: ccdCaseData.respondent1AcknowledgeNotificationDate ? 56 : 42, - workingDay: true, - }); - await super.runVerifications([ - super.verifyHeadings(ccdCaseData), - super.expectText(paragraphs.descriptionText, { ignoreDuplicates: true }), - super.expectText( - DateHelper.formatDateToString(extensionDate, { outputFormat: 'DD Mon YYYY' }), - ), - ]); - } - - async verifyContentDefendant2(ccdCaseData: CCDCaseData) { + async verifyContent(ccdCaseData: CCDCaseData) { const extensionDate = DateHelper.addToDate(ccdCaseData.claimDetailsNotificationDate, { days: ccdCaseData.respondent2AcknowledgeNotificationDate ? 56 : 42, workingDay: true, diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/defendant-response-page-factory.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/defendant-response-page-factory.ts index 365dcb3c37..f748b3ddf2 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/defendant-response-page-factory.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/defendant-response-page-factory.ts @@ -50,13 +50,14 @@ import Confirm1v2DSDefendantResponsePage from './unspec/confirm-defendant-respon import ConfirmDefendantResponsePage from './unspec/confirm-defendant-response/confirm-defendant-response-page'; import ConfirmDetails1v2Page from './unspec/confirm-details/confirm-details-1v2-page'; import ConfirmDetailsPage from './unspec/confirm-details/confirm-details-page'; -import RespondentResponseType1v2Page from './unspec/respondent-response-type/respondent-response-type-1v2-page'; +import RespondentResponseType1v2SSPage from './unspec/respondent-response-type/respondent-response-type-1v2SS-page'; import RespondentResponseType2v1Page from './unspec/respondent-response-type/respondent-response-type-2v1-page'; import RespondentResponseTypePage from './unspec/respondent-response-type/respondent-response-type-page'; -import SolicitorReferencesPage from './unspec/solicitor-references/solicitor-references-page'; import UploadDefendantResponsePage from './unspec/upload-defendant-response/upload-defendant-response-page'; import MediationContactInformationPage from '../mediation/mediation-contact-information/mediation-contact-information-page'; import MediationAvailabilityPage from '../mediation/mediation-availability/mediation-availability-page'; +import SolicitorReferencesDefendantResponsePage from './unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-page'; +import SolicitorReferenceFragment from '../../../fragments/solicitor-reference/solicitor-reference-fragment'; export default class DefendantResponsePageFactory extends BasePageFactory { get respondentChecklistPage() { @@ -111,8 +112,8 @@ export default class DefendantResponsePageFactory extends BasePageFactory { return new RespondentResponseTypePage(this.page, partys.DEFENDANT_2); } - get respondentResponseType1v2Page() { - return new RespondentResponseType1v2Page(this.page); + get respondentResponseType1v2SSPage() { + return new RespondentResponseType1v2SSPage(this.page); } get respondentResponseType2v1Page() { @@ -131,8 +132,30 @@ export default class DefendantResponsePageFactory extends BasePageFactory { return new RespondentResponseType2v1SpecPage(this.page); } - get solicitorReferencesPage() { - return new SolicitorReferencesPage(this.page); + get solicitorReferencesDefendantResponseDefendant1Page() { + const solicitorReferenceFragment = new SolicitorReferenceFragment( + this.page, + partys.DEFENDANT_1, + partys.DEFENDANT_SOLICITOR_1, + ); + return new SolicitorReferencesDefendantResponsePage( + this.page, + solicitorReferenceFragment, + partys.DEFENDANT_1, + ); + } + + get solicitorReferencesDefendantResponseDefendant2Page() { + const solicitorReferenceFragment = new SolicitorReferenceFragment( + this.page, + partys.DEFENDANT_2, + partys.DEFENDANT_SOLICITOR_2, + ); + return new SolicitorReferencesDefendantResponsePage( + this.page, + solicitorReferenceFragment, + partys.DEFENDANT_2, + ); } get defenceRouteDefendant1Page() { diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-1v2-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-1v2SS-page.ts similarity index 74% rename from playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-1v2-page.ts rename to playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-1v2SS-page.ts index e0a51dbddc..ce88072474 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-1v2-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-1v2SS-page.ts @@ -6,7 +6,7 @@ import CCDCaseData from '../../../../../../../models/ccd/ccd-case-data.ts'; import partys from '../../../../../../../constants/partys.ts'; @AllMethodsStep() -export default class RespondentResponseType1v2Page extends ExuiPage(BasePage) { +export default class RespondentResponseType1v2SSPage extends ExuiPage(BasePage) { async verifyContent(ccdCaseData: CCDCaseData) { super.runVerifications([ super.verifyHeadings(ccdCaseData), @@ -18,8 +18,12 @@ export default class RespondentResponseType1v2Page extends ExuiPage(BasePage) { } async selectRejectAll() { - await super.clickBySelector(radioButtons.rejectAll.selector(partys.DEFENDANT_1)); - await super.clickBySelector(radioButtons.rejectAll.selector(partys.DEFENDANT_2)); + await super.clickBySelector( + radioButtons.rejectAll.selector(partys.DEFENDANT_1, partys.CLAIMANT_1), + ); + await super.clickBySelector( + radioButtons.rejectAll.selector(partys.DEFENDANT_2, partys.CLAIMANT_1), + ); } async submit() { diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-2v1-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-2v1-page.ts index 86f09ec7d7..31d3f4b3fd 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-2v1-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-2v1-page.ts @@ -18,8 +18,12 @@ export default class RespondentResponseType2v1Page extends ExuiPage(BasePage) { } async selectRejectAll() { - await super.clickBySelector(radioButtons.rejectAll.selector(partys.DEFENDANT_1)); - await super.clickBySelector(radioButtons.rejectAll.selector(partys.DEFENDANT_1, true)); + await super.clickBySelector( + radioButtons.rejectAll.selector(partys.DEFENDANT_1, partys.CLAIMANT_1), + ); + await super.clickBySelector( + radioButtons.rejectAll.selector(partys.DEFENDANT_1, partys.CLAIMANT_2), + ); } async submit() { diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-content.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-content.ts index aeb4635edc..0f9fab731f 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-content.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-content.ts @@ -3,22 +3,22 @@ import { Party } from '../../../../../../../models/partys'; export const radioButtons = { rejectAll: { label: 'Reject all of the claim', - selector: (defendantParty: Party, isClaimant2 = false) => - `#respondent${defendantParty.number}ClaimResponseType${isClaimant2 ? 'ToApplicant2' : ''}-FULL_DEFENCE`, + selector: (defendantParty: Party, claimantParty: Party) => + `#respondent${defendantParty.number}ClaimResponseType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-FULL_DEFENCE`, }, admitAll: { label: 'Admit all of the claim', - selector: (defendantParty: Party, isClaimant2 = false) => - `#respondent${defendantParty.number}ClaimResponseType${isClaimant2 ? 'ToApplicant2' : ''}-FULL_ADMISSION`, + selector: (defendantParty: Party, claimantParty: Party) => + `#respondent${defendantParty.number}ClaimResponseType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-FULL_ADMISSION`, }, partAdmit: { label: 'Admit part of claim', - selector: (defendantParty: Party, isClaimant2 = false) => - `#respondent${defendantParty.number}ClaimResponseType${isClaimant2 ? 'ToApplicant2' : ''}-PART_ADMISSION`, + selector: (defendantParty: Party, claimantParty: Party) => + `#respondent${defendantParty.number}ClaimResponseType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-PART_ADMISSION`, }, counterClaim: { label: 'Reject all of the claim and wants to counterclaim', - selector: (defendantParty: Party, isClaimant2 = false) => - `#respondent${defendantParty.number}ClaimResponseType${isClaimant2 ? 'ToApplicant2' : ''}-COUNTER_CLAIM`, + selector: (defendantParty: Party, claimantParty: Party) => + `#respondent${defendantParty.number}ClaimResponseType${claimantParty.number === 2 ? 'ToApplicant2' : ''}-COUNTER_CLAIM`, }, }; diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-page.ts index 843bd6c01f..06d8246a78 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/respondent-response-type/respondent-response-type-page.ts @@ -5,6 +5,7 @@ import { radioButtons } from './respondent-response-type-content.ts'; import CCDCaseData from '../../../../../../../models/ccd/ccd-case-data.ts'; import { Party } from '../../../../../../../models/partys.ts'; import { Page } from 'playwright-core'; +import partys from '../../../../../../../constants/partys.ts'; @AllMethodsStep() export default class RespondentResponseTypePage extends ExuiPage(BasePage) { @@ -26,7 +27,9 @@ export default class RespondentResponseTypePage extends ExuiPage(BasePage) { } async selectRejectAll() { - await super.clickBySelector(radioButtons.rejectAll.selector(this.defendantParty)); + await super.clickBySelector( + radioButtons.rejectAll.selector(this.defendantParty, partys.CLAIMANT_1), + ); } async submit() { diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references/solicitor-references-content.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-content.ts similarity index 100% rename from playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references/solicitor-references-content.ts rename to playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-content.ts diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-page.ts new file mode 100644 index 0000000000..5cec2a97e5 --- /dev/null +++ b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references-defendant-response/solicitor-references-defendant-response-page.ts @@ -0,0 +1,40 @@ +import { Page } from 'playwright-core'; +import BasePage from '../../../../../../../base/base-page.ts'; +import { AllMethodsStep } from '../../../../../../../decorators/test-steps.ts'; +import StringHelper from '../../../../../../../helpers/string-helper.ts'; +import CCDCaseData from '../../../../../../../models/ccd/ccd-case-data.ts'; +import { Party } from '../../../../../../../models/partys.ts'; +import ExuiPage from '../../../../../exui-page/exui-page.ts'; +import SolicitorReferenceFragment from '../../../../../fragments/solicitor-reference/solicitor-reference-fragment.ts'; +import { subheadings, inputs } from './solicitor-references-defendant-response-content.ts'; + +@AllMethodsStep() +export default class SolicitorReferencesDefendantResponsePage extends ExuiPage(BasePage) { + private defendantParty: Party; + private defendantSolicitorReferenceFragment: SolicitorReferenceFragment; + + constructor( + page: Page, + defendantSolicitorReferenceFragment: SolicitorReferenceFragment, + defendantParty: Party, + ) { + super(page); + this.defendantSolicitorReferenceFragment = defendantSolicitorReferenceFragment; + this.defendantParty = defendantParty; + } + + async verifyContent(ccdCaseData: CCDCaseData) { + await super.runVerifications( + [super.verifyHeadings(ccdCaseData), super.expectSubheading(subheadings.fileRef)], + { axePageInsertName: StringHelper.capitalise(this.defendantParty.key) }, + ); + } + + async enterDetails() { + await this.defendantSolicitorReferenceFragment.enterReference(); + } + + async submit() { + await super.retryClickSubmit(); + } +} diff --git a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references/solicitor-references-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references/solicitor-references-page.ts deleted file mode 100644 index 54600ca35f..0000000000 --- a/playwright-e2e/pages/exui/solicitor-events/response/defendant-response/unspec/solicitor-references/solicitor-references-page.ts +++ /dev/null @@ -1,27 +0,0 @@ -import BasePage from '../../../../../../../base/base-page.ts'; -import { AllMethodsStep } from '../../../../../../../decorators/test-steps.ts'; -import CCDCaseData from '../../../../../../../models/ccd/ccd-case-data.ts'; -import ExuiPage from '../../../../../exui-page/exui-page.ts'; -import { subheadings, inputs } from './solicitor-references-content.ts'; - -@AllMethodsStep() -export default class SolicitorReferencesPage extends ExuiPage(BasePage) { - async verifyContent(ccdCaseData: CCDCaseData) { - await super.runVerifications([ - super.verifyHeadings(ccdCaseData), - super.expectSubheading(subheadings.fileRef), - ]); - } - - async fillDefendant1Ref() { - await super.inputText('New Defendant 1 Ref', inputs.defendant1Ref.selector); - } - - async fillDefendant2Ref() { - await super.inputText('New Defendant 2 Ref', inputs.defendant2Ref.selector); - } - - async submit() { - await super.retryClickSubmit(); - } -} diff --git a/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-availability/mediation-availability-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-availability/mediation-availability-page.ts index 8cf18cde05..9114c6a803 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-availability/mediation-availability-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-availability/mediation-availability-page.ts @@ -13,6 +13,7 @@ import { } from './mediation-availability-content.ts'; import DateHelper from '../../../../../../helpers/date-helper.ts'; import DateFragment from '../../../../fragments/date/date-fragment.ts'; +import StringHelper from '../../../../../../helpers/string-helper.ts'; @AllMethodsStep() export default class MediationAvailabilityPage extends ExuiPage(BasePage) { @@ -26,13 +27,16 @@ export default class MediationAvailabilityPage extends ExuiPage(BasePage) { } async verifyContent(ccdCaseData: CCDCaseData) { - await super.runVerifications([ - super.verifyHeadings(ccdCaseData), - super.expectSubheading(subheadings.mediationAvailability), - super.expectText(paragraphs.descriptionText), - super.expectText(radioButtons.mediationAvailability.label), - super.expectText(radioButtons.mediationAvailability.hintText), - ]); + await super.runVerifications( + [ + super.verifyHeadings(ccdCaseData), + super.expectSubheading(subheadings.mediationAvailability), + super.expectText(paragraphs.descriptionText), + super.expectText(radioButtons.mediationAvailability.label), + super.expectText(radioButtons.mediationAvailability.hintText), + ], + { axePageInsertName: StringHelper.capitalise(this.claimantDefendantParty.key) }, + ); } async selectYes() { diff --git a/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-contact-information/mediation-contact-information-page.ts b/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-contact-information/mediation-contact-information-page.ts index ef2f469c73..ad5118ac97 100644 --- a/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-contact-information/mediation-contact-information-page.ts +++ b/playwright-e2e/pages/exui/solicitor-events/response/mediation/mediation-contact-information/mediation-contact-information-page.ts @@ -6,6 +6,7 @@ import CCDCaseData from '../../../../../../models/ccd/ccd-case-data.ts'; import ExuiPage from '../../../../exui-page/exui-page.ts'; import { subheadings, paragraphs, inputs } from './mediation-contact-information-content.ts'; import CaseDataHelper from '../../../../../../helpers/case-data-helper.ts'; +import StringHelper from '../../../../../../helpers/string-helper.ts'; @AllMethodsStep() export default class MediationContactInformationPage extends ExuiPage(BasePage) { @@ -19,16 +20,19 @@ export default class MediationContactInformationPage extends ExuiPage(BasePage) } async verifyContent(ccdCaseData: CCDCaseData) { - await super.runVerifications([ - super.verifyHeadings(ccdCaseData), - super.expectSubheading(subheadings, { index: 0 }), - super.expectText(paragraphs.description1), - super.expectText(paragraphs.description2), - super.expectText(inputs.mediationFriendDetails.firstName.label), - super.expectText(inputs.mediationFriendDetails.lastName.label), - super.expectText(inputs.mediationFriendDetails.emailAddress.label), - super.expectText(inputs.mediationFriendDetails.telephoneNumber.label), - ]); + await super.runVerifications( + [ + super.verifyHeadings(ccdCaseData), + super.expectSubheading(subheadings, { index: 0 }), + super.expectText(paragraphs.description1), + super.expectText(paragraphs.description2), + super.expectText(inputs.mediationFriendDetails.firstName.label), + super.expectText(inputs.mediationFriendDetails.lastName.label), + super.expectText(inputs.mediationFriendDetails.emailAddress.label), + super.expectText(inputs.mediationFriendDetails.telephoneNumber.label), + ], + { axePageInsertName: StringHelper.capitalise(this.claimantDefendantParty.key) }, + ); } async enterMediationContactDetails() { diff --git a/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts b/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts index d92a6ec114..3092130776 100644 --- a/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts +++ b/playwright-e2e/playwright-fixtures/ui/page-factory-fixtures.ts @@ -9,6 +9,7 @@ import DefendantResponsePageFactory from '../../pages/exui/solicitor-events/resp import ClaimantResponsePageFactory from '../../pages/exui/solicitor-events/response/claimant-response/claimant-response-page-factory'; import InformAgreedExtensionDatePageFactory from '../../pages/exui/solicitor-events/inform-agreed-extension-date/inform-agreed-extension-date-page-factory'; import CreateCaseFlagsPageFactory from '../../pages/exui/caseworker-events/create-case-flags/create-case-flags-page-factory'; +import AcknowledgeClaimPageFactory from '../../pages/exui/solicitor-events/acknowledge-claim/acknowledge-claim-page-factory'; import AddDefendantLitigationFriendPageFactory from '../../pages/exui/solicitor-events/add-defendant-litigation-friend/add-defendant-litigation-friend-page-factory'; type PageFactoryFixtures = { @@ -22,6 +23,7 @@ type PageFactoryFixtures = { _defendantResponsePageFactory: DefendantResponsePageFactory; _claimantResponsePageFactory: ClaimantResponsePageFactory; _createCaseFlagsPageFactory: CreateCaseFlagsPageFactory; + _acknowledgeClaimPageFactory: AcknowledgeClaimPageFactory; _addDefendantLitigationFriendPageFactory: AddDefendantLitigationFriendPageFactory; }; @@ -56,6 +58,9 @@ export const test = base.extend({ _createCaseFlagsPageFactory: async ({ page }, use) => { await use(new CreateCaseFlagsPageFactory(page)); }, + _acknowledgeClaimPageFactory: async ({ page }, use) => { + await use(new AcknowledgeClaimPageFactory(page)); + }, _addDefendantLitigationFriendPageFactory: async ({ page }, use) => { await use(new AddDefendantLitigationFriendPageFactory(page)); } diff --git a/playwright-e2e/steps/ui/exui/solicitor-events/acknowledge-claim-steps.ts b/playwright-e2e/steps/ui/exui/solicitor-events/acknowledge-claim-steps.ts new file mode 100644 index 0000000000..f4bfe83ed0 --- /dev/null +++ b/playwright-e2e/steps/ui/exui/solicitor-events/acknowledge-claim-steps.ts @@ -0,0 +1,21 @@ +import BaseExuiSteps from '../../../../base/base-exui-steps'; +import { AllMethodsStep } from '../../../../decorators/test-steps'; +import TestData from '../../../../models/test-data'; +import ExuiDashboardPageFactory from '../../../../pages/exui/exui-dashboard/exui-dashboard-page-factory'; +import AcknowledgeClaimPageFactory from '../../../../pages/exui/solicitor-events/acknowledge-claim/acknowledge-claim-page-factory'; +import RequestsFactory from '../../../../requests/requests-factory'; + +@AllMethodsStep() +export default class AcknowledgeClaimSteps extends BaseExuiSteps { + private acknowledgeClaimPageFactory: AcknowledgeClaimPageFactory; + + constructor( + acknowledgeClaimPageFactory: AcknowledgeClaimPageFactory, + exuiDashboardPageFactory: ExuiDashboardPageFactory, + requestsFactory: RequestsFactory, + testData: TestData, + ) { + super(exuiDashboardPageFactory, requestsFactory, testData); + this.acknowledgeClaimPageFactory = acknowledgeClaimPageFactory; + } +} diff --git a/playwright-e2e/steps/ui/exui/solicitor-events/defendant-response/lr-spec/mediation-availability/mediation-availability-content.ts b/playwright-e2e/steps/ui/exui/solicitor-events/defendant-response/lr-spec/mediation-availability/mediation-availability-content.ts deleted file mode 100644 index c4333debd3..0000000000 --- a/playwright-e2e/steps/ui/exui/solicitor-events/defendant-response/lr-spec/mediation-availability/mediation-availability-content.ts +++ /dev/null @@ -1,99 +0,0 @@ -export const heading = 'Mediation availability'; - -export const yesNoRadioButtons = { - text: { - question: - 'Are there any dates in the next 3 months when you or your client cannot attend a mediation appointment?', - hint: 'These should only be the dates of important events like medical appointments, other court hearings, or holidays that are already booked. If the mediation appointment is not attended, your client may face a penalty. The Small Claims Mediation Service operates Monday to Friday from 8am to 5pm, except bank holidays', - }, - radioYes: { - text: 'Yes', - selector: '#resp1MediationAvailability_isMediationUnavailablityExists_Yes', - }, - radioNo: { - text: 'No', - selector: '#resp1MediationAvailability_isMediationUnavailablityExists_No', - }, -}; - -export const addNew = 'Add new'; - -export const remove = 'Remove'; - -export const singleDateOrDateRangeRadioButton = { - text: { - label: 'Add a single date or date range', - warning: 'Add a single date or date range is required', - }, - options: (dateEntry: number) => [ - { - text: 'Single date', - selector: `#resp1MediationAvailability_unavailableDatesForMediation_${dateEntry}_unavailableDateType-SINGLE_DATE`, - }, - { - text: 'Date range', - selector: `#resp1MediationAvailability_unavailableDatesForMediation_${dateEntry}_unavailableDateType-DATE_RANGE`, - }, - ], -}; - -export const unavailableSingleDate = { - text: { - label: 'Unavailable date', - hint: 'This date cannot be in the past and must not be more than three months in the future', - }, - day: { - label: 'Day', - input: '#date-day', - }, - month: { - label: 'Month', - input: '#date-month', - }, - year: { - label: 'Year', - input: '#date-year', - }, -}; - -export const unavailableDateRange = { - text: { - label: 'Unavailable date range', - }, - dateFrom: { - text: { - label: 'Date from', - hint: 'This date cannot be in the past and must not be more than three months in the future', - }, - day: { - label: 'Day', - input: '#fromDate-day', - }, - month: { - label: 'Month', - input: '#fromDate-month', - }, - year: { - label: 'Year', - input: '#fromDate-year', - }, - }, - dateTo: { - text: { - label: 'Date to', - hint: 'This date cannot be in the past and must not be more than three months in the future', - }, - day: { - label: 'Day', - input: '#toDate-day', - }, - month: { - label: 'Month', - input: '#toDate-month', - }, - year: { - label: 'Year', - input: '#toDate-year', - }, - }, -};