From c2cdbe673241230801f8a82f142e08635d5f362c Mon Sep 17 00:00:00 2001 From: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:01:33 +0100 Subject: [PATCH 1/4] Added draft directions to claimant response spec journey for intermerdiate and multi claims --- .../ClaimantResponseLRspec-CUI.json | 10 ++++---- .../ClaimantResponseLRspec.json | 22 +++++++++--------- .../ClaimantResponseSpec-MINTI-nonprod.json | 23 ++++++++++++++++++- .../claimantResponseIntermediateClaimSpec.js | 7 ++++++ .../events/claimantResponseMultiClaimSpec.js | 7 ++++++ .../events/claimantResponseSpec1v2.js | 7 ++++++ .../events/claimantResponseSpec2v1.js | 7 ++++++ 7 files changed, 66 insertions(+), 17 deletions(-) diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json index 65bac2b3f6..596e226c98 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json @@ -984,7 +984,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1DQRequestedCourtSpecLabel", - "PageDisplayOrder": 12, + "PageDisplayOrder": 13, "PageFieldDisplayOrder": 1, "PageShowCondition": "applicantDefenceResponseDocumentAndDQFlag =\"Yes\"", "DisplayContext": "READONLY", @@ -995,7 +995,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1DQHearingSupport", - "PageDisplayOrder": 13, + "PageDisplayOrder": 14, "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "HearingSupport", @@ -1008,7 +1008,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1DQVulnerabilityQuestions", - "PageDisplayOrder": 14, + "PageDisplayOrder": 15, "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "VulnerabilityQuestions", @@ -1022,7 +1022,7 @@ "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "respondent1DQFutureApplicationsLabel", "PageLabel": "", - "PageDisplayOrder": 15, + "PageDisplayOrder": 16, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "Applications", @@ -1033,7 +1033,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "respondStatementOfTruthHeaderLabel", - "PageDisplayOrder": 16, + "PageDisplayOrder": 17, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, "DisplayContext": "READONLY", diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec.json b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec.json index 2c88de1d0f..6dc551f0ff 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec.json @@ -108,7 +108,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1DQRequestedCourt", - "PageDisplayOrder": 12, + "PageDisplayOrder": 13, "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "ApplicantCourtLocationLRspec", @@ -130,7 +130,7 @@ "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1DQFutureApplications", "PageLabel": "", - "PageDisplayOrder": 15, + "PageDisplayOrder": 16, "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "Applications", @@ -141,7 +141,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1AdditionalInformationForJudge", - "PageDisplayOrder": 15, + "PageDisplayOrder": 16, "PageFieldDisplayOrder": 3, "CaseEventFieldLabel": "Provide any other information the judge may need", "DisplayContext": "OPTIONAL", @@ -152,7 +152,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicant1DQFurtherInformation", - "PageDisplayOrder": 15, + "PageDisplayOrder": 16, "PageFieldDisplayOrder": 4, "DisplayContext": "COMPLEX", "PageID": "FurtherInformation", @@ -164,7 +164,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "applicantStatementOfTruthLabel", - "PageDisplayOrder": 16, + "PageDisplayOrder": 17, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, "DisplayContext": "READONLY", @@ -176,7 +176,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "uiStatementOfTruth", - "PageDisplayOrder": 16, + "PageDisplayOrder": 17, "PageFieldDisplayOrder": 3, "PageColumnNumber": 1, "DisplayContext": "COMPLEX", @@ -188,7 +188,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "respondStatementOfTruthSubmitLabel", - "PageDisplayOrder": 16, + "PageDisplayOrder": 17, "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "READONLY", @@ -200,7 +200,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "respondentPayImmediatelyLabel", - "PageDisplayOrder": 17, + "PageDisplayOrder": 18, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "RespondentResponsePayImmediately", @@ -211,7 +211,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "respondentPayImmediatelyTextBeforeDate", - "PageDisplayOrder": 17, + "PageDisplayOrder": 18, "PageFieldDisplayOrder": 2, "DisplayContext": "READONLY", "PageID": "RespondentResponsePayImmediately", @@ -221,7 +221,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "whenToBePaidText", - "PageDisplayOrder": 17, + "PageDisplayOrder": 18, "PageFieldDisplayOrder": 3, "DisplayContext": "READONLY", "PageID": "RespondentResponsePayImmediately", @@ -231,7 +231,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "CLAIMANT_RESPONSE_SPEC", "CaseFieldID": "respondentPayImmediatelyTextAfterDate", - "PageDisplayOrder": 17, + "PageDisplayOrder": 18, "PageFieldDisplayOrder": 4, "DisplayContext": "READONLY", "PageID": "RespondentResponsePayImmediately", diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json index c5992cf856..14d5946d97 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json @@ -21,5 +21,26 @@ "PageID": "FixedRecoverableCostsIntermediate", "FieldShowCondition": "applicant1ProceedWithClaim=\"Yes\" OR applicant1ProceedWithClaimSpec2v1=\"Yes\"", "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CLAIMANT_RESPONSE_SPEC", + "CaseFieldID": "applicant1DQDraftDirectionsLabel", + "PageDisplayOrder": 12, + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "DraftDirections", + "PageShowCondition": "respondent1ClaimResponseTypeForSpec=\"FULL_DEFENCE\" AND applicant1ProceedWithClaim = \"Yes\" AND (responseClaimTrack =\"INTERMEDIATE_CLAIM\" OR responseClaimTrack =\"MULTI_CLAIM\")", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CLAIMANT_RESPONSE_SPEC", + "CaseFieldID": "applicant1DQDraftDirections", + "PageDisplayOrder": 12, + "PageFieldDisplayOrder": 2, + "DisplayContext": "MANDATORY", + "PageID": "DraftDirections", + "ShowSummaryChangeOption": "Y" } -] + ] diff --git a/e2e/fixtures/events/claimantResponseIntermediateClaimSpec.js b/e2e/fixtures/events/claimantResponseIntermediateClaimSpec.js index ecbe760c8f..ea2b2bfe0c 100644 --- a/e2e/fixtures/events/claimantResponseIntermediateClaimSpec.js +++ b/e2e/fixtures/events/claimantResponseIntermediateClaimSpec.js @@ -92,6 +92,13 @@ module.exports = { unavailableDatesRequired: 'No', } }, + DraftDirections: { + applicant1DQDraftDirections: { + document_url: '${TEST_DOCUMENT_URL}', + document_binary_url: '${TEST_DOCUMENT_BINARY_URL}', + document_filename: '${TEST_DOCUMENT_FILENAME}' + } + }, ApplicantCourtLocationLRspec: { applicant1DQRequestedCourt: { responseCourtLocations: { diff --git a/e2e/fixtures/events/claimantResponseMultiClaimSpec.js b/e2e/fixtures/events/claimantResponseMultiClaimSpec.js index b20c1d6dd6..eaa045c4c2 100644 --- a/e2e/fixtures/events/claimantResponseMultiClaimSpec.js +++ b/e2e/fixtures/events/claimantResponseMultiClaimSpec.js @@ -81,6 +81,13 @@ module.exports = { unavailableDatesRequired: 'No', } }, + DraftDirections: { + applicant1DQDraftDirections: { + document_url: '${TEST_DOCUMENT_URL}', + document_binary_url: '${TEST_DOCUMENT_BINARY_URL}', + document_filename: '${TEST_DOCUMENT_FILENAME}' + } + }, ApplicantCourtLocationLRspec: { applicant1DQRequestedCourt: { responseCourtLocations: { diff --git a/e2e/fixtures/events/claimantResponseSpec1v2.js b/e2e/fixtures/events/claimantResponseSpec1v2.js index ea318e40df..438908d294 100644 --- a/e2e/fixtures/events/claimantResponseSpec1v2.js +++ b/e2e/fixtures/events/claimantResponseSpec1v2.js @@ -150,6 +150,13 @@ module.exports = { unavailableDatesRequired: 'No' } }, + DraftDirections: { + applicant1DQDraftDirections: { + document_url: '${TEST_DOCUMENT_URL}', + document_binary_url: '${TEST_DOCUMENT_BINARY_URL}', + document_filename: '${TEST_DOCUMENT_FILENAME}' + } + }, ApplicantCourtLocationLRspec: { applicant1DQRequestedCourt: { responseCourtLocations: { diff --git a/e2e/fixtures/events/claimantResponseSpec2v1.js b/e2e/fixtures/events/claimantResponseSpec2v1.js index eacf93a766..e50533b155 100644 --- a/e2e/fixtures/events/claimantResponseSpec2v1.js +++ b/e2e/fixtures/events/claimantResponseSpec2v1.js @@ -66,6 +66,13 @@ module.exports = { unavailableDatesRequired: 'No' } }, + DraftDirections: { + applicant1DQDraftDirections: { + document_url: '${TEST_DOCUMENT_URL}', + document_binary_url: '${TEST_DOCUMENT_BINARY_URL}', + document_filename: '${TEST_DOCUMENT_FILENAME}' + } + }, ApplicantCourtLocationLRspec: { applicant1DQRequestedCourt: { responseCourtLocations: { From 157cc88bca0e2affd4b1cce193f4828bdfb0b86a Mon Sep 17 00:00:00 2001 From: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:10:27 +0100 Subject: [PATCH 2/4] Update ClaimantResponseSpec-MINTI-nonprod.json --- .../CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json index 14d5946d97..f4e896abfb 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponseSpec-MINTI-nonprod.json @@ -43,4 +43,4 @@ "PageID": "DraftDirections", "ShowSummaryChangeOption": "Y" } - ] +] From c2f7295c86603270d3991e16cfa193dda8b9b644 Mon Sep 17 00:00:00 2001 From: drummondjm <93932689+drummondjm@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:32:28 +0100 Subject: [PATCH 3/4] Update values.preview.template.yaml --- charts/civil-ccd/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index a001001813..8b221fb2da 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -3,7 +3,7 @@ civil-wa: civil-service: java: - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-5298' keyVaults: civil: resourceGroup: civil From 0f24b6116a1c05934bacec250b5a353a9fe4f023 Mon Sep 17 00:00:00 2001 From: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Date: Fri, 23 Aug 2024 08:28:24 +0100 Subject: [PATCH 4/4] Update values.preview.template.yaml --- charts/civil-ccd/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index 8b221fb2da..a001001813 100644 --- a/charts/civil-ccd/values.preview.template.yaml +++ b/charts/civil-ccd/values.preview.template.yaml @@ -3,7 +3,7 @@ civil-wa: civil-service: java: - image: 'hmctspublic.azurecr.io/civil/service:pr-5298' + image: 'hmctspublic.azurecr.io/civil/service:latest' keyVaults: civil: resourceGroup: civil