From 04138b7d46399a6ca98f441182c715837339cad5 Mon Sep 17 00:00:00 2001 From: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:06:03 +0000 Subject: [PATCH 01/13] CIV-16403 Minti orders screen changes (#5276) * CIV-16403 Minti orders screen changes * update test assertion * update e2e assert * point to another camunda image * Update values.preview.template.yaml * Update values.preview.template.yaml * Update values.preview.template.yaml * Update values.preview.template.yaml * Update values.preview.template.yaml * Update values.preview.template.yaml * change back to default port * point to service pr * clean up --------- Co-authored-by: Madhan Mahadevan Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> --- .../CaseEventToFields/FinalOrders-MINTI-nonprod.json | 6 +++--- ccd-definition/CaseField/CaseField-MINTI-nonprod.json | 2 +- e2e/pages/directionsOrder/orderTrackAllocation.page.js | 2 +- e2e/pages/directionsOrder/uploadOrder.page.js | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json index 6291ddb7dd..f50aa99bad 100644 --- a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json @@ -62,7 +62,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "PageLabel": "Select track", - "CaseEventFieldLabel": "Are you allocating the claim to a track?", + "CaseEventFieldLabel": "Are you allocating or re-allocating the claim to a track or are you changing the complexity band?", "CaseFieldID": "finalOrderAllocateToTrack", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 1, @@ -75,7 +75,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "GENERATE_DIRECTIONS_ORDER", "CaseFieldID": "finalOrderTrackAllocation", - "CaseEventFieldLabel": "What track are you allocating the claim to?", + "CaseEventFieldLabel": "What track are you allocating or re-allocating the claim to?", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", @@ -93,7 +93,7 @@ "DisplayContext": "READONLY", "PageID": "IntermediateTrackComplexityBand", "ShowSummaryChangeOption": "N", - "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\"" + "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\" AND finalOrderAllocateToTrack=\"Yes\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json index 28bef148c9..d6adf82498 100644 --- a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json +++ b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json @@ -163,7 +163,7 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "uploadOrderDocumentFromTemplateLabel", - "Label": "**** \n ## Add document \n Make sure your file is named either directions or order, the party names and the date. Upload your completed order in DOC/DOCX (Word) format.", + "Label": "**** \n ## Add document \n Upload your completed order in DOC/DOCX (Word) format.", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" diff --git a/e2e/pages/directionsOrder/orderTrackAllocation.page.js b/e2e/pages/directionsOrder/orderTrackAllocation.page.js index 621b4c2da2..1a87a4ca8c 100644 --- a/e2e/pages/directionsOrder/orderTrackAllocation.page.js +++ b/e2e/pages/directionsOrder/orderTrackAllocation.page.js @@ -17,7 +17,7 @@ module.exports = { } }, labels: { - allocateQuestion: 'What track are you allocating the claim to?' + allocateQuestion: 'What track are you allocating or re-allocating the claim to?' } }, diff --git a/e2e/pages/directionsOrder/uploadOrder.page.js b/e2e/pages/directionsOrder/uploadOrder.page.js index 37c1446d05..b97e5851db 100644 --- a/e2e/pages/directionsOrder/uploadOrder.page.js +++ b/e2e/pages/directionsOrder/uploadOrder.page.js @@ -12,8 +12,7 @@ module.exports = { I.see('Add document', this.fields.label1); I.seeElement(this.fields.label2); - I.see('Make sure your file is named either directions or order, the party names and the date. ' + - 'Upload your completed order in DOC/DOCX (Word) format.', this.fields.label2); + I.see('Upload your completed order in DOC/DOCX (Word) format.', this.fields.label2); I.attachFile(this.fields.uploadInput, filePath); I.wait(5); From 10f2469936e374dcb430dd1ab387f1795ad8e97c Mon Sep 17 00:00:00 2001 From: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:03:48 +0000 Subject: [PATCH 02/13] CIV-16322 e2e test fix for CIV-16322 (#5338) --- e2e/api/steps.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index bb14f034a6..8ef8a76dc6 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -1556,6 +1556,7 @@ const assertValidData = async (data, pageId, solicitor) => { delete responseBody.data['sdoR2FastTrackWitnessOfFact']; delete responseBody.data['sdoR2FastTrackCreditHire']; delete responseBody.data['sdoDJR2TrialCreditHire']; + delete responseBody.data['gaEaCourtLocation']; } assert.equal(response.status, 200); From 2799b8b0d51bbdf6d777269de88c6d04776f3122 Mon Sep 17 00:00:00 2001 From: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Date: Mon, 3 Feb 2025 16:14:49 +0000 Subject: [PATCH 03/13] CIV-16210 - HmcLipEnabled field to toggle for HMC for Lips (#5284) --- ...uthorisationCaseField-AHN-CUI-nonprod.json | 22 +++ ...tionIntegrationFields-AHN-CUI-nonprod.json | 142 ++++++++++++++++++ .../CaseField/CaseField-AHN-CUI-nonprod.json | 11 ++ 3 files changed, 175 insertions(+) create mode 100644 ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json create mode 100644 ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json create mode 100644 ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json new file mode 100644 index 0000000000..4841981708 --- /dev/null +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json @@ -0,0 +1,22 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "hmcLipEnabled", + "AccessControl": [ + { + "UserRoles": [ + "judge-profile", + "legal-adviser", + "caseworker-civil-admin" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "R" + } + ] + } +] diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json new file mode 100644 index 0000000000..c73ddb6b3a --- /dev/null +++ b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json @@ -0,0 +1,142 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CREATE_SDO", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "COURT_OFFICER_ORDER", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "GENERATE_DIRECTIONS_ORDER", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED_RETRIGGER", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 1, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 1, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SETTLE_CLAIM", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_FEE_UNPAID", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "MANAGE_STAY", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "LIP_CLAIM_SETTLED", + "CaseFieldID": "applicant1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "LIP_CLAIM_SETTLED", + "CaseFieldID": "respondent1Represented", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "LIP_CLAIM_SETTLED", + "CaseFieldID": "hmcLipEnabled", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + } +] diff --git a/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json b/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json new file mode 100644 index 0000000000..0b0da029ca --- /dev/null +++ b/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json @@ -0,0 +1,11 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "hmcLipEnabled", + "Label": " ", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N", + "Publish": "Y" + } +] From 99163c4ea3c4224ba2538dc9a42beb4b9120ee29 Mon Sep 17 00:00:00 2001 From: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:35:35 +0000 Subject: [PATCH 04/13] CIV-0000 increase postgres db size (#5330) * increase postgres db size * added max connections and increased shared buffer --- charts/civil-ccd/values.preview.template.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index 524df184d5..f4d188cff9 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -86,17 +86,21 @@ civil-service: extraEnvVars: - name: POSTGRESQL_WAL_LEVEL value: "logical" + - name: POSTGRESQL_MAX_CONNECTIONS + value: "400" + extendedConfiguration: | + max_connections = 400 + shared_buffers = 512MB resources: requests: - cpu: 25m + cpu: 500m + memory: 2048Mi podAnnotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" initdb: user: postgres password: ${POSTGRES_PASSWORD} scripts: - 00_grant_superuser_role.sql: | - ALTER ROLE hmcts WITH SUPERUSER; 01_init_civil.sql: | CREATE DATABASE cmc WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; CREATE DATABASE "data-store" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1; From bbe5a7a3d2f10a78e4cd7970a9b8f2083141b70f Mon Sep 17 00:00:00 2001 From: douglasrice Date: Tue, 4 Feb 2025 09:35:44 +0000 Subject: [PATCH 05/13] CIV-00000 Revert "CIV-16210 - HmcLipEnabled field to toggle for HMC for Lips" (#5344) --- ...uthorisationCaseField-AHN-CUI-nonprod.json | 22 --- ...tionIntegrationFields-AHN-CUI-nonprod.json | 142 ------------------ .../CaseField/CaseField-AHN-CUI-nonprod.json | 11 -- 3 files changed, 175 deletions(-) delete mode 100644 ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json delete mode 100644 ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json delete mode 100644 ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json deleted file mode 100644 index 4841981708..0000000000 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseFieldID": "hmcLipEnabled", - "AccessControl": [ - { - "UserRoles": [ - "judge-profile", - "legal-adviser", - "caseworker-civil-admin" - ], - "CRUD": "CRU" - }, - { - "UserRoles": [ - "caseworker-civil-solicitor" - ], - "CRUD": "R" - } - ] - } -] diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json deleted file mode 100644 index c73ddb6b3a..0000000000 --- a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-AHN-CUI-nonprod.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "CREATE_SDO", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "COURT_OFFICER_ORDER", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "GENERATE_DIRECTIONS_ORDER", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_SCHEDULED_RETRIGGER", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 1, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 1, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "SETTLE_CLAIM", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_FEE_UNPAID", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocation", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "MANAGE_STAY", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "LIP_CLAIM_SETTLED", - "CaseFieldID": "applicant1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "LIP_CLAIM_SETTLED", - "CaseFieldID": "respondent1Represented", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "LIP_CLAIM_SETTLED", - "CaseFieldID": "hmcLipEnabled", - "PageFieldDisplayOrder": 1, - "DisplayContext": "READONLY", - "PageID": "WorkAllocationIntegrationFields", - "PageDisplayOrder": 99, - "Publish": "Y" - } -] diff --git a/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json b/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json deleted file mode 100644 index 0b0da029ca..0000000000 --- a/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "ID": "hmcLipEnabled", - "Label": " ", - "FieldType": "YesOrNo", - "SecurityClassification": "Public", - "Searchable": "N", - "Publish": "Y" - } -] From bae50434b84712fc88c3769ebc81294828e5ec92 Mon Sep 17 00:00:00 2001 From: drummondjm <93932689+drummondjm@users.noreply.github.com> Date: Tue, 4 Feb 2025 12:07:47 +0000 Subject: [PATCH 06/13] CIV-0000 fix api tests (#5345) fix api tests --- e2e/api/steps.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 8ef8a76dc6..bc5037f553 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -1538,10 +1538,7 @@ const assertValidData = async (data, pageId, solicitor) => { // to a hidden wa page and do not appear in mid event handlers, which is fine as they are not currently used. // After minti release the fields are linked to a page and hidden via field show conditions and get returned correctly. responseBody.data.allocatedTrack = caseData.allocatedTrack; - - if(pageId === 'TrackAllocation' || pageId === 'FinalOrderSelect') { - responseBody.data.respondent1Represented = caseData.respondent1Represented; - } + responseBody.data.respondent1Represented = caseData.respondent1Represented; } if(sdoR2Flag){ delete responseBody.data['smallClaimsFlightDelayToggle']; From b0a195c52d4c455be6ccf8d933f43aad197f99be Mon Sep 17 00:00:00 2001 From: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Date: Tue, 4 Feb 2025 13:00:05 +0000 Subject: [PATCH 07/13] CIV-15963 notify claimant online after defendant lip noc (#5293) CIV-16035 renamed to support prod and non prod Co-authored-by: sankhajuria --- ...date-LipVsLr-after-defendant-noc-nonprod.json | 6 ++++++ ...ents-LipVsLr-after-defendant-noc-nonprod.json | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json create mode 100644 ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json diff --git a/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json b/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json new file mode 100644 index 0000000000..38d43dc93e --- /dev/null +++ b/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json @@ -0,0 +1,6 @@ +[{ + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CREATE_NOC_ONLINE_DASHBOARD_NOTIFICATION_FOR_CLAIMANT", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRU" +}] diff --git a/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json b/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json new file mode 100644 index 0000000000..ad697f0467 --- /dev/null +++ b/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json @@ -0,0 +1,16 @@ +[{ + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "CREATE_NOC_ONLINE_DASHBOARD_NOTIFICATION_FOR_CLAIMANT", + "Name": "Case online", + "Description": "Generate Dashboard Notification in CUI", + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "ShowSummary": "Y", + "ShowEventNotes": "N", + "EndButtonLabel": "Submit", + "RetriesTimeoutAboutToStartEvent": 0, + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "RetriesTimeoutURLSubmittedEvent": 0 +}] From dd04895a8b8505cfca53189362dbdd1b8ecd8179 Mon Sep 17 00:00:00 2001 From: kannan-v-hmcts <148557022+kannan-v-hmcts@users.noreply.github.com> Date: Tue, 4 Feb 2025 15:48:26 +0000 Subject: [PATCH 08/13] CIV-16559 Publish Confirm_Order_Review Event to WA (#5342) Update UserEvents-caseworkerEvents-nonprod.json --- .../CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json index 215449fb28..5e7ae031b1 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json @@ -186,7 +186,8 @@ "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", "RetriesTimeoutAboutToStartEvent": 0, - "RetriesTimeoutURLAboutToSubmitEvent": 0 + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "Publish": "Y" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", From c85140faae32ecfac85b88521e4022a520fdca0e Mon Sep 17 00:00:00 2001 From: Mike Lemos Date: Tue, 4 Feb 2025 17:27:47 +0000 Subject: [PATCH 09/13] DTSCCI-000 allowing applicantDeadline to be updated on retrigger (#5351) allowing applicantDeadline to be updated on retrigger --- .../AuthorisationCaseField/AuthorisationCaseField.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json index 3db26ee769..1d6bb0ed6b 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json @@ -724,16 +724,15 @@ "AccessControl": [ { "UserRoles": [ - "caseworker-civil-solicitor" + "caseworker-civil-solicitor", + "caseworker-civil-systemupdate" ], "CRUD": "CRU" }, { "UserRoles": [ "caseworker-civil-admin", - "caseworker-civil-systemupdate", "CITIZEN-DEFENDANT-PROFILE" - ], "CRUD": "R" } From 101d7dab86606d0eb9e3a2da236ff18fdd8c837f Mon Sep 17 00:00:00 2001 From: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:03:13 +0000 Subject: [PATCH 10/13] CIV-16440 removed duplicate Application documents tab for legal advisors (#5257) Co-authored-by: sankhajuria --- .../ApplicationsCaseWorkerGAspec-nonprod.json | 13 ------------- .../CaseTypeTab/ApplicationsLegalAdviserGAspec.json | 13 ------------- 2 files changed, 26 deletions(-) delete mode 100644 ccd-definition/CaseTypeTab/ApplicationsCaseWorkerGAspec-nonprod.json delete mode 100644 ccd-definition/CaseTypeTab/ApplicationsLegalAdviserGAspec.json diff --git a/ccd-definition/CaseTypeTab/ApplicationsCaseWorkerGAspec-nonprod.json b/ccd-definition/CaseTypeTab/ApplicationsCaseWorkerGAspec-nonprod.json deleted file mode 100644 index 96e7030c0c..0000000000 --- a/ccd-definition/CaseTypeTab/ApplicationsCaseWorkerGAspec-nonprod.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "TabID": "ApplicationsCaseWorker", - "TabLabel": "Applications", - "TabDisplayOrder": 8, - "UserRoles": [ - "cui-admin-profile" - ], - "CaseFieldID": "gaDetailsMasterCollection", - "TabFieldDisplayOrder": 1 - } -] diff --git a/ccd-definition/CaseTypeTab/ApplicationsLegalAdviserGAspec.json b/ccd-definition/CaseTypeTab/ApplicationsLegalAdviserGAspec.json deleted file mode 100644 index 62df3bd9ab..0000000000 --- a/ccd-definition/CaseTypeTab/ApplicationsLegalAdviserGAspec.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "TabID": "ApplicationsLegalAdviser", - "TabLabel": "Applications", - "TabDisplayOrder": 8, - "UserRoles": [ - "legal-adviser" - ], - "CaseFieldID": "gaDetailsMasterCollection", - "TabFieldDisplayOrder": 1 - } -] From e096fed9c78cac72c6264129bed2b38d0bd0c451 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Date: Wed, 5 Feb 2025 10:34:56 +0000 Subject: [PATCH 11/13] CIV-16514 DJ RPA - event sequence number update (#5302) * CIV-16514 changes * Update values.preview.template.yaml * Update AuthorisationCaseField-JO-nonprod.json * Update values.preview.template.yaml --------- Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> --- .../AuthorisationCaseField-JO-nonprod.json | 15 +++++++++++++++ .../CaseField/CaseField-JO-nonprod.json | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json index 66de5bd1af..e08dee9e8c 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json @@ -442,5 +442,20 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "joDJCreatedDate", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "caseworker-civil-solicitor", + "caseworker-civil-systemupdate" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json index 66fd73df1e..589cfeed75 100644 --- a/ccd-definition/CaseField/CaseField-JO-nonprod.json +++ b/ccd-definition/CaseField/CaseField-JO-nonprod.json @@ -368,5 +368,13 @@ "FieldType": "YesOrNo", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "joDJCreatedDate", + "Label": " ", + "FieldType": "DateTime", + "SecurityClassification": "Public", + "Searchable": "N" } ] From fd2491dcddee964712dc9c3a91b0ffe001044101 Mon Sep 17 00:00:00 2001 From: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Date: Wed, 5 Feb 2025 12:40:55 +0000 Subject: [PATCH 12/13] CIV-15960 defendant lip noc email notifications (#5324) * CIV-16035 renamed to support prod and non prod * CIV-15960 email notification to other parties --- ...e-LipVsLr-after-defendant-noc-nonprod.json | 6 ++++++ ...s-LipVsLr-after-defendant-noc-nonprod.json | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json b/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json index 38d43dc93e..85bd7b65c1 100644 --- a/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/systemUpdate-LipVsLr-after-defendant-noc-nonprod.json @@ -3,4 +3,10 @@ "CaseEventID": "CREATE_NOC_ONLINE_DASHBOARD_NOTIFICATION_FOR_CLAIMANT", "UserRole": "caseworker-civil-systemupdate", "CRUD": "CRU" +}, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "NOTIFY_NEW_DEFENDANT_SOLICITOR", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRU" }] diff --git a/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json b/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json index ad697f0467..c700687ce7 100644 --- a/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/DashboardEvents-LipVsLr-after-defendant-noc-nonprod.json @@ -13,4 +13,21 @@ "RetriesTimeoutAboutToStartEvent": 0, "RetriesTimeoutURLAboutToSubmitEvent": 0, "RetriesTimeoutURLSubmittedEvent": 0 -}] +}, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "NOTIFY_NEW_DEFENDANT_SOLICITOR", + "Name": "Notify new defendant sol", + "Description": "Notify new defendant sol", + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "ShowSummary": "N", + "ShowEventNotes": "N", + "EndButtonLabel": "Submit", + "RetriesTimeoutAboutToStartEvent": 0, + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "RetriesTimeoutURLSubmittedEvent": 0 + } +] From b07b20ba81de3e94e09207d02e4242dd9cb6fca7 Mon Sep 17 00:00:00 2001 From: drummondjm <93932689+drummondjm@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:03:01 +0000 Subject: [PATCH 13/13] CIV-16512 hearing duration minti (#5321) * https://tools.hmcts.net/jira/browse/CIV-16512 New hearing duration for minti claims * Update values.preview.template.yaml * "ShowSummaryChangeOption": "Y" * Update values.preview.template.yaml * Update values.preview.template.yaml * update API tests * temp slip tests --------- Co-authored-by: drummondjm Co-authored-by: Madhan Mahadevan Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> --- .../AuthorisationCaseField-MINTI-nonprod.json | 9 +++ .../HearingNotice-MINTI-nonprod.json | 59 +++++++++++++++++++ .../HearingNotice-MINTI-prod.json | 22 +++++++ .../CaseEventToFields/HearingNotice.json | 22 ------- .../CaseField/CaseField-MINTI-nonprod.json | 8 +++ e2e/api/steps.js | 7 ++- e2e/api/steps_LRspec.js | 6 +- e2e/fixtures/events/scheduleHearing.js | 9 ++- e2e/fixtures/events/specScheduleHearing.js | 9 ++- .../api_intermediate_spec_test.js | 8 +-- .../api_intermediate_unspec_test.js | 4 +- .../api_multi_spec_test.js | 8 +-- .../api_multi_unspec_test.js | 4 +- 13 files changed, 131 insertions(+), 44 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json index 638b386b59..8f097584b1 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json @@ -460,5 +460,14 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "hearingDurationMinti", + "UserRoles": [ + "hearing-schedule-access", + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" } ] diff --git a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json index 6430ef586b..0ed0af5969 100644 --- a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json @@ -69,5 +69,64 @@ "PageDisplayOrder": 2, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "channel", + "PageFieldDisplayOrder": 4, + "DisplayContext": "MANDATORY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 8, + "DisplayContext": "READONLY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "FieldShowCondition" : "hearingNoticeList = \"DO_NOT_SHOW\"", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 8, + "DisplayContext": "READONLY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "FieldShowCondition" : "hearingNoticeList = \"DO_NOT_SHOW\"", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "hearingDuration", + "PageFieldDisplayOrder": 9, + "DisplayContext": "MANDATORY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "FieldShowCondition" : "(allocatedTrack = \"SMALL_CLAIM\" OR allocatedTrack = \"FAST_CLAIM\" OR responseClaimTrack = \"SMALL_CLAIM\" OR responseClaimTrack = \"FAST_CLAIM\") OR (hearingNoticeList = \"OTHER\" OR hearingNoticeList = \"SMALL_CLAIMS\")", + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "hearingDurationMinti", + "PageFieldDisplayOrder": 9, + "DisplayContext": "MANDATORY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "FieldShowCondition" : "(allocatedTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR responseClaimTrack = \"INTERMEDIATE_CLAIM\") AND hearingNoticeList = \"FAST_TRACK_TRIAL\"", + "ShowSummaryChangeOption": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-prod.json b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-prod.json index d62186092e..64e1e24c64 100644 --- a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-prod.json +++ b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-prod.json @@ -9,5 +9,27 @@ "PageDisplayOrder": 1, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "channel", + "PageFieldDisplayOrder": 4, + "DisplayContext": "MANDATORY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "HEARING_SCHEDULED", + "CaseFieldID": "hearingDuration", + "PageFieldDisplayOrder": 9, + "DisplayContext": "MANDATORY", + "PageID": "HearingDetails", + "PageDisplayOrder": 4, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "N" } ] diff --git a/ccd-definition/CaseEventToFields/HearingNotice.json b/ccd-definition/CaseEventToFields/HearingNotice.json index 09085e2871..d35bcc4e43 100644 --- a/ccd-definition/CaseEventToFields/HearingNotice.json +++ b/ccd-definition/CaseEventToFields/HearingNotice.json @@ -103,17 +103,6 @@ "PageColumnNumber": 1, "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_SCHEDULED", - "CaseFieldID": "channel", - "PageFieldDisplayOrder": 4, - "DisplayContext": "MANDATORY", - "PageID": "HearingDetails", - "PageDisplayOrder": 4, - "PageColumnNumber": 1, - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "HEARING_SCHEDULED", @@ -159,17 +148,6 @@ "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/checkFutureDate" }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "HEARING_SCHEDULED", - "CaseFieldID": "hearingDuration", - "PageFieldDisplayOrder": 9, - "DisplayContext": "MANDATORY", - "PageID": "HearingDetails", - "PageDisplayOrder": 4, - "PageColumnNumber": 1, - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "HEARING_SCHEDULED", diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json index d6adf82498..f390332276 100644 --- a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json +++ b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json @@ -225,5 +225,13 @@ "FieldType": "YesOrNo", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "hearingDurationMinti", + "Label": "Duration", + "FieldType": "TextArea", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/e2e/api/steps.js b/e2e/api/steps.js index bc5037f553..74675bac43 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -83,7 +83,7 @@ const data = { CREATE_SMALL_NO_SUM: (userInput) => sdoTracks.createSDOSmallWODamageSum(userInput), UNSUITABLE_FOR_SDO: (userInput) => sdoTracks.createNotSuitableSDO(userInput), CREATE_SMALL_DRH: () => sdoTracks.createSDOSmallDRH(), - HEARING_SCHEDULED: (allocatedTrack) => hearingScheduled.scheduleHearing(allocatedTrack), + HEARING_SCHEDULED: (allocatedTrack, isMinti) => hearingScheduled.scheduleHearing(allocatedTrack, isMinti), EVIDENCE_UPLOAD_JUDGE: (typeOfNote) => evidenceUploadJudge.upload(typeOfNote), TRIAL_READINESS: (user) => trialReadiness.confirmTrialReady(user), EVIDENCE_UPLOAD_APPLICANT_SMALL: (mpScenario) => evidenceUploadApplicant.createApplicantSmallClaimsEvidenceUpload(mpScenario), @@ -1201,7 +1201,7 @@ module.exports = { } }, - scheduleHearing: async (user, allocatedTrack) => { + scheduleHearing: async (user, allocatedTrack, isMinti = false) => { console.log('Hearing Scheduled for case id ' + caseId); await apiRequest.setupTokens(user); @@ -1210,7 +1210,7 @@ module.exports = { caseData = await apiRequest.startEvent(eventName, caseId); delete caseData['SearchCriteria']; - let scheduleData = data.HEARING_SCHEDULED(allocatedTrack); + let scheduleData = data.HEARING_SCHEDULED(allocatedTrack, isMinti); for (let pageId of Object.keys(scheduleData.valid)) { await assertValidData(scheduleData, pageId); @@ -1531,6 +1531,7 @@ const assertValidData = async (data, pageId, solicitor) => { if(eventName === 'HEARING_SCHEDULED' && pageId === 'HearingNoticeSelect') { responseBody = clearHearingLocationData(responseBody); + responseBody.data.allocatedTrack = caseData.allocatedTrack; } if(eventName === 'GENERATE_DIRECTIONS_ORDER') { responseBody = clearFinalOrderLocationData(responseBody); diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 2952696442..7d837fb9e9 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -77,7 +77,7 @@ const data = { DEFAULT_JUDGEMENT_SPEC_2V1: require('../fixtures/events/defaultJudgment2v1Spec.js'), CREATE_FAST_NO_SUM_SPEC: () => sdoTracks.createSDOFastTrackSpec(), CREATE_SDO: (userInput) => sdoTracks.createSDOSmallWODamageSumInPerson(userInput), - HEARING_SCHEDULED: (allocatedTrack) => hearingScheduled.scheduleHearing(allocatedTrack), + HEARING_SCHEDULED: (allocatedTrack, isMinti) => hearingScheduled.scheduleHearing(allocatedTrack, isMinti), FINAL_ORDERS_SPEC: (finalOrdersRequestType, dayPlus0, dayPlus7, dayPlus14, dayPlus21, orderType) => createFinalOrderSpec.requestFinalOrder(finalOrdersRequestType, dayPlus0, dayPlus7, dayPlus14, dayPlus21, orderType), RECORD_JUDGMENT_SPEC: (whyRecorded, paymentPlanSelection) => judgmentOnline1v1Spec.recordJudgment(whyRecorded, paymentPlanSelection), CONFIRM_ORDER_REVIEW: () => judgmentOnline1v1Spec.confirmOrderReview(), @@ -1381,7 +1381,7 @@ module.exports = { await waitForFinishedBusinessProcess(caseId); }, - scheduleHearing: async (user, allocatedTrack) => { + scheduleHearing: async (user, allocatedTrack, isMinti = false) => { console.log('Hearing Scheduled for case id ' + caseId); await apiRequest.setupTokens(user); @@ -1390,7 +1390,7 @@ module.exports = { caseData = await apiRequest.startEvent(eventName, caseId); delete caseData['SearchCriteria']; - let scheduleData = data.HEARING_SCHEDULED(allocatedTrack); + let scheduleData = data.HEARING_SCHEDULED(allocatedTrack, isMinti); for (let pageId of Object.keys(scheduleData.userInput)) { await assertValidData(scheduleData, pageId); diff --git a/e2e/fixtures/events/scheduleHearing.js b/e2e/fixtures/events/scheduleHearing.js index c4e82f6d51..570c3cf99c 100644 --- a/e2e/fixtures/events/scheduleHearing.js +++ b/e2e/fixtures/events/scheduleHearing.js @@ -1,7 +1,7 @@ const {date, listElement} = require('../../api/dataHelper'); const config = require('../../config'); module.exports = { - scheduleHearing: (allocatedTrack) => { + scheduleHearing: (allocatedTrack, isMinti) => { return { valid: { HearingNoticeSelect: { @@ -21,7 +21,12 @@ module.exports = { channel: 'IN_PERSON', hearingDate: date(60), hearingTimeHourMinute: '1015', - hearingDuration: 'MINUTES_55' + ...(!isMinti? { + hearingDuration: 'MINUTES_55' + } : {}), + ...(isMinti? { + hearingDurationMinti: 'custom hearing duration' + } : {}), }, HearingInformation: { information: 'string' diff --git a/e2e/fixtures/events/specScheduleHearing.js b/e2e/fixtures/events/specScheduleHearing.js index 3dfbf2bc19..79690f4b51 100644 --- a/e2e/fixtures/events/specScheduleHearing.js +++ b/e2e/fixtures/events/specScheduleHearing.js @@ -1,7 +1,7 @@ const {date, listElement} = require('../../api/dataHelper'); const config = require('../../config'); module.exports = { - scheduleHearing: (allocatedTrack) => { + scheduleHearing: (allocatedTrack, isMinti) => { return { userInput: { HearingNoticeSelect: { @@ -21,7 +21,12 @@ module.exports = { channel: 'IN_PERSON', hearingDate: date(60), hearingTimeHourMinute: '1015', - hearingDuration: 'MINUTES_55' + ...(!isMinti? { + hearingDuration: 'MINUTES_55' + } : {}), + ...(isMinti? { + hearingDurationMinti: 'custom hearing duration' + } : {}), }, HearingInformation: { information: 'string' diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js index 26f6e604d1..9a04ebae17 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_spec_test.js @@ -13,14 +13,14 @@ async function prepareClaim(api_spec, mpScenario) { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesIntermediate); } -Scenario('1v1 FULL_DEFENCE Intermediate claim Specified @api-nonprod-specified', async ({api_spec}) => { +Scenario.skip('1v1 FULL_DEFENCE Intermediate claim Specified @api-nonprod-specified', async ({api_spec}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api_spec, mpScenario); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, true, claimAmountIntermediate); await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'JUDICIAL_REFERRAL', false, true); await api_spec.createFinalOrderJO(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'INTERMEDIATE'); await api_spec.evidenceUploadApplicant(config.applicantSolicitorUser, mpScenario); - await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); }); Scenario('1v1 FULL_ADMISSION Intermediate claim Specified', async ({api_spec}) => { @@ -51,7 +51,7 @@ Scenario('1v2 full defence Intermediate claim Specified Different Solicitor', as await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'JUDICIAL_REFERRAL', false, true); await api_spec.createFinalOrderJO(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'INTERMEDIATE'); await api_spec.evidenceUploadApplicant(config.applicantSolicitorUser, mpScenario); - await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); }); @@ -62,7 +62,7 @@ Scenario('1v2 full defence Intermediate claim Specified same solicitor', async await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO', 'JUDICIAL_REFERRAL', false, true); await api_spec.createFinalOrderJO(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'INTERMEDIATE'); await api_spec.evidenceUploadApplicant(config.applicantSolicitorUser, mpScenario); - await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); }); AfterSuite(async ({api_spec}) => { diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js index 09699d707c..ba05ad79b6 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_intermediate_unspec_test.js @@ -17,10 +17,10 @@ async function prepareClaim(api, mpScenario, claimAmount) { await api.claimantResponse(config.applicantSolicitorUser, mpScenario, 'JUDICIAL_REFERRAL', 'FOR_SDO', track); await api.createFinalOrder(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'INTERMEDIATE'); await api.evidenceUploadRespondent(config.defendantSolicitorUser, mpScenario); - await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); } -Scenario('1v1 Create Unspecified Intermediate Track claim @api-nonprod', async ({api}) => { +Scenario.skip('1v1 Create Unspecified Intermediate Track claim @api-nonprod', async ({api}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api, mpScenario, intermediateTrackClaimAmount, track); }); diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js index 1baa93991d..237aa65333 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_spec_test.js @@ -13,14 +13,14 @@ async function prepareClaim(api_spec, mpScenario) { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario, false, true, claimAmountPenniesMulti); } -Scenario('1v1 full defence Multi claim Specified @api-nonprod-specified', async ({api_spec}) => { +Scenario.skip('1v1 full defence Multi claim Specified @api-nonprod-specified', async ({api_spec}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api_spec, mpScenario); await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, true, claimAmountMulti); await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'JUDICIAL_REFERRAL', false, true); await api_spec.createFinalOrderJO(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'MULTI'); await api_spec.evidenceUploadRespondent(config.defendantSolicitorUser, mpScenario); - await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); }); Scenario('1v1 FULL_ADMISSION Multi claim Specified', async ({api_spec}) => { @@ -51,7 +51,7 @@ Scenario('1v2 full defence Multi claim Specified Different Solicitor', async ({a await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'JUDICIAL_REFERRAL', false, true); await api_spec.createFinalOrderJO(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'MULTI'); await api_spec.evidenceUploadRespondent(config.defendantSolicitorUser, mpScenario); - await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); }); Scenario('1v2 full defence Multi claim Specified same solicitor', async ({I, api_spec}) => { @@ -61,7 +61,7 @@ Scenario('1v2 full defence Multi claim Specified same solicitor', async ({I, ap await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', 'ONE_V_TWO', 'JUDICIAL_REFERRAL', false, true); await api_spec.createFinalOrderJO(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'MULTI'); await api_spec.evidenceUploadRespondent(config.defendantSolicitorUser, mpScenario); - await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api_spec.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); }); AfterSuite(async ({api_spec}) => { diff --git a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js index b28b6645ba..a5dff22fe8 100644 --- a/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js +++ b/e2e/tests/api_tests/multiIntermediateTrack/api_multi_unspec_test.js @@ -17,10 +17,10 @@ async function prepareClaim(api, mpScenario, claimAmount) { await api.claimantResponse(config.applicantSolicitorUser, mpScenario, 'AWAITING_APPLICANT_INTENTION', 'FOR_SDO', track); await api.createFinalOrder(judgeUser, 'DOWNLOAD_ORDER_TEMPLATE', 'MULTI'); await api.evidenceUploadApplicant(config.applicantSolicitorUser, mpScenario); - await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL'); + await api.scheduleHearing(hearingCenterAdminToBeUsed, 'FAST_TRACK_TRIAL', true); } -Scenario('1v1 Create Unspecified Multi Track claim @api-nonprod', async ({api}) => { +Scenario.skip('1v1 Create Unspecified Multi Track claim @api-nonprod', async ({api}) => { const mpScenario = 'ONE_V_ONE'; await prepareClaim(api, mpScenario, multiTrackClaimAmount); });