From 3dc32ae880feddad8dc7fa22eec3e0cb4b7380c3 Mon Sep 17 00:00:00 2001 From: GermanAmoros Date: Wed, 12 Jun 2024 10:28:35 +0200 Subject: [PATCH 01/77] CIV-14112 Added ccd event for discontinue claim --- ...ationCaseEvent-SettleDiscontinue-nonprod.json | 13 +++++++++++++ .../UserEvents-SettleDiscontinue-nonprod.json | 16 +++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index ef4f0d9fb7..17a449e151 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -24,5 +24,18 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index db9e9aa307..39586a2156 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -1,5 +1,4 @@ [ - { "CaseTypeID": "CIVIL", "ID": "SETTLE_CLAIM", @@ -29,5 +28,20 @@ "EndButtonLabel": "Settle claim", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", "RetriesTimeoutAboutToStartEvent": 0 + }, + { + "CaseTypeID": "CIVIL", + "ID": "DISCONTINUE_CLAIM", + "Name": "Discontinue this claim", + "Description": "Discontinue this claim", + "DisplayOrder": 14, + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "ShowSummary": "N", + "ShowEventNotes": "N", + "EndButtonLabel": "Settle claim", + "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "RetriesTimeoutAboutToStartEvent": 0 } ] From e2fa2929974d1895ea12ca2331280a8ae496313c Mon Sep 17 00:00:00 2001 From: GermanAmoros Date: Wed, 12 Jun 2024 11:24:59 +0200 Subject: [PATCH 02/77] CIV-14112 Changed ccd event id --- .../User/UserEvents-SettleDiscontinue-nonprod.json | 6 +++--- ccd-definition/CaseEvent/User/UserEvents-nonprod.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index 39586a2156..68b73ae087 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -31,16 +31,16 @@ }, { "CaseTypeID": "CIVIL", - "ID": "DISCONTINUE_CLAIM", + "ID": "DISCONTINUE_CLAIM_CLAIMANT", "Name": "Discontinue this claim", "Description": "Discontinue this claim", "DisplayOrder": 14, - "PreConditionState(s)": "*", + "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGMENT, AWAITING_APPLICANT_INTENTION, IN_MEDIATION, JUDICIAL_REFERRAL, CASE_PROGRESSION, HEARING_READINESS, PREPARE_FOR_HEARING_CONDUCT_HEARING, DECISION_OUTCOME", "PostConditionState": "*", "SecurityClassification": "Public", "ShowSummary": "N", "ShowEventNotes": "N", - "EndButtonLabel": "Settle claim", + "EndButtonLabel": "Discontinue claim", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", "RetriesTimeoutAboutToStartEvent": 0 } diff --git a/ccd-definition/CaseEvent/User/UserEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-nonprod.json index bd99ff50b3..8af6d120b7 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-nonprod.json @@ -17,7 +17,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "DISCONTINUE_CLAIM", + "ID": "DISCONTINUE_CLAIM_CLAIMANT", "Name": "Discontinue claim", "Description": "Discontinue a claim", "DisplayOrder": 11, From 3dd2aecdf8b9916808d9f33815ad6b724e78be7c Mon Sep 17 00:00:00 2001 From: GermanAmoros Date: Wed, 12 Jun 2024 13:04:52 +0200 Subject: [PATCH 03/77] CIV-14112 Fix event name --- ccd-definition/CaseEvent/User/UserEvents-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-nonprod.json index 8af6d120b7..bd99ff50b3 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-nonprod.json @@ -17,7 +17,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "DISCONTINUE_CLAIM_CLAIMANT", + "ID": "DISCONTINUE_CLAIM", "Name": "Discontinue claim", "Description": "Discontinue a claim", "DisplayOrder": 11, From 04621133ff1115e030385c63c6dec1c285004e40 Mon Sep 17 00:00:00 2001 From: GermanAmoros Date: Wed, 12 Jun 2024 13:05:31 +0200 Subject: [PATCH 04/77] CIV-14112 Fix event name --- .../AuthorisationCaseEvent-SettleDiscontinue-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index 17a449e151..90116479df 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -27,7 +27,7 @@ }, { "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "AccessControl": [ { "UserRoles": [ From 8a1d5c47be1268f06c1452de9218f9afec3c967b Mon Sep 17 00:00:00 2001 From: GermanAmoros Date: Wed, 12 Jun 2024 13:38:56 +0200 Subject: [PATCH 05/77] CIV-14112 Fix precondition states --- .../CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index 68b73ae087..8ab53e5666 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -35,7 +35,7 @@ "Name": "Discontinue this claim", "Description": "Discontinue this claim", "DisplayOrder": 14, - "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGMENT, AWAITING_APPLICANT_INTENTION, IN_MEDIATION, JUDICIAL_REFERRAL, CASE_PROGRESSION, HEARING_READINESS, PREPARE_FOR_HEARING_CONDUCT_HEARING, DECISION_OUTCOME", + "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", "SecurityClassification": "Public", "ShowSummary": "N", From a9de9eefdd330894aa7e1d3656804aff9b9e90c0 Mon Sep 17 00:00:00 2001 From: Azam <106387766+Azam-Hmcts@users.noreply.github.com> Date: Fri, 14 Jun 2024 15:41:45 +0100 Subject: [PATCH 06/77] Update UserEvents-SettleDiscontinue-nonprod.json --- .../CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index ec0d79baaa..a9954caa66 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -42,7 +42,6 @@ "SecurityClassification": "Public", "ShowSummary": "N", "ShowEventNotes": "N", - "EndButtonLabel": "Discontinue claim", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", "RetriesTimeoutAboutToStartEvent": 0 } From 27674f260f2d8dd5badd1430173c05e172cb65d1 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 18 Jun 2024 14:29:15 +0100 Subject: [PATCH 07/77] CIV-14128: Initial Commit --- ...sationCaseField-SettleDiscontinue-nonprod.json | 13 +++++++++++++ ...iscontinueClaim-SettleDiscontinue-nonprod.json | 15 +++++++++++++++ ...iscontinueClaim-SettleDiscontinue-nonprod.json | 10 ++++++++++ .../CaseField-SettleDiscontinue-nonprod.json | 8 ++++++++ 4 files changed, 46 insertions(+) create mode 100644 ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json create mode 100644 ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 992facf750..4cfa281a0e 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -78,5 +78,18 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "claimantWhoIsDiscontinuing", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json new file mode 100644 index 0000000000..a9f0b3c8e8 --- /dev/null +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -0,0 +1,15 @@ +[ + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantWhoIsDiscontinuing", + "PageID": "MultipleClaimant", + "PageLabel": "Who is discontinuing?", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y", + "RetriesTimeoutURLMidEvent": 0 + } +] diff --git a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json new file mode 100644 index 0000000000..e9f297d7f7 --- /dev/null +++ b/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -0,0 +1,10 @@ +[ + { + "CaseTypeID": "CIVIL", + "ID": "markDiscontinueForAllClaimants", + "Label": "Do all claimants consent to the discontinuance?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + } +] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 72402f80f0..bf7b733e1c 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -48,5 +48,13 @@ "FieldTypeParameter": "SettleReason", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "claimantWhoIsDiscontinuing", + "Label": "Which claimants are discontinuing?", + "FieldType": "DynamicRadioList", + "SecurityClassification": "Public", + "Searchable": "N" } ] From 3f647ece6215d510498732124fc0861cbd72ad02 Mon Sep 17 00:00:00 2001 From: JamiS Date: Fri, 21 Jun 2024 13:47:03 +0100 Subject: [PATCH 08/77] CIV-14128:Added midEvent for new Claim Consent page --- ...onCaseField-SettleDiscontinue-nonprod.json | 26 ++++++++++ .../UserEvents-SettleDiscontinue-nonprod.json | 2 +- ...ntinueClaim-SettleDiscontinue-nonprod.json | 51 ++++++++++++++++++- .../CaseField-SettleDiscontinue-nonprod.json | 18 ++++++- 4 files changed, 93 insertions(+), 4 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4cfa281a0e..95c1fa1eb4 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -91,5 +91,31 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "claimantsConsentToDiscontinuance", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "selectedClaimantForDiscontinuance", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index ec0d79baaa..3b9326bc68 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -40,7 +40,7 @@ "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", "SecurityClassification": "Public", - "ShowSummary": "N", + "ShowSummary": "Y", "ShowEventNotes": "N", "EndButtonLabel": "Discontinue claim", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index a9f0b3c8e8..0f1b7a06d0 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -2,14 +2,61 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "claimantWhoIsDiscontinuing", + "CaseFieldID": "partiesNames", "PageID": "MultipleClaimant", "PageLabel": "Who is discontinuing?", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "addApplicant2", + "PageID": "MultipleClaimant", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 2, + "DisplayContext": "READONLY", + "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantWhoIsDiscontinuing", + "PageID": "MultipleClaimant", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, + "PageShowCondition": "addApplicant2 = \"Yes\"", + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/showClaimantConsent" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "selectedClaimantForDiscontinuance", + "PageID": "claimantConsent", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 1, + "PageShowCondition": "addApplicant2 = \"Yes\" AND selectedClaimantForDiscontinuance != \"Both\"", + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"" + + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantsConsentToDiscontinuance", + "PageID": "claimantConsent", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", - "RetriesTimeoutURLMidEvent": 0 + "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index bf7b733e1c..85716fcc64 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -56,5 +56,21 @@ "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "claimantsConsentToDiscontinuance", + "Label": "Do all claimants consent to the discontinuance?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "selectedClaimantForDiscontinuance", + "Label": " ", + "FieldType": "Text", + "SecurityClassification": "Public", + "Searchable": "N" } - ] +] From 1ff0df1626093b3e7b9571fa782f04f9e53ea848 Mon Sep 17 00:00:00 2001 From: JamiS Date: Fri, 21 Jun 2024 15:58:56 +0100 Subject: [PATCH 09/77] CIV-14128:Added page title for Claimant Consent screen --- ...tionCaseField-SettleDiscontinue-nonprod.json | 15 +++++++++++++++ ...continueClaim-SettleDiscontinue-nonprod.json | 17 ++++++++++++++--- .../CaseField-SettleDiscontinue-nonprod.json | 10 +++++++++- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 95c1fa1eb4..3c2556e359 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -27,6 +27,21 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "partiesNames1", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "markPaidForAllClaimants", diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 0f1b7a06d0..95b62f9c8d 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -38,15 +38,26 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "selectedClaimantForDiscontinuance", + "CaseFieldID": "partiesNames1", "PageID": "claimantConsent", + "PageLabel": "Do all claimants consent?", "PageDisplayOrder": 2, "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "selectedClaimantForDiscontinuance", + "PageID": "claimantConsent", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 2, "PageShowCondition": "addApplicant2 = \"Yes\" AND selectedClaimantForDiscontinuance != \"Both\"", "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N", "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"" - }, { "CaseTypeID": "CIVIL", @@ -54,7 +65,7 @@ "CaseFieldID": "claimantsConsentToDiscontinuance", "PageID": "claimantConsent", "PageDisplayOrder": 2, - "PageFieldDisplayOrder": 2, + "PageFieldDisplayOrder": 3, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 85716fcc64..ff1ba05cb8 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -10,7 +10,15 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNames", - "Label": "**${caseNameHmctsInternal}**

", + "Label": "**${caseNameHmctsInternal}**", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "partiesNames1", + "Label": "**${caseNameHmctsInternal}**", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" From 7d9ba540861c54e237b9d87779f9e8961d21e6ce Mon Sep 17 00:00:00 2001 From: JamiS Date: Fri, 21 Jun 2024 16:02:01 +0100 Subject: [PATCH 10/77] CIV-14128:Removed the file as its not needed --- ...eld-DiscontinueClaim-SettleDiscontinue-nonprod.json | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json diff --git a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json deleted file mode 100644 index e9f297d7f7..0000000000 --- a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL", - "ID": "markDiscontinueForAllClaimants", - "Label": "Do all claimants consent to the discontinuance?", - "FieldType": "YesOrNo", - "SecurityClassification": "Public", - "Searchable": "N" - } -] From 8dc4854b77fb7b05d088e7f1118e40ea4c73c1a2 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:40:18 +0100 Subject: [PATCH 11/77] CIV-14145 CCD changes for add the court permission view --- ...onCaseField-SettleDiscontinue-nonprod.json | 39 ++++++++++++++++++ .../UserEvents-SettleDiscontinue-nonprod.json | 1 + ...ntinueClaim-SettleDiscontinue-nonprod.json | 41 +++++++++++++++++++ ...ntinueClaim-SettleDiscontinue-nonprod.json | 8 ++++ .../CaseField-SettleDiscontinue-nonprod.json | 27 ++++++++++++ ...nfirmCourtPermission-DiscontinueClaim.json | 8 ++++ 6 files changed, 124 insertions(+) create mode 100644 ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4cfa281a0e..2c30563eec 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -91,5 +91,44 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "courtPermissionNeeded", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID":"CIVIL", + "CaseFieldID":"courtPermissionNeededText", + "AccessControl":[ + { + "UserRoles":[ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD":"CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "courtPermissionNeededCheckBox", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index a9954caa66..03eda321e7 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -43,6 +43,7 @@ "ShowSummary": "N", "ShowEventNotes": "N", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", "RetriesTimeoutAboutToStartEvent": 0 } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index a9f0b3c8e8..a82c1d242a 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -11,5 +11,46 @@ "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", "RetriesTimeoutURLMidEvent": 0 + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "courtPermissionNeeded", + "PageID": "CourtPermission", + "PageLabel": "Permission from the court", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y", + "RetriesTimeoutURLMidEvent": 0 + }, + { + "CaseTypeID":"CIVIL", + "CaseEventID":"DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID":"courtPermissionNeededText", + "PageID":"CourtPermission", + "PageLabel":"Permissionfromthecourt", + "PageDisplayOrder":2, + "PageFieldDisplayOrder":2, + "PageColumnNumber":1, + "DisplayContext":"READONLY", + "ShowSummaryChangeOption":"N", + "RetriesTimeoutURLMidEvent":0, + "FieldShowCondition":"courtPermissionNeeded=\"No\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "courtPermissionNeededCheckBox", + "PageID": "CourtPermission", + "PageLabel": "Permission from the court", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, + "DisplayContext": "OPTIONAL", + "ShowSummaryChangeOption": "N", + "RetriesTimeoutURLMidEvent": 0, + "FieldShowCondition": "courtPermissionNeeded=\"No\"" } ] diff --git a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json index e9f297d7f7..fe1dbe0b95 100644 --- a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -6,5 +6,13 @@ "FieldType": "YesOrNo", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "markCourtPermissionNeeded", + "Label": "Is the court's permission needed to discontinue?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index bf7b733e1c..ad8c1eb786 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -56,5 +56,32 @@ "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "courtPermissionNeeded", + "Label": "Is the court's permission needed to discontinue?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID":"CIVIL", + "ID":"courtPermissionNeededText", + "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the discontinuance", + "FieldType":"Label", + "SecurityClassification":"Public", + "Searchable":"N", + "FieldShowCondition":"courtPermissionNeeded=\"No\"" + }, + { + "CaseTypeID": "CIVIL", + "ID": "courtPermissionNeededCheckBox", + "FieldType": "MultiSelectList", + "FieldTypeParameter": "ConfirmCourtPermissionNotNeeded", + "Label": " ", + "SecurityClassification": "Public", + "Searchable": "N", + "FieldShowCondition": "courtPermissionNeeded = \"No\"" } ] diff --git a/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json b/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json new file mode 100644 index 0000000000..e3272dc7de --- /dev/null +++ b/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json @@ -0,0 +1,8 @@ +[ + { + "ID": "ConfirmCourtPermissionNotNeeded", + "ListElementCode": "ConsentAgreementCheckBox", + "ListElement": "I confirm these conditions have been met", + "DisplayOrder": 1 + } +] From 0fc722a2a27168466b6b1f79f64cc335c02a89ba Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:39:28 +0100 Subject: [PATCH 12/77] CIV-14145 CCD changes for add the court permission view --- .../AuthorisationCaseField-SettleDiscontinue-nonprod.json | 2 +- .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 2 +- .../CaseField/CaseField-SettleDiscontinue-nonprod.json | 2 +- .../FixedLists/ConfirmCourtPermission-DiscontinueClaim.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 2c30563eec..4a6b4a0712 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -120,7 +120,7 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "courtPermissionNeededCheckBox", + "CaseFieldID": "courtPermissionNeededChecked", "AccessControl": [ { "UserRoles": [ diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index a82c1d242a..7b2b9a28ca 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -42,7 +42,7 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "courtPermissionNeededCheckBox", + "CaseFieldID": "courtPermissionNeededChecked", "PageID": "CourtPermission", "PageLabel": "Permission from the court", "PageDisplayOrder": 2, diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index ad8c1eb786..2ca1107b38 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -76,7 +76,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "courtPermissionNeededCheckBox", + "ID": "courtPermissionNeededChecked", "FieldType": "MultiSelectList", "FieldTypeParameter": "ConfirmCourtPermissionNotNeeded", "Label": " ", diff --git a/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json b/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json index e3272dc7de..7694f04b18 100644 --- a/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json +++ b/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json @@ -1,7 +1,7 @@ [ { - "ID": "ConfirmCourtPermissionNotNeeded", - "ListElementCode": "ConsentAgreementCheckBox", + "ID": "CourtPermissionNeededChecked", + "ListElementCode": "CourtPermissionNeededChecked", "ListElement": "I confirm these conditions have been met", "DisplayOrder": 1 } From 9f57caa45cb95f97046d780ac6dbcf4cda808e28 Mon Sep 17 00:00:00 2001 From: JamiS Date: Mon, 24 Jun 2024 17:38:04 +0100 Subject: [PATCH 13/77] CIV-14128: Added API test for Discontinue Claim --- e2e/api/steps_LRspec.js | 28 +++++++++++++++++++ .../events/discontinueClaim2v1Spec.js | 24 ++++++++++++++++ .../api_tests/lrspec/api_2v1_spec_test.js | 8 +++++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 e2e/fixtures/events/discontinueClaim2v1Spec.js diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 201c0718fd..8ecd27b521 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -36,6 +36,7 @@ const mediationUnsuccessful = require('../fixtures/events/cui/unsuccessfulMediat const evidenceUploadApplicant = require('../fixtures/events/evidenceUploadApplicant'); const evidenceUploadRespondent = require('../fixtures/events/evidenceUploadRespondent'); const settleClaim1v1Spec = require('../fixtures/events/settleClaim1v1Spec'); +const discontinueClaim2v1Spec = require('../fixtures/events/discontinueClaim2v1Spec'); const {cloneDeep} = require('lodash'); const {adjustCaseSubmittedDateForMinti, getMintiTrackByClaimAmount, assertTrackAfterClaimCreation} = require('../helpers/mintiHelper'); @@ -83,6 +84,7 @@ const data = { REFER_JUDGE_DEFENCE_RECEIVED: () => judgmentOnline1v1Spec.referJudgeDefenceReceived(), SETTLE_CLAIM_MARK_PAID_FULL: (addApplicant2) => settleClaim1v1Spec.settleClaim(addApplicant2), SETTLE_CLAIM_MARK_PAID_FULL_SELECT_CLAIMANT: (addApplicant2) => settleClaim1v1Spec.claimantDetails(addApplicant2), + DISCONTINUE_CLAIM: () => discontinueClaim2v1Spec.discontinueClaim(), }; const eventData = { @@ -1654,6 +1656,30 @@ module.exports = { await waitForFinishedBusinessProcess(caseId); }, + + discontinueClaim: async (user, addApplicant2) => { + console.log('discontinueClaim for case id ' + caseId); + await apiRequest.setupTokens(user); + eventName = 'DISCONTINUE_CLAIM_CLAIMANT'; + + let returnedCaseData = await apiRequest.startEvent(eventName, caseId); + delete returnedCaseData['SearchCriteria']; + caseData = returnedCaseData; + + assertContainsPopulatedFields(returnedCaseData); + + let disposalData = data.DISCONTINUE_CLAIM(); + for (let pageId of Object.keys(disposalData.userInput)) { + await assertValidData(disposalData, pageId); + } + + /*await assertSubmittedEvent('PROCEEDS_IN_HERITAGE_SYSTEM', { + header: '### Request is being reviewed', + body: '' + }, true);*/ + + await waitForFinishedBusinessProcess(caseId); + } }; // Functions @@ -1952,6 +1978,8 @@ const validateEventPages = async (data, solicitor) => { } if (pageId === 'OptionsForSettlement' || pageId === 'ClaimantDetails'){ await assertValidDataSettleClaim(data, pageId); + } if (pageId === 'MultipleClaimant' || pageId === 'claimantConsent'){ + await assertValidDataSettleClaim(data, pageId); } else { // data = await updateCaseDataWithPlaceholders(data); await assertValidData(data, pageId, solicitor); diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js new file mode 100644 index 0000000000..a33056d964 --- /dev/null +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -0,0 +1,24 @@ +const {date, element} = require("../../api/dataHelper"); +module.exports = { + discontinueClaim: () => { + const data = { + userInput: { + MultipleClaimant:{ + addApplicant2 : 'Yes', + claimantWhoIsDiscontinuing : { + value: { + code: 'bfcf6412-1b23-45c6-b451-224ab5ec1703', + label: 'Test Inc' + } + } + }, + claimantConsent:{ + selectedClaimantForDiscontinuance : 'Test Inc', + claimantsConsentToDiscontinuance : 'Yes' + } + } + }; + + return data; + } +}; diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js index d897feb903..0012783d49 100644 --- a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js +++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js @@ -70,6 +70,12 @@ Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.settleClaimSelectClaimant(config.applicantSolicitorUser, 'YES'); }); +Scenario.only('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); + await api_spec.discontinueClaim(config.applicantSolicitorUser, 'YES'); + +}); + AfterSuite(async ({api_spec}) => { - await api_spec.cleanUp(); + //await api_spec.cleanUp(); }); From 30bf82304cf76621802200f5843cfcafe3c6d420 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Tue, 25 Jun 2024 08:26:31 +0100 Subject: [PATCH 14/77] CIV-14145 CCD changes for add the court permission view --- ...onCaseField-SettleDiscontinue-nonprod.json | 41 +++++++++++ .../UserEvents-SettleDiscontinue-nonprod.json | 7 +- ...ntinueClaim-SettleDiscontinue-nonprod.json | 68 +++++++++++++++++-- .../CaseField-SettleDiscontinue-nonprod.json | 28 +++++++- ...nfirmCourtPermission-DiscontinueClaim.json | 2 +- 5 files changed, 134 insertions(+), 12 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4a6b4a0712..8b0bd389ca 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -27,6 +27,21 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "partiesNames1", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "markPaidForAllClaimants", @@ -92,6 +107,32 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "claimantsConsentToDiscontinuance", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "selectedClaimantForDiscontinuance", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "courtPermissionNeeded", diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index 03eda321e7..18e7b459ad 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -5,7 +5,7 @@ "Name": "Settle this claim", "Description": "Settle this claim", "DisplayOrder": 12, - "PreConditionState(s)": "*", + "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", "SecurityClassification": "Public", "ShowSummary": "N", @@ -21,7 +21,7 @@ "Name": "Settle this claim", "Description": "Settle this claim", "DisplayOrder": 13, - "PreConditionState(s)": "*", + "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", "SecurityClassification": "Public", "ShowSummary": "Y", @@ -40,10 +40,9 @@ "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", "SecurityClassification": "Public", - "ShowSummary": "N", + "ShowSummary": "Y", "ShowEventNotes": "N", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", - "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", "RetriesTimeoutAboutToStartEvent": 0 } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 7b2b9a28ca..de8fbb8d78 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -2,15 +2,73 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "claimantWhoIsDiscontinuing", + "CaseFieldID": "partiesNames", "PageID": "MultipleClaimant", "PageLabel": "Who is discontinuing?", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "addApplicant2", + "PageID": "MultipleClaimant", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 2, + "DisplayContext": "READONLY", + "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantWhoIsDiscontinuing", + "PageID": "MultipleClaimant", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, + "PageShowCondition": "addApplicant2 = \"Yes\"", "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", - "RetriesTimeoutURLMidEvent": 0 + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/showClaimantConsent" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "partiesNames1", + "PageID": "claimantConsent", + "PageLabel": "Do all claimants consent?", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "selectedClaimantForDiscontinuance", + "PageID": "claimantConsent", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 2, + "PageShowCondition": "addApplicant2 = \"Yes\" AND selectedClaimantForDiscontinuance != \"Both\"", + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantsConsentToDiscontinuance", + "PageID": "claimantConsent", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 3, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" }, { "CaseTypeID": "CIVIL", @@ -18,7 +76,7 @@ "CaseFieldID": "courtPermissionNeeded", "PageID": "CourtPermission", "PageLabel": "Permission from the court", - "PageDisplayOrder": 2, + "PageDisplayOrder": 3, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", @@ -31,7 +89,7 @@ "CaseFieldID":"courtPermissionNeededText", "PageID":"CourtPermission", "PageLabel":"Permissionfromthecourt", - "PageDisplayOrder":2, + "PageDisplayOrder":3, "PageFieldDisplayOrder":2, "PageColumnNumber":1, "DisplayContext":"READONLY", @@ -45,7 +103,7 @@ "CaseFieldID": "courtPermissionNeededChecked", "PageID": "CourtPermission", "PageLabel": "Permission from the court", - "PageDisplayOrder": 2, + "PageDisplayOrder": 3, "PageFieldDisplayOrder": 3, "PageColumnNumber": 1, "DisplayContext": "OPTIONAL", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 2ca1107b38..7ef172e91c 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -10,7 +10,15 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNames", - "Label": "**${caseNameHmctsInternal}**

", + "Label": "**${caseNameHmctsInternal}**", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "partiesNames1", + "Label": "**${caseNameHmctsInternal}**", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -57,6 +65,22 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "claimantsConsentToDiscontinuance", + "Label": "Do all claimants consent to the discontinuance?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "selectedClaimantForDiscontinuance", + "Label": " ", + "FieldType": "Text", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", @@ -68,7 +92,7 @@ { "CaseTypeID":"CIVIL", "ID":"courtPermissionNeededText", - "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the discontinuance", + "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the discontinuance", "FieldType":"Label", "SecurityClassification":"Public", "Searchable":"N", diff --git a/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json b/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json index 7694f04b18..89a81ab48a 100644 --- a/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json +++ b/ccd-definition/FixedLists/ConfirmCourtPermission-DiscontinueClaim.json @@ -1,6 +1,6 @@ [ { - "ID": "CourtPermissionNeededChecked", + "ID": "ConfirmCourtPermissionNotNeeded", "ListElementCode": "CourtPermissionNeededChecked", "ListElement": "I confirm these conditions have been met", "DisplayOrder": 1 From 56c68b1a52657d573e0eecdecfc5a8082e612833 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:07:52 +0100 Subject: [PATCH 15/77] CIV-14145 CCD changes for add the court permission view --- ...ontinueClaim-SettleDiscontinue-nonprod.json | 8 ++++---- ...ontinueClaim-SettleDiscontinue-nonprod.json | 18 ------------------ .../CaseField-SettleDiscontinue-nonprod.json | 9 +++++---- ...ermissionIsNeededList-DiscontinueClaim.json | 14 ++++++++++++++ 4 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json create mode 100644 ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index de8fbb8d78..2c7431cd9d 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -88,14 +88,14 @@ "CaseEventID":"DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID":"courtPermissionNeededText", "PageID":"CourtPermission", - "PageLabel":"Permissionfromthecourt", + "PageLabel":"Permission from the court", "PageDisplayOrder":3, "PageFieldDisplayOrder":2, "PageColumnNumber":1, "DisplayContext":"READONLY", "ShowSummaryChangeOption":"N", "RetriesTimeoutURLMidEvent":0, - "FieldShowCondition":"courtPermissionNeeded=\"No\"" + "FieldShowCondition":"courtPermissionNeeded=\"NO\"" }, { "CaseTypeID": "CIVIL", @@ -106,9 +106,9 @@ "PageDisplayOrder": 3, "PageFieldDisplayOrder": 3, "PageColumnNumber": 1, - "DisplayContext": "OPTIONAL", + "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", "RetriesTimeoutURLMidEvent": 0, - "FieldShowCondition": "courtPermissionNeeded=\"No\"" + "FieldShowCondition": "courtPermissionNeeded=\"NO\"" } ] diff --git a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json deleted file mode 100644 index fe1dbe0b95..0000000000 --- a/ccd-definition/CaseField/CaseField-DiscontinueClaim-SettleDiscontinue-nonprod.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL", - "ID": "markDiscontinueForAllClaimants", - "Label": "Do all claimants consent to the discontinuance?", - "FieldType": "YesOrNo", - "SecurityClassification": "Public", - "Searchable": "N" - }, - { - "CaseTypeID": "CIVIL", - "ID": "markCourtPermissionNeeded", - "Label": "Is the court's permission needed to discontinue?", - "FieldType": "YesOrNo", - "SecurityClassification": "Public", - "Searchable": "N" - } -] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 7ef172e91c..92cceab2cf 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -85,18 +85,19 @@ "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", "Label": "Is the court's permission needed to discontinue?", - "FieldType": "YesOrNo", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "CourtPermissionIsNeededList", "SecurityClassification": "Public", "Searchable": "N" }, { "CaseTypeID":"CIVIL", "ID":"courtPermissionNeededText", - "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the discontinuance", + "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the
  discontinuance", "FieldType":"Label", "SecurityClassification":"Public", "Searchable":"N", - "FieldShowCondition":"courtPermissionNeeded=\"No\"" + "FieldShowCondition":"courtPermissionNeeded=\"NO\"" }, { "CaseTypeID": "CIVIL", @@ -106,6 +107,6 @@ "Label": " ", "SecurityClassification": "Public", "Searchable": "N", - "FieldShowCondition": "courtPermissionNeeded = \"No\"" + "FieldShowCondition": "courtPermissionNeeded = \"NO\"" } ] diff --git a/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json b/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json new file mode 100644 index 0000000000..855dc7d0f1 --- /dev/null +++ b/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json @@ -0,0 +1,14 @@ +[ + { + "ID": "CourtPermissionIsNeededList", + "ListElementCode": "YES", + "ListElement": "Yes", + "DisplayOrder": 1 + }, + { + "ID": "CourtPermissionIsNeededList", + "ListElementCode": "NO", + "ListElement": "No", + "DisplayOrder": 2 + } +] From 5afc755ca1e1f462c0341cd12568bc55094e813c Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 25 Jun 2024 09:30:51 +0100 Subject: [PATCH 16/77] CIV-14128: Uncommented the lines that are mistakenly committed --- e2e/tests/api_tests/lrspec/api_2v1_spec_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js index 0012783d49..8a79c87a1a 100644 --- a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js +++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js @@ -70,12 +70,12 @@ Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.settleClaimSelectClaimant(config.applicantSolicitorUser, 'YES'); }); -Scenario.only('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { +Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); await api_spec.discontinueClaim(config.applicantSolicitorUser, 'YES'); }); AfterSuite(async ({api_spec}) => { - //await api_spec.cleanUp(); + await api_spec.cleanUp(); }); From 9ffd48026effe76bf3997680d099f32cc5b81e47 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 25 Jun 2024 09:49:41 +0100 Subject: [PATCH 17/77] CIV-14128: Fixed build errors --- e2e/api/steps_LRspec.js | 2 +- e2e/fixtures/events/discontinueClaim2v1Spec.js | 1 - e2e/tests/api_tests/lrspec/api_2v1_spec_test.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 6cd8e71263..292ab75de9 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1653,7 +1653,7 @@ module.exports = { await waitForFinishedBusinessProcess(caseId); }, - discontinueClaim: async (user, addApplicant2) => { + discontinueClaim: async (user) => { console.log('discontinueClaim for case id ' + caseId); await apiRequest.setupTokens(user); eventName = 'DISCONTINUE_CLAIM_CLAIMANT'; diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index a33056d964..dfc9d0544e 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -1,4 +1,3 @@ -const {date, element} = require("../../api/dataHelper"); module.exports = { discontinueClaim: () => { const data = { diff --git a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js index 8a79c87a1a..971f2fae81 100644 --- a/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js +++ b/e2e/tests/api_tests/lrspec/api_2v1_spec_test.js @@ -72,7 +72,7 @@ Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); - await api_spec.discontinueClaim(config.applicantSolicitorUser, 'YES'); + await api_spec.discontinueClaim(config.applicantSolicitorUser); }); From 3c4240b1eddfed84c877c3f467ffe4f393d23f08 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:32:17 +0100 Subject: [PATCH 18/77] CIV-14145 CCD changes for add the court permission view --- ...onCaseField-SettleDiscontinue-nonprod.json | 65 ------------------- ...ntinueClaim-SettleDiscontinue-nonprod.json | 37 ----------- .../CaseField-SettleDiscontinue-nonprod.json | 16 ----- 3 files changed, 118 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index c46f625242..8b0bd389ca 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -133,32 +133,6 @@ } ] }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "claimantsConsentToDiscontinuance", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - } - ] - }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "selectedClaimantForDiscontinuance", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - } - ] - }, { "CaseTypeID": "CIVIL", "CaseFieldID": "courtPermissionNeeded", @@ -172,45 +146,6 @@ } ] }, - { - "CaseTypeID":"CIVIL", - "CaseFieldID":"courtPermissionNeededText", - "AccessControl":[ - { - "UserRoles":[ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD":"CRU" - } - ] - }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "courtPermissionNeededChecked", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - } - ] - }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "courtPermissionNeeded", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - } - ] -}, { "CaseTypeID":"CIVIL", "CaseFieldID":"courtPermissionNeededText", diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 4352bc8fb6..c86c2e7c7b 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -35,20 +35,6 @@ "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/showClaimantConsent" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "partiesNames1", - "PageID": "claimantConsent", - "PageLabel": "Do all claimants consent?", - "PageDisplayOrder": 2, - "PageFieldDisplayOrder": 3, - "PageColumnNumber": 1, - "PageShowCondition": "addApplicant2 = \"Yes\"", - "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "Y", - "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/showClaimantConsent" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -96,29 +82,6 @@ "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "selectedClaimantForDiscontinuance", - "PageID": "claimantConsent", - "PageDisplayOrder": 2, - "PageFieldDisplayOrder": 2, - "PageShowCondition": "addApplicant2 = \"Yes\" AND selectedClaimantForDiscontinuance != \"Both\"", - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N", - "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"" - }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "claimantsConsentToDiscontinuance", - "PageID": "claimantConsent", - "PageDisplayOrder": 2, - "PageFieldDisplayOrder": 3, - "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "Y", - "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" - }, { "CaseTypeID":"CIVIL", "CaseEventID":"DISCONTINUE_CLAIM_CLAIMANT", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index b8d9014c21..e09540b13d 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -81,22 +81,6 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "claimantsConsentToDiscontinuance", - "Label": "Do all claimants consent to the discontinuance?", - "FieldType": "YesOrNo", - "SecurityClassification": "Public", - "Searchable": "N" - }, - { - "CaseTypeID": "CIVIL", - "ID": "selectedClaimantForDiscontinuance", - "Label": " ", - "FieldType": "Text", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", From 8b5bc4eef4fbce8f3b4d993a6e2aac58b479ed92 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 25 Jun 2024 11:16:55 +0100 Subject: [PATCH 19/77] CIV-14128: Removed the caseworker roles as per review comments --- .../AuthorisationCaseField-SettleDiscontinue-nonprod.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 3c2556e359..ca0183a75c 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -33,8 +33,6 @@ "AccessControl": [ { "UserRoles": [ - "caseworker-civil-admin", - "caseworker-civil-staff", "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], From 765d857d457c5aa61acc98a762485a2b77b60a02 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:38:47 +0100 Subject: [PATCH 20/77] CIV-14145 CCD merge error fixed --- .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index c86c2e7c7b..a0917814ab 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -79,7 +79,7 @@ "PageDisplayOrder": 3, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, - "DisplayContext": "READONLY", + "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" }, { From 3bb7d1af0a0f948ff969430a713ba8b464c38060 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:01:29 +0100 Subject: [PATCH 21/77] CIV-14145 Update current API test with new page data --- e2e/api/steps_LRspec.js | 1 + .../events/discontinueClaim2v1Spec.js | 6 ++++++ ..._settle_discontinue_claim_2v1_spec_test.js | 21 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 292ab75de9..e61f5bee91 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1669,6 +1669,7 @@ module.exports = { await assertValidData(disposalData, pageId); } + //TODO: Check the correct final submit state dor discontinue claim /*await assertSubmittedEvent('PROCEEDS_IN_HERITAGE_SYSTEM', { header: '### Request is being reviewed', body: '' diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index dfc9d0544e..f0adec76e4 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -14,6 +14,12 @@ module.exports = { claimantConsent:{ selectedClaimantForDiscontinuance : 'Test Inc', claimantsConsentToDiscontinuance : 'Yes' + }, + courtPermission:{ + courtPermissionNeeded: 'NO', + courtPermissionNeededChecked: [ + 'CourtPermissionNeededChecked' + ] } } }; diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js new file mode 100644 index 0000000000..7dc848c152 --- /dev/null +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -0,0 +1,21 @@ +/* eslint-disable no-unused-vars */ + +const config = require('../../../config.js'); + +Feature('CCD Settle and discontinue claim 2v1 API test @api-spec'); +Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); + await api_spec.createCaseFlags(config.hearingCenterAdminWithRegionId2); + await api_spec.manageCaseFlags(config.hearingCenterAdminWithRegionId2); + await api_spec.settleClaimSelectClaimant(config.applicantSolicitorUser, 'YES'); +}); + +Scenario.only('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); + await api_spec.discontinueClaim(config.applicantSolicitorUser); + +}); + +AfterSuite(async ({api_spec}) => { + //await api_spec.cleanUp(); +}); From facd53dd393ee18e151dc58e142dbf02fd8c8d29 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:05:09 +0100 Subject: [PATCH 22/77] CIV-14145 Update current API test with new page data --- .../api_settle_discontinue_claim_2v1_spec_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index 7dc848c152..bdf185e3cd 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -17,5 +17,5 @@ Scenario.only('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { }); AfterSuite(async ({api_spec}) => { - //await api_spec.cleanUp(); + await api_spec.cleanUp(); }); From 6cd7d6fe1b832e4a2903af54346c596564de0311 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 25 Jun 2024 12:05:10 +0100 Subject: [PATCH 23/77] CIV-14128: Removed the caseworker roles as per review comments --- .../AuthorisationCaseField-SettleDiscontinue-nonprod.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index ca0183a75c..0333330b17 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -18,8 +18,6 @@ "AccessControl": [ { "UserRoles": [ - "caseworker-civil-admin", - "caseworker-civil-staff", "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], From a3860dc9a307ffad620eef6aa1d46f9ab3228534 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 25 Jun 2024 15:38:04 +0100 Subject: [PATCH 24/77] CIV-14128: Reverted the change as partiesName is already used in Settle Claim --- .../AuthorisationCaseField-SettleDiscontinue-nonprod.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 0333330b17..ca0183a75c 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -18,6 +18,8 @@ "AccessControl": [ { "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], From 82503dec0c37ce737f94587b4d599cfa08f01af1 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 25 Jun 2024 16:04:52 +0100 Subject: [PATCH 25/77] CIV-14128: Updated the ClaimantConsent pageId to be consistent with other page ids --- .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 6 +++--- e2e/api/steps_LRspec.js | 2 +- e2e/fixtures/events/discontinueClaim2v1Spec.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 95b62f9c8d..3769aa5741 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -39,7 +39,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "partiesNames1", - "PageID": "claimantConsent", + "PageID": "ClaimantConsent", "PageLabel": "Do all claimants consent?", "PageDisplayOrder": 2, "PageFieldDisplayOrder": 1, @@ -51,7 +51,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "selectedClaimantForDiscontinuance", - "PageID": "claimantConsent", + "PageID": "ClaimantConsent", "PageDisplayOrder": 2, "PageFieldDisplayOrder": 2, "PageShowCondition": "addApplicant2 = \"Yes\" AND selectedClaimantForDiscontinuance != \"Both\"", @@ -63,7 +63,7 @@ "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "claimantsConsentToDiscontinuance", - "PageID": "claimantConsent", + "PageID": "ClaimantConsent", "PageDisplayOrder": 2, "PageFieldDisplayOrder": 3, "DisplayContext": "MANDATORY", diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 292ab75de9..9c2220ed68 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1974,7 +1974,7 @@ const validateEventPages = async (data, solicitor) => { } if (pageId === 'OptionsForSettlement' || pageId === 'ClaimantDetails'){ await assertValidDataSettleClaim(data, pageId); - } if (pageId === 'MultipleClaimant' || pageId === 'claimantConsent'){ + } if (pageId === 'MultipleClaimant' || pageId === 'ClaimantConsent'){ await assertValidDataSettleClaim(data, pageId); } else { // data = await updateCaseDataWithPlaceholders(data); diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index dfc9d0544e..30f3f3d90a 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -11,7 +11,7 @@ module.exports = { } } }, - claimantConsent:{ + ClaimantConsent:{ selectedClaimantForDiscontinuance : 'Test Inc', claimantsConsentToDiscontinuance : 'Yes' } From ea5d0c2b5d47b02dd9887b762a3ad853c5914c83 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 25 Jun 2024 17:57:23 +0100 Subject: [PATCH 26/77] CIV-14148 Add new screen --- ...onCaseField-SettleDiscontinue-nonprod.json | 13 ++++++++++ ...ntinueClaim-SettleDiscontinue-nonprod.json | 25 +++++++++++++++++++ .../CaseField-SettleDiscontinue-nonprod.json | 17 +++++++++++++ ...rmissionIsNeededList-DiscontinueClaim.json | 0 .../IsDiscontAgainstAllDefList.json | 14 +++++++++++ 5 files changed, 69 insertions(+) rename ccd-definition/FixedLists/{ => SettleDiscontinue}/CourtPermissionIsNeededList-DiscontinueClaim.json (100%) create mode 100644 ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 8b0bd389ca..18418e0e25 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -171,5 +171,18 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "discontinuingAgainstDefendants", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index a0917814ab..368c25358e 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -109,5 +109,30 @@ "ShowSummaryChangeOption": "N", "RetriesTimeoutURLMidEvent": 0, "FieldShowCondition": "courtPermissionNeeded=\"NO\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "discontinuingAgainstDefendantsLbl", + "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "PageShowCondition": "courtPermissionNeeded=\"YES\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "discontinuingAgainstDefendants", + "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 2, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "N" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index e09540b13d..5951a610d3 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -108,5 +108,22 @@ "SecurityClassification": "Public", "Searchable": "N", "FieldShowCondition": "courtPermissionNeeded = \"NO\"" + }, + { + "CaseTypeID": "CIVIL", + "ID": "discontinuingAgainstDefendantsLbl", + "Label": "### Is the discontinuance against all defendants?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "discontinuingAgainstDefendants", + "Label": " ", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "IsDiscontAgainstAllDefList", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json b/ccd-definition/FixedLists/SettleDiscontinue/CourtPermissionIsNeededList-DiscontinueClaim.json similarity index 100% rename from ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json rename to ccd-definition/FixedLists/SettleDiscontinue/CourtPermissionIsNeededList-DiscontinueClaim.json diff --git a/ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json b/ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json new file mode 100644 index 0000000000..7acb627dc3 --- /dev/null +++ b/ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json @@ -0,0 +1,14 @@ +[ + { + "ID": "IsDiscontAgainstAllDefList", + "ListElementCode": "YES", + "ListElement": "Yes", + "DisplayOrder": 1 + }, + { + "ID": "IsDiscontAgainstAllDefList", + "ListElementCode": "NO", + "ListElement": "No", + "DisplayOrder": 2 + } +] From aaf9076c8de62134a94ccf002f909dc56eaa5707 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:06:19 +0100 Subject: [PATCH 27/77] CIV-14145 Fix tests tags --- .../api_settle_discontinue_claim_2v1_spec_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index bdf185e3cd..df3f3330e8 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -2,7 +2,7 @@ const config = require('../../../config.js'); -Feature('CCD Settle and discontinue claim 2v1 API test @api-spec'); +Feature('CCD Settle and discontinue claim 2v1 API test @api-spec @api-nonprod'); Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); await api_spec.createCaseFlags(config.hearingCenterAdminWithRegionId2); @@ -10,7 +10,7 @@ Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.settleClaimSelectClaimant(config.applicantSolicitorUser, 'YES'); }); -Scenario.only('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { +Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); await api_spec.discontinueClaim(config.applicantSolicitorUser); From 4ae61bc99e20cbcae7de90fb2fc8903e9206d2a8 Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 26 Jun 2024 12:03:32 +0100 Subject: [PATCH 28/77] CIV-14156: Type of Discontinuance page - Initial Commit --- ...onCaseField-SettleDiscontinue-nonprod.json | 39 +++++++++++++++++++ ...ntinueClaim-SettleDiscontinue-nonprod.json | 37 ++++++++++++++++++ .../CaseField-SettleDiscontinue-nonprod.json | 25 ++++++++++++ ...scontinuanceTypeList-DiscontinueClaim.json | 14 +++++++ 4 files changed, 115 insertions(+) create mode 100644 ccd-definition/FixedLists/DiscontinuanceTypeList-DiscontinueClaim.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4e48e6601b..f44335afad 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -40,6 +40,19 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "partiesNamesTD", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "markPaidForAllClaimants", @@ -169,5 +182,31 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID":"CIVIL", + "CaseFieldID":"typeOfDiscontinuance", + "AccessControl":[ + { + "UserRoles":[ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD":"CRU" + } + ] + }, + { + "CaseTypeID":"CIVIL", + "CaseFieldID":"partDiscontinuanceDetails", + "AccessControl":[ + { + "UserRoles":[ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD":"CRU" + } + ] } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index e003a3eb03..cbf4824705 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -109,5 +109,42 @@ "ShowSummaryChangeOption": "N", "RetriesTimeoutURLMidEvent": 0, "FieldShowCondition": "courtPermissionNeeded=\"NO\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "partiesNamesTD", + "PageID": "DiscontinuanceType", + "PageLabel": "Type of Discontinuance", + "PageDisplayOrder": 4, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "typeOfDiscontinuance", + "PageID": "DiscontinuanceType", + "PageLabel": "Type of Discontinuance", + "PageDisplayOrder": 4, + "PageFieldDisplayOrder": 2, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID":"CIVIL", + "CaseEventID":"DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID":"partDiscontinuanceDetails", + "PageID":"DiscontinuanceType", + "PageLabel":"Type of Discontinuance", + "PageDisplayOrder":4, + "PageFieldDisplayOrder":3, + "PageColumnNumber":1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption":"Y", + "FieldShowCondition":"typeOfDiscontinuance=\"PART_DISCONTINUANCE\"" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index e09540b13d..d6553c75b0 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -23,6 +23,14 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "partiesNamesTD", + "Label": "**${caseNameHmctsInternal}**", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "markPaidForAllClaimants", @@ -108,5 +116,22 @@ "SecurityClassification": "Public", "Searchable": "N", "FieldShowCondition": "courtPermissionNeeded = \"NO\"" + }, + { + "CaseTypeID": "CIVIL", + "ID": "typeOfDiscontinuance", + "Label": "Is this a full or part discontinuance?", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "DiscontinuanceTypeList", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID":"CIVIL", + "ID":"partDiscontinuanceDetails", + "Label": "Which part of the claim do you want to discontinue?", + "FieldType": "TextArea", + "SecurityClassification":"Public", + "Searchable":"N" } ] diff --git a/ccd-definition/FixedLists/DiscontinuanceTypeList-DiscontinueClaim.json b/ccd-definition/FixedLists/DiscontinuanceTypeList-DiscontinueClaim.json new file mode 100644 index 0000000000..5b2db14f41 --- /dev/null +++ b/ccd-definition/FixedLists/DiscontinuanceTypeList-DiscontinueClaim.json @@ -0,0 +1,14 @@ +[ + { + "ID": "DiscontinuanceTypeList", + "ListElementCode": "FULL_DISCONTINUANCE", + "ListElement": "Full discontinuance", + "DisplayOrder": 1 + }, + { + "ID": "DiscontinuanceTypeList", + "ListElementCode": "PART_DISCONTINUANCE", + "ListElement": "Part discontinuance", + "DisplayOrder": 2 + } +] From caf426306ec0a5d7af373468b39f561f4fea90c5 Mon Sep 17 00:00:00 2001 From: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:01:38 +0100 Subject: [PATCH 29/77] CIV-14145 Fix cosmetic change for parties name --- ...ionCaseField-SettleDiscontinue-nonprod.json | 13 +++++++++++++ ...ontinueClaim-SettleDiscontinue-nonprod.json | 18 +++++++++++++++--- .../CaseField-SettleDiscontinue-nonprod.json | 10 +++++++++- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4e48e6601b..079e605f82 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -131,6 +131,19 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "partiesNames3", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "courtPermissionNeeded", diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index e003a3eb03..71df702c29 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -70,6 +70,18 @@ "ShowSummaryChangeOption": "Y", "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "partiesNames3", + "PageID": "CourtPermission", + "PageLabel": " ", + "PageDisplayOrder": 3, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -77,7 +89,7 @@ "PageID": "CourtPermission", "PageLabel": "Permission from the court", "PageDisplayOrder": 3, - "PageFieldDisplayOrder": 1, + "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" @@ -89,7 +101,7 @@ "PageID":"CourtPermission", "PageLabel":"Permission from the court", "PageDisplayOrder":3, - "PageFieldDisplayOrder":2, + "PageFieldDisplayOrder":3, "PageColumnNumber":1, "DisplayContext":"READONLY", "ShowSummaryChangeOption":"N", @@ -103,7 +115,7 @@ "PageID": "CourtPermission", "PageLabel": "Permission from the court", "PageDisplayOrder": 3, - "PageFieldDisplayOrder": 3, + "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index e09540b13d..4fdf15f30a 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -81,10 +81,18 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "partiesNames3", + "Label": "**${caseNameHmctsInternal}** \n****\n ### Is the court's permission needed to discontinue?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", - "Label": "Is the court's permission needed to discontinue?", + "Label": "For more information, refer to the Civil Procedure Rules 38.2.", "FieldType": "FixedRadioList", "FieldTypeParameter": "CourtPermissionIsNeededList", "SecurityClassification": "Public", From f036395992955f89e8f4d1a21bf12263e2f2ee71 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 26 Jun 2024 13:21:05 +0100 Subject: [PATCH 30/77] CIV-14148 Add new screen elements --- ...onCaseField-SettleDiscontinue-nonprod.json | 13 ++++++++++++ ...ntinueClaim-SettleDiscontinue-nonprod.json | 16 ++++++++++++-- .../CaseField-SettleDiscontinue-nonprod.json | 21 +++++++++++++------ 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index ef544477eb..97448e55b2 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -182,5 +182,18 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID":"CIVIL", + "CaseFieldID":"discontinuingAgainstOneDefendant", + "AccessControl":[ + { + "UserRoles":[ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD":"CRU" + } + ] } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 68357757e3..105c5980b0 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -120,8 +120,7 @@ "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N", - "PageShowCondition": "courtPermissionNeeded=\"YES\"" + "ShowSummaryChangeOption": "N" }, { "CaseTypeID": "CIVIL", @@ -134,5 +133,18 @@ "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "discontinuingAgainstOneDefendant", + "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "discontinuingAgainstDefendants=\"NO\"" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 5951a610d3..7142377505 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -91,13 +91,13 @@ "Searchable": "N" }, { - "CaseTypeID":"CIVIL", - "ID":"courtPermissionNeededText", + "CaseTypeID": "CIVIL", + "ID": "courtPermissionNeededText", "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the
  discontinuance", - "FieldType":"Label", + "FieldType": "Label", "SecurityClassification":"Public", - "Searchable":"N", - "FieldShowCondition":"courtPermissionNeeded=\"NO\"" + "Searchable": "N", + "FieldShowCondition": "courtPermissionNeeded=\"NO\"" }, { "CaseTypeID": "CIVIL", @@ -112,7 +112,7 @@ { "CaseTypeID": "CIVIL", "ID": "discontinuingAgainstDefendantsLbl", - "Label": "### Is the discontinuance against all defendants?", + "Label": "**${caseNameHmctsInternal}** \n****\n ### Is the discontinuance against all defendants?", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -125,5 +125,14 @@ "FieldTypeParameter": "IsDiscontAgainstAllDefList", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "discontinuingAgainstOneDefendant", + "Label": "Which defendant is the discontinuance against?", + "FieldType": "DynamicRadioList", + "SecurityClassification": "Public", + "Searchable": "N", + "FieldShowCondition": "discontinuingAgainstDefendants=\"NO\"" } ] From 93c456eaf6dd3d0a39e092e3e26ce67cab90de2f Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 26 Jun 2024 14:22:31 +0100 Subject: [PATCH 31/77] CIV-14148 Update new screen show condition --- ...ntinueClaim-SettleDiscontinue-nonprod.json | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index b61fbab795..a3d0771583 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -122,6 +122,28 @@ "RetriesTimeoutURLMidEvent": 0, "FieldShowCondition": "courtPermissionNeeded=\"NO\"" }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "applicant1Represented", + "PageID": "DiscontinuingAgainstDefendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "respondent2Represented", + "PageID": "DiscontinuingAgainstDefendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 2, + "DisplayContext": "READONLY", + "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", + "ShowSummaryChangeOption": "N" + }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -129,10 +151,11 @@ "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 1, + "PageFieldDisplayOrder": 3, "PageColumnNumber": 1, "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" + "ShowSummaryChangeOption": "N", + "PageShowCondition": "applicant1Represented != \"No\" AND respondent2Represented = \"Yes\"" }, { "CaseTypeID": "CIVIL", @@ -141,7 +164,7 @@ "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 2, + "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" @@ -153,7 +176,7 @@ "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 3, + "PageFieldDisplayOrder": 5, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", From 0a19210402b986b343ab8376257bfc6dbf3f3bea Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 26 Jun 2024 16:56:29 +0100 Subject: [PATCH 32/77] CIV-14148 Update fields --- ...sationCaseField-SettleDiscontinue-nonprod.json | 15 ++++++++++++++- ...iscontinueClaim-SettleDiscontinue-nonprod.json | 4 ++-- .../CaseField-SettleDiscontinue-nonprod.json | 5 ++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index b05272fd6e..1f11572aa1 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -185,7 +185,20 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "discontinuingAgainstDefendants", + "CaseFieldID": "discontinuingAgainstDefendantsLbl", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "isDiscontinuingAgainstBothDefendants", "AccessControl": [ { "UserRoles": [ diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index a3d0771583..df9f2b939e 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -160,7 +160,7 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "discontinuingAgainstDefendants", + "CaseFieldID": "isDiscontinuingAgainstBothDefendants", "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, @@ -180,6 +180,6 @@ "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", - "FieldShowCondition": "discontinuingAgainstDefendants=\"NO\"" + "FieldShowCondition": "isDiscontinuingAgainstBothDefendants=\"NO\"" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 0edf683737..e442a7defe 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -127,7 +127,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "discontinuingAgainstDefendants", + "ID": "isDiscontinuingAgainstBothDefendants", "Label": " ", "FieldType": "FixedRadioList", "FieldTypeParameter": "IsDiscontAgainstAllDefList", @@ -140,7 +140,6 @@ "Label": "Which defendant is the discontinuance against?", "FieldType": "DynamicRadioList", "SecurityClassification": "Public", - "Searchable": "N", - "FieldShowCondition": "discontinuingAgainstDefendants=\"NO\"" + "Searchable": "N" } ] From 19f357c9931865295f38f6b853c1f2d97e19cd18 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 26 Jun 2024 18:46:46 +0100 Subject: [PATCH 33/77] CIV-14148 delete repeated list --- ...urtPermissionIsNeededList-DiscontinueClaim.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json diff --git a/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json b/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json deleted file mode 100644 index 855dc7d0f1..0000000000 --- a/ccd-definition/FixedLists/CourtPermissionIsNeededList-DiscontinueClaim.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "ID": "CourtPermissionIsNeededList", - "ListElementCode": "YES", - "ListElement": "Yes", - "DisplayOrder": 1 - }, - { - "ID": "CourtPermissionIsNeededList", - "ListElementCode": "NO", - "ListElement": "No", - "DisplayOrder": 2 - } -] From 91147f3e5c79098b9f93d3384f828a7fda26846c Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 26 Jun 2024 22:59:13 +0100 Subject: [PATCH 34/77] CIV-14148 Add API tests --- e2e/api/steps_LRspec.js | 8 +-- .../events/discontinueClaim2v1Spec.js | 68 +++++++++++++------ ..._settle_discontinue_claim_2v1_spec_test.js | 13 +++- 3 files changed, 61 insertions(+), 28 deletions(-) diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 531945ff3f..d0f6d773ab 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -84,7 +84,7 @@ const data = { REFER_JUDGE_DEFENCE_RECEIVED: () => judgmentOnline1v1Spec.referJudgeDefenceReceived(), SETTLE_CLAIM_MARK_PAID_FULL: (addApplicant2) => settleClaim1v1Spec.settleClaim(addApplicant2), SETTLE_CLAIM_MARK_PAID_FULL_SELECT_CLAIMANT: (addApplicant2) => settleClaim1v1Spec.claimantDetails(addApplicant2), - DISCONTINUE_CLAIM: () => discontinueClaim2v1Spec.discontinueClaim(), + DISCONTINUE_CLAIM: (mpScenario) => discontinueClaim2v1Spec.discontinueClaim(mpScenario), }; const eventData = { @@ -1653,7 +1653,7 @@ module.exports = { await waitForFinishedBusinessProcess(caseId); }, - discontinueClaim: async (user) => { + discontinueClaim: async (user, mpScenario) => { console.log('discontinueClaim for case id ' + caseId); await apiRequest.setupTokens(user); eventName = 'DISCONTINUE_CLAIM_CLAIMANT'; @@ -1664,12 +1664,12 @@ module.exports = { assertContainsPopulatedFields(returnedCaseData); - let disposalData = data.DISCONTINUE_CLAIM(); + let disposalData = data.DISCONTINUE_CLAIM(mpScenario); for (let pageId of Object.keys(disposalData.userInput)) { await assertValidData(disposalData, pageId); } - //TODO: Check the correct final submit state dor discontinue claim + //TODO: Check the correct final submit state for discontinue claim /*await assertSubmittedEvent('PROCEEDS_IN_HERITAGE_SYSTEM', { header: '### Request is being reviewed', body: '' diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index 9462b1c4d4..eb926834e2 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -1,29 +1,53 @@ module.exports = { - discontinueClaim: () => { - const data = { - userInput: { - MultipleClaimant:{ - addApplicant2 : 'Yes', - claimantWhoIsDiscontinuing : { - value: { - code: 'bfcf6412-1b23-45c6-b451-224ab5ec1703', - label: 'Test Inc' + discontinueClaim: (mpScenario) => { + const data ={}; + switch (mpScenario) { + case 'ONE_V_TWO': { + data.userInput = { + courtPermission: { + courtPermissionNeeded: 'NO', + courtPermissionNeededChecked: [ + 'CourtPermissionNeededChecked' + ] + }, + DiscontinuingAgainstDefendants: { + respondent2Represented: 'Yes', + isDiscontinuingAgainstBothDefendants: 'NO', + discontinuingAgainstOneDefendant: { + value: { + code: '321820a6-36cf-4fb2-9e78-2f34874ea9e8', + label: 'Second Defendant' + } } } - }, - ClaimantConsent:{ - selectedClaimantForDiscontinuance : 'Test Inc', - claimantsConsentToDiscontinuance : 'Yes' - }, - courtPermission:{ - courtPermissionNeeded: 'NO', - courtPermissionNeededChecked: [ - 'CourtPermissionNeededChecked' - ] - } + }; } - }; - + break; + case 'TWO_V_ONE': { + data.userInput = { + MultipleClaimant: { + addApplicant2: 'Yes', + claimantWhoIsDiscontinuing: { + value: { + code: 'bfcf6412-1b23-45c6-b451-224ab5ec1703', + label: 'Test Inc' + } + } + }, + ClaimantConsent: { + selectedClaimantForDiscontinuance: 'Test Inc', + claimantsConsentToDiscontinuance: 'Yes' + }, + courtPermission: { + courtPermissionNeeded: 'NO', + courtPermissionNeededChecked: [ + 'CourtPermissionNeededChecked' + ] + } + }; + } + break; + } return data; } }; diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index b5c547d751..e4b80ec01d 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -12,10 +12,19 @@ Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { } }); +Scenario('Discontinue claim 1v2 scenario', async ({I, api_spec}) => { + if (['preview', 'demo'].includes(config.runningEnv)) { + let mpScenario = 'ONE_V_TWO'; + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + } +}); + Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); - await api_spec.discontinueClaim(config.applicantSolicitorUser); + let mpScenario = 'TWO_V_ONE'; + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); } }); From 2e4e8fd64e5da2ec6b94cb73e1fed3ba97b472b1 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Thu, 27 Jun 2024 10:08:29 +0100 Subject: [PATCH 35/77] CIV-14148 Refactor Yes or No list --- .../CaseField-SettleDiscontinue-nonprod.json | 4 ++-- .../IsDiscontAgainstAllDefList.json | 14 -------------- ...laim.json => SettleDiscontinueYesOrNoList.json} | 4 ++-- 3 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json rename ccd-definition/FixedLists/SettleDiscontinue/{CourtPermissionIsNeededList-DiscontinueClaim.json => SettleDiscontinueYesOrNoList.json} (67%) diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index e442a7defe..926c6cf97a 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -94,7 +94,7 @@ "ID": "courtPermissionNeeded", "Label": "For more information, refer to the Civil Procedure Rules 38.2.", "FieldType": "FixedRadioList", - "FieldTypeParameter": "CourtPermissionIsNeededList", + "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", "Searchable": "N" }, @@ -130,7 +130,7 @@ "ID": "isDiscontinuingAgainstBothDefendants", "Label": " ", "FieldType": "FixedRadioList", - "FieldTypeParameter": "IsDiscontAgainstAllDefList", + "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", "Searchable": "N" }, diff --git a/ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json b/ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json deleted file mode 100644 index 7acb627dc3..0000000000 --- a/ccd-definition/FixedLists/SettleDiscontinue/IsDiscontAgainstAllDefList.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "ID": "IsDiscontAgainstAllDefList", - "ListElementCode": "YES", - "ListElement": "Yes", - "DisplayOrder": 1 - }, - { - "ID": "IsDiscontAgainstAllDefList", - "ListElementCode": "NO", - "ListElement": "No", - "DisplayOrder": 2 - } -] diff --git a/ccd-definition/FixedLists/SettleDiscontinue/CourtPermissionIsNeededList-DiscontinueClaim.json b/ccd-definition/FixedLists/SettleDiscontinue/SettleDiscontinueYesOrNoList.json similarity index 67% rename from ccd-definition/FixedLists/SettleDiscontinue/CourtPermissionIsNeededList-DiscontinueClaim.json rename to ccd-definition/FixedLists/SettleDiscontinue/SettleDiscontinueYesOrNoList.json index 855dc7d0f1..cfce28d63a 100644 --- a/ccd-definition/FixedLists/SettleDiscontinue/CourtPermissionIsNeededList-DiscontinueClaim.json +++ b/ccd-definition/FixedLists/SettleDiscontinue/SettleDiscontinueYesOrNoList.json @@ -1,12 +1,12 @@ [ { - "ID": "CourtPermissionIsNeededList", + "ID": "SettleDiscontinueYesOrNoList", "ListElementCode": "YES", "ListElement": "Yes", "DisplayOrder": 1 }, { - "ID": "CourtPermissionIsNeededList", + "ID": "SettleDiscontinueYesOrNoList", "ListElementCode": "NO", "ListElement": "No", "DisplayOrder": 2 From ae482c30b3a8da7b787325b709d1d8930cac76df Mon Sep 17 00:00:00 2001 From: JamiS Date: Thu, 27 Jun 2024 12:10:15 +0100 Subject: [PATCH 36/77] CIV-14146: Added ccd fields - Initial Commit --- ...onCaseField-SettleDiscontinue-nonprod.json | 39 +++++++++++++++++++ ...ntinueClaim-SettleDiscontinue-nonprod.json | 38 ++++++++++++++++++ .../CaseField-SettleDiscontinue-nonprod.json | 25 ++++++++++++ ...ntinueClaimClaimant-PermissionGranted.json | 19 +++++++++ 4 files changed, 121 insertions(+) create mode 100644 ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index dd716849fa..4adefb0b4d 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -185,6 +185,45 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "partiesNames4", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "isPermissionGranted", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "permissionGrantedComplex", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "discontinuingAgainstDefendantsLbl", diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index df9f2b939e..abc3523a50 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -122,6 +122,44 @@ "RetriesTimeoutURLMidEvent": 0, "FieldShowCondition": "courtPermissionNeeded=\"NO\"" }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "partiesNames4", + "PageID": "PermissionGranted", + "PageLabel": "Permission granted by the court", + "PageDisplayOrder": 4, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "isPermissionGranted", + "PageID": "PermissionGranted", + "PageLabel": "Permission granted by the court", + "PageDisplayOrder": 4, + "PageFieldDisplayOrder": 2, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "permissionGrantedComplex", + "PageID": "PermissionGranted", + "PageLabel": "Permission granted by the court", + "PageDisplayOrder": 4, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "Y", + "RetriesTimeoutURLMidEvent": 0, + "FieldShowCondition": "isPermissionGranted=\"YES\"" + }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 926c6cf97a..518aa8636f 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -141,5 +141,30 @@ "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "partiesNames4", + "Label": "**${caseNameHmctsInternal}**", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "isPermissionGranted", + "Label": "Has permission been granted by a Judge to discontinue", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "SettleDiscontinueYesOrNoList", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "permissionGrantedComplex", + "Label": " ", + "FieldType": "PermissionGrantedFields", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json new file mode 100644 index 0000000000..30620e6f73 --- /dev/null +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json @@ -0,0 +1,19 @@ +[ + { + "ID": "PermissionGrantedFields", + "ListElementCode": "permissionGrantedJudge", + "ElementLabel": "### Permission granted by:\n**Judge name**", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "PermissionGrantedFields", + "ListElementCode": "permissionGrantedDate", + "ElementLabel": "### On data\n**For example, 16 4 2021**", + "FieldType": "Date", + "SecurityClassification": "Public", + "Searchable": "N" + } +] + From 3d09a62c188ca8b4133b92ecc0965bdc37c38ecc Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Thu, 27 Jun 2024 16:40:43 +0100 Subject: [PATCH 37/77] CIV-14233 added validate discontinue event --- ...sationCaseEvent-SettleDiscontinue-nonprod.json | 13 +++++++++++++ ...sationCaseField-SettleDiscontinue-nonprod.json | 7 +++++++ .../UserEvents-SettleDiscontinue-nonprod.json | 15 +++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index 07ef09acfe..42c6c3768c 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -75,5 +75,18 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4adefb0b4d..02b2c206c2 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -208,6 +208,13 @@ "APP-SOL-SPEC-PROFILE" ], "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "R" } ] }, diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index 26c398c914..746b3c1b22 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -45,5 +45,20 @@ "ShowEventNotes": "N", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", "RetriesTimeoutAboutToStartEvent": 0 + }, + { + "CaseTypeID": "CIVIL", + "ID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "Name": "Validate discontinuance", + "Description": "Validate discontinuance", + "DisplayOrder": 15, + "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", + "PostConditionState": "*", + "EventEnablingCondition": "isPermissionGranted = \"Yes\"", + "SecurityClassification": "Public", + "ShowSummary": "N", + "ShowEventNotes": "N", + "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "RetriesTimeoutAboutToStartEvent": 0 } ] From 63707da9bc4fb02f9a353dcae6d989c73d1b643a Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:57:03 +0100 Subject: [PATCH 38/77] Updated role permission --- ...AuthorisationCaseField-SettleDiscontinue-nonprod.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 02b2c206c2..c37ad92d44 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -205,16 +205,11 @@ { "UserRoles": [ "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - }, - { - "UserRoles": [ + "APP-SOL-SPEC-PROFILE", "caseworker-civil-admin", "caseworker-civil-staff" ], - "CRUD": "R" + "CRUD": "CRU" } ] }, From dfa93549cc5991ab7e1126d270caea222c0cd693 Mon Sep 17 00:00:00 2001 From: JamiS Date: Mon, 1 Jul 2024 02:19:35 +0100 Subject: [PATCH 39/77] CIV-14146: Added fields for Permission Granted page --- ...tionCaseField-SettleDiscontinue-nonprod.json | 13 +++++++++++++ ...continueClaim-SettleDiscontinue-nonprod.json | 17 ++++++++++++++++- .../CaseField-SettleDiscontinue-nonprod.json | 8 ++++++++ ...continueClaimClaimant-PermissionGranted.json | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 3ba9e54a5f..074a14319e 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -222,6 +222,19 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "permissionNotGrantedText", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "discontinuingAgainstDefendantsLbl", diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index abc3523a50..a421c562d2 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -144,7 +144,8 @@ "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "Y" + "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/checkPermissionGranted" }, { "CaseTypeID": "CIVIL", @@ -160,6 +161,20 @@ "RetriesTimeoutURLMidEvent": 0, "FieldShowCondition": "isPermissionGranted=\"YES\"" }, + { + "CaseTypeID":"CIVIL", + "CaseEventID":"DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID":"permissionNotGrantedText", + "PageID":"PermissionGranted", + "PageLabel":"Permission granted by the court", + "PageDisplayOrder":4, + "PageFieldDisplayOrder":4, + "PageColumnNumber":1, + "DisplayContext":"READONLY", + "ShowSummaryChangeOption":"N", + "RetriesTimeoutURLMidEvent":0, + "FieldShowCondition":"isPermissionGranted=\"NO\"" + }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 518aa8636f..353a9b0c88 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -166,5 +166,13 @@ "FieldType": "PermissionGrantedFields", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "permissionNotGrantedText", + "Label": "### Unable to discontinue this claim \n To discontinue from this claim you need to get permission from the court.\n Click cancel to return to the case summary screen and select 'Make\n an application' from the next steps menu and select 'Other'", + "FieldType": "Label", + "SecurityClassification":"Public", + "Searchable": "N" } ] diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json index 30620e6f73..623352f092 100644 --- a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json @@ -3,7 +3,7 @@ "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedJudge", "ElementLabel": "### Permission granted by:\n**Judge name**", - "FieldType": "Label", + "FieldType":"Text", "SecurityClassification": "Public", "Searchable": "N" }, From 8bbae8d3989aed6f93a47b869a628fc6c119f462 Mon Sep 17 00:00:00 2001 From: JamiS Date: Mon, 1 Jul 2024 17:22:38 +0100 Subject: [PATCH 40/77] CIV-14146: Updated code to fix midEvent issue --- ...ntinueClaim-SettleDiscontinue-nonprod.json | 2 -- .../CaseField-SettleDiscontinue-nonprod.json | 6 ++---- ...ntinueClaimClaimant-PermissionGranted.json | 20 +++++++++++++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index a421c562d2..dec934345c 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -158,7 +158,6 @@ "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", - "RetriesTimeoutURLMidEvent": 0, "FieldShowCondition": "isPermissionGranted=\"YES\"" }, { @@ -172,7 +171,6 @@ "PageColumnNumber":1, "DisplayContext":"READONLY", "ShowSummaryChangeOption":"N", - "RetriesTimeoutURLMidEvent":0, "FieldShowCondition":"isPermissionGranted=\"NO\"" }, { diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 353a9b0c88..ac7f57c8f0 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -104,8 +104,7 @@ "Label": "The court's permission to discontinue a claim is not required if:
• The court has not granted an interim injuction
• No party has given an undertaking to the court
• The claimant has not received an interim payment
• The claimant has received an interim payment and the defendant has consented in writing to the
  discontinuance", "FieldType": "Label", "SecurityClassification":"Public", - "Searchable": "N", - "FieldShowCondition": "courtPermissionNeeded=\"NO\"" + "Searchable": "N" }, { "CaseTypeID": "CIVIL", @@ -114,8 +113,7 @@ "FieldTypeParameter": "ConfirmCourtPermissionNotNeeded", "Label": " ", "SecurityClassification": "Public", - "Searchable": "N", - "FieldShowCondition": "courtPermissionNeeded = \"NO\"" + "Searchable": "N" }, { "CaseTypeID": "CIVIL", diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json index 623352f092..d791c3b8ba 100644 --- a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json @@ -1,16 +1,32 @@ [ { "ID": "PermissionGrantedFields", - "ListElementCode": "permissionGrantedJudge", + "ListElementCode": "permissionGrantedJudgeLabel", "ElementLabel": "### Permission granted by:\n**Judge name**", + "FieldType":"Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "PermissionGrantedFields", + "ListElementCode": "permissionGrantedJudge", + "ElementLabel": " ", "FieldType":"Text", "SecurityClassification": "Public", "Searchable": "N" }, + { + "ID": "PermissionGrantedFields", + "ListElementCode": "permissionGrantedDateLabel", + "ElementLabel": "### On date\n**For example, 16 4 2021**", + "FieldType":"Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedDate", - "ElementLabel": "### On data\n**For example, 16 4 2021**", + "ElementLabel": " ", "FieldType": "Date", "SecurityClassification": "Public", "Searchable": "N" From bba063f94ca232f32ad1bcb9babdf9c1abd94ba0 Mon Sep 17 00:00:00 2001 From: JamiS Date: Mon, 1 Jul 2024 22:36:32 +0100 Subject: [PATCH 41/77] CIV-14146: Updated field definition with HintText --- ...ntinueClaimClaimant-PermissionGranted.json | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json index d791c3b8ba..492970e56d 100644 --- a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json @@ -1,32 +1,18 @@ [ - { - "ID": "PermissionGrantedFields", - "ListElementCode": "permissionGrantedJudgeLabel", - "ElementLabel": "### Permission granted by:\n**Judge name**", - "FieldType":"Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedJudge", - "ElementLabel": " ", + "HintText": "Judge name", + "ElementLabel": "Permission granted by:", "FieldType":"Text", "SecurityClassification": "Public", "Searchable": "N" }, - { - "ID": "PermissionGrantedFields", - "ListElementCode": "permissionGrantedDateLabel", - "ElementLabel": "### On date\n**For example, 16 4 2021**", - "FieldType":"Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedDate", - "ElementLabel": " ", + "ElementLabel": "On date", + "HintText": "For example, 16 04 2021", "FieldType": "Date", "SecurityClassification": "Public", "Searchable": "N" From 9f13df9491efcff4c2773486ad4bf03b6c885601 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 2 Jul 2024 09:40:26 +0100 Subject: [PATCH 42/77] CIV-14146: Updated as per review comments --- .../CaseField/CaseField-SettleDiscontinue-nonprod.json | 2 +- ... => DiscontinueClaimClaimant-PermissionGranted-nonprod.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ccd-definition/ComplexTypes/{DiscontinueClaimClaimant-PermissionGranted.json => DiscontinueClaimClaimant-PermissionGranted-nonprod.json} (100%) diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index ac7f57c8f0..6eaf5032ef 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -168,7 +168,7 @@ { "CaseTypeID": "CIVIL", "ID": "permissionNotGrantedText", - "Label": "### Unable to discontinue this claim \n To discontinue from this claim you need to get permission from the court.\n Click cancel to return to the case summary screen and select 'Make\n an application' from the next steps menu and select 'Other'", + "Label": "### Unable to discontinue this claim \n To discontinue this claim you need to get permission from the court.\n Click cancel to return to the case summary screen and select 'Make\n an application' from the next steps menu and select 'Other'", "FieldType": "Label", "SecurityClassification":"Public", "Searchable": "N" diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json similarity index 100% rename from ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted.json rename to ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json From 439e60664828432d7393fd099065fdb424a2428a Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 2 Jul 2024 11:50:53 +0100 Subject: [PATCH 43/77] CIV-14146: Removed duplicate fields --- ...onCaseField-SettleDiscontinue-nonprod.json | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 562ddca57c..29b08faa98 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -235,45 +235,6 @@ } ] }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "discontinuingAgainstDefendantsLbl", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "R" - } - ] - }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "isDiscontinuingAgainstBothDefendants", - "AccessControl": [ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - } - ] - }, - { - "CaseTypeID":"CIVIL", - "CaseFieldID":"discontinuingAgainstOneDefendant", - "AccessControl":[ - { - "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" - ], - "CRUD": "CRU" - } - ] - }, { "CaseTypeID": "CIVIL", "CaseFieldID": "hearingDate", From 654fa732b9b5d182b29987f0b54597d9748f258b Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 2 Jul 2024 12:31:29 +0100 Subject: [PATCH 44/77] CIV-14146: Added a missing condition --- .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index dec934345c..9b596545b9 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -132,7 +132,8 @@ "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" + "ShowSummaryChangeOption": "N", + "PageShowCondition": "courtPermissionNeeded = \"YES\"" }, { "CaseTypeID": "CIVIL", From f32f9db4abb9bcad231a1e3ad25ee11f894f7b8d Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 2 Jul 2024 16:14:23 +0100 Subject: [PATCH 45/77] CIV-14236 Add Validate discontinuance screens --- .../User/UserEvents-SettleDiscontinue-nonprod.json | 2 ++ ...idateDiscontinue-SettleDiscontinue-nonprod.json | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index 1db93fb953..7ae7e0500b 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -60,6 +60,8 @@ "ShowSummary": "N", "ShowEventNotes": "N", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", "RetriesTimeoutAboutToStartEvent": 0 } ] diff --git a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json new file mode 100644 index 0000000000..e8c2ca2ef4 --- /dev/null +++ b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json @@ -0,0 +1,14 @@ +[ + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "partiesNames", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate discontinuance", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 1, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + } +] From 9a2759b1190ab811aefc7cc29fea0326bc3209d3 Mon Sep 17 00:00:00 2001 From: JamiS Date: Tue, 2 Jul 2024 16:19:45 +0100 Subject: [PATCH 46/77] CIV-14146: Updated page display order --- .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 65c8041738..f5894d6e68 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -240,7 +240,7 @@ "CaseFieldID": "partiesNamesTD", "PageID": "DiscontinuanceType", "PageLabel": "Type of Discontinuance", - "PageDisplayOrder": 4, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, "DisplayContext": "READONLY", @@ -252,7 +252,7 @@ "CaseFieldID": "typeOfDiscontinuance", "PageID": "DiscontinuanceType", "PageLabel": "Type of Discontinuance", - "PageDisplayOrder": 4, + "PageDisplayOrder": 6, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", @@ -264,7 +264,7 @@ "CaseFieldID":"partDiscontinuanceDetails", "PageID":"DiscontinuanceType", "PageLabel":"Type of Discontinuance", - "PageDisplayOrder":4, + "PageDisplayOrder":6, "PageFieldDisplayOrder":3, "PageColumnNumber":1, "DisplayContext": "MANDATORY", From ea67d2222f5e7a7ec02bebff5a6cfa80e35fd723 Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 10:32:22 +0100 Subject: [PATCH 47/77] CIV-14156:Updated the page labels --- ...horisationCaseField-SettleDiscontinue-nonprod.json | 2 +- .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 8 +++++--- .../CaseField-SettleDiscontinue-nonprod.json | 11 ++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 57aa53e755..4fadff3d76 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -263,7 +263,7 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "discontinuingAgainstDefendantsLbl", + "CaseFieldID": "partiesNamesDD", "AccessControl": [ { "UserRoles": [ diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index f5894d6e68..f3b591f029 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -75,7 +75,7 @@ "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "partiesNames3", "PageID": "CourtPermission", - "PageLabel": " ", + "PageLabel": "Permission from the court", "PageDisplayOrder": 3, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, @@ -87,7 +87,7 @@ "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "courtPermissionNeeded", "PageID": "CourtPermission", - "PageLabel": "Permission from the court", + "PageLabel": "", "PageDisplayOrder": 3, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, @@ -179,6 +179,7 @@ "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "applicant1Represented", "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", @@ -190,6 +191,7 @@ "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "respondent2Represented", "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, "PageFieldDisplayOrder": 2, "DisplayContext": "READONLY", @@ -199,7 +201,7 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "discontinuingAgainstDefendantsLbl", + "CaseFieldID": "partiesNamesDD", "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index f289854be9..0fef3ef5b7 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -92,7 +92,7 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNames3", - "Label": "**${caseNameHmctsInternal}** \n****\n ### Is the court's permission needed to discontinue?", + "Label": "**${caseNameHmctsInternal}**", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -100,7 +100,8 @@ { "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", - "Label": "For more information, refer to the Civil Procedure Rules 38.2.", + "Label": "Is the court's permission needed to discontinue?", + "HintText": "For more information, refer to the Civil Procedure Rules 38.2.", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", @@ -125,8 +126,8 @@ }, { "CaseTypeID": "CIVIL", - "ID": "discontinuingAgainstDefendantsLbl", - "Label": "**${caseNameHmctsInternal}** \n****\n ### Is the discontinuance against all defendants?", + "ID": "partiesNamesDD", + "Label": "**${caseNameHmctsInternal}**", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -134,7 +135,7 @@ { "CaseTypeID": "CIVIL", "ID": "isDiscontinuingAgainstBothDefendants", - "Label": " ", + "Label": "Is the discontinuance against all defendants?", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", From 142dafb58928ba512f8f27ffb5c8b3f60e1e8e80 Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 10:47:15 +0100 Subject: [PATCH 48/77] CIV-14156: Updated API tests --- .../events/discontinueClaim2v1Spec.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index eb926834e2..b7bea5acdf 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -10,6 +10,13 @@ module.exports = { 'CourtPermissionNeededChecked' ] }, + PermissionGranted: { + isPermissionGranted:"YES", + permissionGrantedComplex:{ + permissionGrantedJudge:"test", + permissionGrantedDate:"2023-02-01" + } + }, DiscontinuingAgainstDefendants: { respondent2Represented: 'Yes', isDiscontinuingAgainstBothDefendants: 'NO', @@ -19,6 +26,9 @@ module.exports = { label: 'Second Defendant' } } + }, + DiscontinuanceType: { + typeOfDiscontinuance:"FULL_DISCONTINUANCE" } }; } @@ -43,6 +53,17 @@ module.exports = { courtPermissionNeededChecked: [ 'CourtPermissionNeededChecked' ] + }, + PermissionGranted: { + isPermissionGranted:"YES", + permissionGrantedComplex:{ + permissionGrantedJudge:"test", + permissionGrantedDate:"2023-02-01" + } + }, + DiscontinuanceType: { + typeOfDiscontinuance:"PART_DISCONTINUANCE", + partDiscontinuanceDetails:"test" } }; } From fe0629bc69cf559af8f6ef0d0558b4b9d90e16e9 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 3 Jul 2024 11:49:23 +0100 Subject: [PATCH 49/77] CIV-14236 Add Validate discontinuance screens --- ...onCaseField-SettleDiscontinue-nonprod.json | 65 +++++++++++++++---- .../UserEvents-SettleDiscontinue-nonprod.json | 1 - ...Discontinue-SettleDiscontinue-nonprod.json | 64 +++++++++++++++++- .../CaseField-SettleDiscontinue-nonprod.json | 50 ++++++++++++++ ...nfirmOrderGivesPermissionList-nonprod.json | 14 ++++ 5 files changed, 178 insertions(+), 16 deletions(-) create mode 100644 ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 5619bb2001..2a3f55c030 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -291,12 +291,12 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "discontinuingAgainstDefendantsLbl", + "CaseFieldID": "validateDiscontinuanceLbl", "AccessControl": [ { "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" + "caseworker-civil-admin", + "caseworker-civil-staff" ], "CRUD": "R" } @@ -304,27 +304,66 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "isDiscontinuingAgainstBothDefendants", + "CaseFieldID": "judgeNameInput", "AccessControl": [ { "UserRoles": [ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" + "caseworker-civil-admin", + "caseworker-civil-staff" ], "CRUD": "CRU" } ] }, { - "CaseTypeID":"CIVIL", - "CaseFieldID":"discontinuingAgainstOneDefendant", - "AccessControl":[ + "CaseTypeID": "CIVIL", + "CaseFieldID": "onDateLbl", + "AccessControl": [ { - "UserRoles":[ - "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" ], - "CRUD":"CRU" + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "onDate", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "confirmOrderGivesPermissionLbl", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "confirmOrderGivesPermission", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "CRU" } ] } diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index 7ae7e0500b..0fd89761b8 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -55,7 +55,6 @@ "DisplayOrder": 15, "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", - "EventEnablingCondition": "isPermissionGranted = \"Yes\"", "SecurityClassification": "Public", "ShowSummary": "N", "ShowEventNotes": "N", diff --git a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json index e8c2ca2ef4..0978c1fd1c 100644 --- a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json @@ -2,13 +2,73 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "partiesNames", + "CaseFieldID": "validateDiscontinuanceLbl", "PageID": "ValidateDiscontinuance", - "PageLabel": "Validate discontinuance", + "PageLabel": "Validate order information", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 1, "PageColumnNumber": 1, "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "judgeNameInput", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 2, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "onDateLbl", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "onDate", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 4, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "confirmOrderGivesPermissionLbl", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 5, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "confirmOrderGivesPermission", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 6, + "PageColumnNumber": 1, + "DisplayContext": "MANDATORY", + "ShowSummaryChangeOption": "N" } ] diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 6eaf5032ef..66ad55242a 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -172,5 +172,55 @@ "FieldType": "Label", "SecurityClassification":"Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "validateDiscontinuanceLbl", + "Label": "**${caseNameHmctsInternal}** \n****\n ### Permission granted by:", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "judgeNameInput", + "Label": "Judge name", + "FieldType": "Text", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "onDateLbl", + "Label": "### On date", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "onDate", + "Label": " ", + "HintText": "For example, 16 4 2021", + "FieldType": "Date", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "confirmOrderGivesPermissionLbl", + "Label": "### Can you confirm the Order does give permission to discontinue all or part of the claim?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL", + "ID": "confirmOrderGivesPermission", + "Label": " ", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "ConfirmOrderGivesPermissionList", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json b/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json new file mode 100644 index 0000000000..d7f9e1269c --- /dev/null +++ b/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json @@ -0,0 +1,14 @@ +[ + { + "ID": "ConfirmOrderGivesPermissionList", + "ListElementCode": "YES", + "ListElement": "Yes - generate a Notice of Discontinuance", + "DisplayOrder": 1 + }, + { + "ID": "ConfirmOrderGivesPermissionList", + "ListElementCode": "NO", + "ListElement": "No - the claimant will be notified and requested to resubmit", + "DisplayOrder": 2 + } +] From 1835742e27c5c7600e4f37c7d2f4feb9567ed387 Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 11:59:32 +0100 Subject: [PATCH 50/77] CIV-14156: Updated labels to make them bold --- ...ntinueClaim-SettleDiscontinue-nonprod.json | 94 ++++++++++++++++--- .../CaseField-SettleDiscontinue-nonprod.json | 61 ++++++++++-- ...aimClaimant-PermissionGranted-nonprod.json | 21 ++++- 3 files changed, 154 insertions(+), 22 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index f3b591f029..b721ead4ee 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -22,13 +22,24 @@ "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", "ShowSummaryChangeOption": "N" }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantWhoIsDiscontinuingLbl", + "PageID": "MultipleClaimant", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 4, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "claimantWhoIsDiscontinuing", "PageID": "MultipleClaimant", "PageDisplayOrder": 1, - "PageFieldDisplayOrder": 3, + "PageFieldDisplayOrder": 5, "PageColumnNumber": 1, "PageShowCondition": "addApplicant2 = \"Yes\"", "DisplayContext": "MANDATORY", @@ -62,10 +73,21 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "claimantsConsentToDiscontinuance", + "CaseFieldID": "claimantsConsentToDiscontinuanceLbl", "PageID": "ClaimantConsent", "PageDisplayOrder": 2, "PageFieldDisplayOrder": 3, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "claimantsConsentToDiscontinuance", + "PageID": "ClaimantConsent", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 4, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" @@ -85,12 +107,24 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "courtPermissionNeeded", + "CaseFieldID": "courtPermissionNeededLbl", "PageID": "CourtPermission", "PageLabel": "", "PageDisplayOrder": 3, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "courtPermissionNeeded", + "PageID": "CourtPermission", + "PageLabel": "", + "PageDisplayOrder": 3, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" }, @@ -101,7 +135,7 @@ "PageID":"CourtPermission", "PageLabel":"Permission from the court", "PageDisplayOrder":3, - "PageFieldDisplayOrder":3, + "PageFieldDisplayOrder":4, "PageColumnNumber":1, "DisplayContext":"READONLY", "ShowSummaryChangeOption":"N", @@ -115,7 +149,7 @@ "PageID": "CourtPermission", "PageLabel": "Permission from the court", "PageDisplayOrder": 3, - "PageFieldDisplayOrder": 4, + "PageFieldDisplayOrder": 5, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", @@ -138,12 +172,24 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "isPermissionGranted", + "CaseFieldID": "isPermissionGrantedLbl", "PageID": "PermissionGranted", "PageLabel": "Permission granted by the court", "PageDisplayOrder": 4, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "isPermissionGranted", + "PageID": "PermissionGranted", + "PageLabel": "Permission granted by the court", + "PageDisplayOrder": 4, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/checkPermissionGranted" @@ -155,7 +201,7 @@ "PageID": "PermissionGranted", "PageLabel": "Permission granted by the court", "PageDisplayOrder": 4, - "PageFieldDisplayOrder": 3, + "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y", @@ -168,7 +214,7 @@ "PageID":"PermissionGranted", "PageLabel":"Permission granted by the court", "PageDisplayOrder":4, - "PageFieldDisplayOrder":4, + "PageFieldDisplayOrder":5, "PageColumnNumber":1, "DisplayContext":"READONLY", "ShowSummaryChangeOption":"N", @@ -214,12 +260,24 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "isDiscontinuingAgainstBothDefendants", + "CaseFieldID": "isDiscontinuingAgainstBothDefendantsLbl", "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "isDiscontinuingAgainstBothDefendants", + "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 5, + "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" }, @@ -230,7 +288,7 @@ "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 5, + "PageFieldDisplayOrder": 6, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", @@ -251,12 +309,24 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "typeOfDiscontinuance", + "CaseFieldID": "typeOfDiscontinuanceLbl", "PageID": "DiscontinuanceType", "PageLabel": "Type of Discontinuance", "PageDisplayOrder": 6, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "typeOfDiscontinuance", + "PageID": "DiscontinuanceType", + "PageLabel": "Type of Discontinuance", + "PageDisplayOrder": 6, + "PageFieldDisplayOrder": 3, + "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y" }, @@ -267,7 +337,7 @@ "PageID":"DiscontinuanceType", "PageLabel":"Type of Discontinuance", "PageDisplayOrder":6, - "PageFieldDisplayOrder":3, + "PageFieldDisplayOrder":4, "PageColumnNumber":1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption":"Y", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 0fef3ef5b7..680226005d 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -65,18 +65,34 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "claimantWhoIsDiscontinuingLbl", + "Label": "### Which claimants are discontinuing?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "claimantWhoIsDiscontinuing", - "Label": "Which claimants are discontinuing?", + "Label": " ", "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "claimantsConsentToDiscontinuanceLbl", + "Label": "### Do all claimants consent to the discontinuance?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "claimantsConsentToDiscontinuance", - "Label": "Do all claimants consent to the discontinuance?", + "Label": " ", "FieldType": "YesOrNo", "SecurityClassification": "Public", "Searchable": "N" @@ -97,11 +113,18 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "courtPermissionNeededLbl", + "Label": "### Is the court's permission needed to discontinue?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", - "Label": "Is the court's permission needed to discontinue?", - "HintText": "For more information, refer to the Civil Procedure Rules 38.2.", + "Label": "For more information, refer to the Civil Procedure Rules 38.2.", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", @@ -132,10 +155,18 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "isDiscontinuingAgainstBothDefendantsLbl", + "Label": "### Is the discontinuance against all defendants?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "isDiscontinuingAgainstBothDefendants", - "Label": "Is the discontinuance against all defendants?", + "Label": " ", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", @@ -157,10 +188,18 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "isPermissionGrantedLbl", + "Label": "### Has permission been granted by a Judge to discontinue", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "isPermissionGranted", - "Label": "Has permission been granted by a Judge to discontinue", + "Label": " ", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", @@ -182,10 +221,18 @@ "SecurityClassification":"Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "typeOfDiscontinuanceLbl", + "Label": "### Is this a full or part discontinuance?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "typeOfDiscontinuance", - "Label": "Is this a full or part discontinuance?", + "Label": " ", "FieldType": "FixedRadioList", "FieldTypeParameter": "DiscontinuanceTypeList", "SecurityClassification": "Public", diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json index 492970e56d..9b2f8e394f 100644 --- a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json @@ -1,17 +1,32 @@ [ + { + "ID": "PermissionGrantedFields", + "ListElementCode": "permissionGrantedJudgeLbl", + "ElementLabel": "### Permission granted by:", + "FieldType":"Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedJudge", - "HintText": "Judge name", - "ElementLabel": "Permission granted by:", + "ElementLabel": "Judge name", "FieldType":"Text", "SecurityClassification": "Public", "Searchable": "N" }, + { + "ID": "PermissionGrantedFields", + "ListElementCode": "permissionGrantedDateLbl", + "ElementLabel": "### On date", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedDate", - "ElementLabel": "On date", + "ElementLabel": " ", "HintText": "For example, 16 04 2021", "FieldType": "Date", "SecurityClassification": "Public", From 92531b013e28e2a250445291b5e880165806cf39 Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 12:07:54 +0100 Subject: [PATCH 51/77] CIV-14156: Updated labels to make them bold - few more --- ...iscontinueClaim-SettleDiscontinue-nonprod.json | 15 ++++++++++++++- .../CaseField-SettleDiscontinue-nonprod.json | 10 +++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index b721ead4ee..c4d187ffd2 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -284,12 +284,25 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "discontinuingAgainstOneDefendant", + "CaseFieldID": "discontinuingAgainstOneDefendantLbl", "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, "PageFieldDisplayOrder": 6, "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "isDiscontinuingAgainstBothDefendants=\"NO\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "discontinuingAgainstOneDefendant", + "PageID": "DiscontinuingAgainstDefendants", + "PageLabel": "Discontinuing against defendants", + "PageDisplayOrder": 5, + "PageFieldDisplayOrder": 7, + "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", "FieldShowCondition": "isDiscontinuingAgainstBothDefendants=\"NO\"" diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 680226005d..f6063ae541 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -172,10 +172,18 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "discontinuingAgainstOneDefendantLbl", + "Label": "### Which defendant is the discontinuance against?", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "discontinuingAgainstOneDefendant", - "Label": "Which defendant is the discontinuance against?", + "Label": " ", "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" From a694bbf9fb61e82723df8ecf7ca031f8786c4ab3 Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 12:11:46 +0100 Subject: [PATCH 52/77] CIV-14156: Updated to single quotes --- e2e/fixtures/events/discontinueClaim2v1Spec.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index b7bea5acdf..a5168e4d60 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -11,10 +11,10 @@ module.exports = { ] }, PermissionGranted: { - isPermissionGranted:"YES", + isPermissionGranted:'YES', permissionGrantedComplex:{ - permissionGrantedJudge:"test", - permissionGrantedDate:"2023-02-01" + permissionGrantedJudge:'test', + permissionGrantedDate:'2023-02-01' } }, DiscontinuingAgainstDefendants: { @@ -28,7 +28,7 @@ module.exports = { } }, DiscontinuanceType: { - typeOfDiscontinuance:"FULL_DISCONTINUANCE" + typeOfDiscontinuance:'FULL_DISCONTINUANCE' } }; } @@ -55,15 +55,15 @@ module.exports = { ] }, PermissionGranted: { - isPermissionGranted:"YES", + isPermissionGranted:'YES', permissionGrantedComplex:{ - permissionGrantedJudge:"test", - permissionGrantedDate:"2023-02-01" + permissionGrantedJudge:'test', + permissionGrantedDate:'2023-02-01' } }, DiscontinuanceType: { - typeOfDiscontinuance:"PART_DISCONTINUANCE", - partDiscontinuanceDetails:"test" + typeOfDiscontinuance:'PART_DISCONTINUANCE', + partDiscontinuanceDetails:'test' } }; } From e710cbfb3d7a978ac8cf160e0b0b42b4be8c3f0a Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 14:42:35 +0100 Subject: [PATCH 53/77] CIV-14156: Updated as per review comments --- ...ationCaseField-SettleDiscontinue-nonprod.json | 8 ++++---- ...scontinueClaim-SettleDiscontinue-nonprod.json | 16 ++-------------- .../CaseField-SettleDiscontinue-nonprod.json | 10 +--------- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 4fadff3d76..87fb42750a 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -36,7 +36,7 @@ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], - "CRUD": "CRU" + "CRUD": "R" } ] }, @@ -49,7 +49,7 @@ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], - "CRUD": "CRU" + "CRUD": "R" } ] }, @@ -153,7 +153,7 @@ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], - "CRUD": "CRU" + "CRUD": "R" } ] }, @@ -205,7 +205,7 @@ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], - "CRUD": "CRU" + "CRUD": "R" } ] }, diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index c4d187ffd2..fecbba1152 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -109,7 +109,7 @@ "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "courtPermissionNeededLbl", "PageID": "CourtPermission", - "PageLabel": "", + "PageLabel": "Permission from the court", "PageDisplayOrder": 3, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, @@ -121,7 +121,7 @@ "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "courtPermissionNeeded", "PageID": "CourtPermission", - "PageLabel": "", + "PageLabel": "Permission from the court", "PageDisplayOrder": 3, "PageFieldDisplayOrder": 3, "PageColumnNumber": 1, @@ -257,18 +257,6 @@ "ShowSummaryChangeOption": "N", "PageShowCondition": "applicant1Represented != \"No\" AND respondent2Represented = \"Yes\"" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "isDiscontinuingAgainstBothDefendantsLbl", - "PageID": "DiscontinuingAgainstDefendants", - "PageLabel": "Discontinuing against defendants", - "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 4, - "PageColumnNumber": 1, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index f6063ae541..dc0eff4386 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -150,15 +150,7 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNamesDD", - "Label": "**${caseNameHmctsInternal}**", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, - { - "CaseTypeID": "CIVIL", - "ID": "isDiscontinuingAgainstBothDefendantsLbl", - "Label": "### Is the discontinuance against all defendants?", + "Label": "**${caseNameHmctsInternal}** \n ### Is the discontinuance against all defendants?", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" From eec026faf913d15e44aaa8ea9384a4a0983d484c Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 15:51:10 +0100 Subject: [PATCH 54/77] CIV-14156: Updated to just field labels as discussed with Ignacio. This also makes summary page looks consistent --- ...ntinueClaim-SettleDiscontinue-nonprod.json | 73 +------------------ .../CaseField-SettleDiscontinue-nonprod.json | 65 +++-------------- ...aimClaimant-PermissionGranted-nonprod.json | 21 +----- 3 files changed, 13 insertions(+), 146 deletions(-) diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index fecbba1152..2c01e80e55 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -22,24 +22,13 @@ "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "claimantWhoIsDiscontinuingLbl", - "PageID": "MultipleClaimant", - "PageDisplayOrder": 1, - "PageFieldDisplayOrder": 4, - "PageColumnNumber": 1, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", "CaseFieldID": "claimantWhoIsDiscontinuing", "PageID": "MultipleClaimant", "PageDisplayOrder": 1, - "PageFieldDisplayOrder": 5, + "PageFieldDisplayOrder": 3, "PageColumnNumber": 1, "PageShowCondition": "addApplicant2 = \"Yes\"", "DisplayContext": "MANDATORY", @@ -70,17 +59,6 @@ "ShowSummaryChangeOption": "N", "FieldShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "claimantsConsentToDiscontinuanceLbl", - "PageID": "ClaimantConsent", - "PageDisplayOrder": 2, - "PageFieldDisplayOrder": 3, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N", - "FieldShowCondition": "selectedClaimantForDiscontinuance != \"Both\"" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -104,18 +82,6 @@ "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "courtPermissionNeededLbl", - "PageID": "CourtPermission", - "PageLabel": "Permission from the court", - "PageDisplayOrder": 3, - "PageFieldDisplayOrder": 2, - "PageColumnNumber": 1, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -169,18 +135,6 @@ "ShowSummaryChangeOption": "N", "PageShowCondition": "courtPermissionNeeded = \"YES\"" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "isPermissionGrantedLbl", - "PageID": "PermissionGranted", - "PageLabel": "Permission granted by the court", - "PageDisplayOrder": 4, - "PageFieldDisplayOrder": 2, - "PageColumnNumber": 1, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -269,19 +223,6 @@ "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "discontinuingAgainstOneDefendantLbl", - "PageID": "DiscontinuingAgainstDefendants", - "PageLabel": "Discontinuing against defendants", - "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 6, - "PageColumnNumber": 1, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N", - "FieldShowCondition": "isDiscontinuingAgainstBothDefendants=\"NO\"" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", @@ -307,18 +248,6 @@ "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "typeOfDiscontinuanceLbl", - "PageID": "DiscontinuanceType", - "PageLabel": "Type of Discontinuance", - "PageDisplayOrder": 6, - "PageFieldDisplayOrder": 2, - "PageColumnNumber": 1, - "DisplayContext": "READONLY", - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "DISCONTINUE_CLAIM_CLAIMANT", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index dc0eff4386..0fef3ef5b7 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -65,34 +65,18 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "claimantWhoIsDiscontinuingLbl", - "Label": "### Which claimants are discontinuing?", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "claimantWhoIsDiscontinuing", - "Label": " ", + "Label": "Which claimants are discontinuing?", "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "claimantsConsentToDiscontinuanceLbl", - "Label": "### Do all claimants consent to the discontinuance?", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "claimantsConsentToDiscontinuance", - "Label": " ", + "Label": "Do all claimants consent to the discontinuance?", "FieldType": "YesOrNo", "SecurityClassification": "Public", "Searchable": "N" @@ -113,18 +97,11 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "courtPermissionNeededLbl", - "Label": "### Is the court's permission needed to discontinue?", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "courtPermissionNeeded", - "Label": "For more information, refer to the Civil Procedure Rules 38.2.", + "Label": "Is the court's permission needed to discontinue?", + "HintText": "For more information, refer to the Civil Procedure Rules 38.2.", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", @@ -150,7 +127,7 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNamesDD", - "Label": "**${caseNameHmctsInternal}** \n ### Is the discontinuance against all defendants?", + "Label": "**${caseNameHmctsInternal}**", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -158,24 +135,16 @@ { "CaseTypeID": "CIVIL", "ID": "isDiscontinuingAgainstBothDefendants", - "Label": " ", + "Label": "Is the discontinuance against all defendants?", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "discontinuingAgainstOneDefendantLbl", - "Label": "### Which defendant is the discontinuance against?", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "discontinuingAgainstOneDefendant", - "Label": " ", + "Label": "Which defendant is the discontinuance against?", "FieldType": "DynamicRadioList", "SecurityClassification": "Public", "Searchable": "N" @@ -188,18 +157,10 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "isPermissionGrantedLbl", - "Label": "### Has permission been granted by a Judge to discontinue", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "isPermissionGranted", - "Label": " ", + "Label": "Has permission been granted by a Judge to discontinue", "FieldType": "FixedRadioList", "FieldTypeParameter": "SettleDiscontinueYesOrNoList", "SecurityClassification": "Public", @@ -221,18 +182,10 @@ "SecurityClassification":"Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "typeOfDiscontinuanceLbl", - "Label": "### Is this a full or part discontinuance?", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "typeOfDiscontinuance", - "Label": " ", + "Label": "Is this a full or part discontinuance?", "FieldType": "FixedRadioList", "FieldTypeParameter": "DiscontinuanceTypeList", "SecurityClassification": "Public", diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json index 9b2f8e394f..298ffdc914 100644 --- a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json @@ -1,32 +1,17 @@ [ - { - "ID": "PermissionGrantedFields", - "ListElementCode": "permissionGrantedJudgeLbl", - "ElementLabel": "### Permission granted by:", - "FieldType":"Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedJudge", - "ElementLabel": "Judge name", + "ElementLabel": "Permission granted by:", + "HintText": "Judge name", "FieldType":"Text", "SecurityClassification": "Public", "Searchable": "N" }, - { - "ID": "PermissionGrantedFields", - "ListElementCode": "permissionGrantedDateLbl", - "ElementLabel": "### On date", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedDate", - "ElementLabel": " ", + "ElementLabel": "On date", "HintText": "For example, 16 04 2021", "FieldType": "Date", "SecurityClassification": "Public", From 3ed985c9a66a93bde0612210bdd946c7c6479f9b Mon Sep 17 00:00:00 2001 From: JamiS Date: Wed, 3 Jul 2024 15:56:30 +0100 Subject: [PATCH 55/77] CIV-14156: Updated label for Permission granted complex type as Summary has no heading displyaed for this --- .../CaseField/CaseField-SettleDiscontinue-nonprod.json | 2 +- .../DiscontinueClaimClaimant-PermissionGranted-nonprod.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index 0fef3ef5b7..ea46078904 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -169,7 +169,7 @@ { "CaseTypeID": "CIVIL", "ID": "permissionGrantedComplex", - "Label": " ", + "Label": "Permission granted by:", "FieldType": "PermissionGrantedFields", "SecurityClassification": "Public", "Searchable": "N" diff --git a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json index 298ffdc914..a33726b64c 100644 --- a/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json +++ b/ccd-definition/ComplexTypes/DiscontinueClaimClaimant-PermissionGranted-nonprod.json @@ -2,8 +2,7 @@ { "ID": "PermissionGrantedFields", "ListElementCode": "permissionGrantedJudge", - "ElementLabel": "Permission granted by:", - "HintText": "Judge name", + "ElementLabel": "Judge name", "FieldType":"Text", "SecurityClassification": "Public", "Searchable": "N" From 76efd91b272625512eed91c1c1e790ec92174515 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Thu, 4 Jul 2024 11:16:42 +0100 Subject: [PATCH 56/77] CIV-14156 Add lines to screens --- ...onCaseField-SettleDiscontinue-nonprod.json | 2 +- ...ntinueClaim-SettleDiscontinue-nonprod.json | 8 +++--- .../CaseField-SettleDiscontinue-nonprod.json | 28 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 87fb42750a..a45509007b 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -244,7 +244,7 @@ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE" ], - "CRUD": "CRU" + "CRUD": "R" } ] }, diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 2c01e80e55..c50e01066c 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -218,7 +218,7 @@ "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 5, + "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" @@ -230,7 +230,7 @@ "PageID": "DiscontinuingAgainstDefendants", "PageLabel": "Discontinuing against defendants", "PageDisplayOrder": 5, - "PageFieldDisplayOrder": 7, + "PageFieldDisplayOrder": 5, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N", @@ -255,7 +255,7 @@ "PageID": "DiscontinuanceType", "PageLabel": "Type of Discontinuance", "PageDisplayOrder": 6, - "PageFieldDisplayOrder": 3, + "PageFieldDisplayOrder":2, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "Y" @@ -267,7 +267,7 @@ "PageID":"DiscontinuanceType", "PageLabel":"Type of Discontinuance", "PageDisplayOrder":6, - "PageFieldDisplayOrder":4, + "PageFieldDisplayOrder":3, "PageColumnNumber":1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption":"Y", diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index ea46078904..b15ada836a 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -23,14 +23,6 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL", - "ID": "partiesNamesTD", - "Label": "**${caseNameHmctsInternal}**", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL", "ID": "markPaidForAllClaimants", @@ -92,7 +84,7 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNames3", - "Label": "**${caseNameHmctsInternal}**", + "Label": "**${caseNameHmctsInternal}** \n****", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -127,7 +119,7 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNamesDD", - "Label": "**${caseNameHmctsInternal}**", + "Label": "**${caseNameHmctsInternal}** \n****", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -152,7 +144,7 @@ { "CaseTypeID": "CIVIL", "ID": "partiesNames4", - "Label": "**${caseNameHmctsInternal}**", + "Label": "**${caseNameHmctsInternal}** \n****", "FieldType": "Label", "SecurityClassification": "Public", "Searchable": "N" @@ -182,6 +174,14 @@ "SecurityClassification":"Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL", + "ID": "partiesNamesTD", + "Label": "**${caseNameHmctsInternal}** \n****", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL", "ID": "typeOfDiscontinuance", @@ -192,11 +192,11 @@ "Searchable": "N" }, { - "CaseTypeID":"CIVIL", - "ID":"partDiscontinuanceDetails", + "CaseTypeID": "CIVIL", + "ID": "partDiscontinuanceDetails", "Label": "Which part of the claim do you want to discontinue?", "FieldType": "TextArea", "SecurityClassification":"Public", - "Searchable":"N" + "Searchable": "N" } ] From 57052f0b1e240d343c505221223960e21017a7b4 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Thu, 4 Jul 2024 17:51:06 +0100 Subject: [PATCH 57/77] CIV-14236 Update Validate discontinuance screens --- ...onCaseField-SettleDiscontinue-nonprod.json | 19 +++------------- ...Discontinue-SettleDiscontinue-nonprod.json | 22 +++++-------------- .../CaseField-SettleDiscontinue-nonprod.json | 15 +++---------- 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index c37691a1c0..38ead06276 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -341,20 +341,7 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "judgeNameInput", - "AccessControl": [ - { - "UserRoles": [ - "caseworker-civil-admin", - "caseworker-civil-staff" - ], - "CRUD": "CRU" - } - ] - }, - { - "CaseTypeID": "CIVIL", - "CaseFieldID": "onDateLbl", + "CaseFieldID": "permissionGrantedJudgeCopy", "AccessControl": [ { "UserRoles": [ @@ -367,14 +354,14 @@ }, { "CaseTypeID": "CIVIL", - "CaseFieldID": "onDate", + "CaseFieldID": "permissionGrantedDateCopy", "AccessControl": [ { "UserRoles": [ "caseworker-civil-admin", "caseworker-civil-staff" ], - "CRUD": "CRU" + "CRUD": "R" } ] }, diff --git a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json index 0978c1fd1c..f7cd5b4fcb 100644 --- a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json @@ -14,19 +14,19 @@ { "CaseTypeID": "CIVIL", "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "judgeNameInput", + "CaseFieldID": "permissionGrantedJudgeCopy", "PageID": "ValidateDiscontinuance", "PageLabel": "Validate order information", "PageDisplayOrder": 1, "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, - "DisplayContext": "MANDATORY", + "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" }, { "CaseTypeID": "CIVIL", "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "onDateLbl", + "CaseFieldID": "permissionGrantedDateCopy", "PageID": "ValidateDiscontinuance", "PageLabel": "Validate order information", "PageDisplayOrder": 1, @@ -35,18 +35,6 @@ "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" }, - { - "CaseTypeID": "CIVIL", - "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "CaseFieldID": "onDate", - "PageID": "ValidateDiscontinuance", - "PageLabel": "Validate order information", - "PageDisplayOrder": 1, - "PageFieldDisplayOrder": 4, - "PageColumnNumber": 1, - "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "N" - }, { "CaseTypeID": "CIVIL", "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", @@ -54,7 +42,7 @@ "PageID": "ValidateDiscontinuance", "PageLabel": "Validate order information", "PageDisplayOrder": 1, - "PageFieldDisplayOrder": 5, + "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "READONLY", "ShowSummaryChangeOption": "N" @@ -66,7 +54,7 @@ "PageID": "ValidateDiscontinuance", "PageLabel": "Validate order information", "PageDisplayOrder": 1, - "PageFieldDisplayOrder": 6, + "PageFieldDisplayOrder": 5, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", "ShowSummaryChangeOption": "N" diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index bcb828588f..f140d62180 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -209,7 +209,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "judgeNameInput", + "ID": "permissionGrantedJudgeCopy", "Label": "Judge name", "FieldType": "Text", "SecurityClassification": "Public", @@ -217,17 +217,8 @@ }, { "CaseTypeID": "CIVIL", - "ID": "onDateLbl", - "Label": "### On date", - "FieldType": "Label", - "SecurityClassification": "Public", - "Searchable": "N" - }, - { - "CaseTypeID": "CIVIL", - "ID": "onDate", - "Label": " ", - "HintText": "For example, 16 4 2021", + "ID": "permissionGrantedDateCopy", + "Label": "On date", "FieldType": "Date", "SecurityClassification": "Public", "Searchable": "N" From 55c2ad77c2b97de54f50ebef46d7ca5547e7f407 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Thu, 4 Jul 2024 18:25:06 +0100 Subject: [PATCH 58/77] CIV-14194 initial commit --- ...risationCaseState-settleDiscontinue-nonprod.json | 13 +++++++++++++ .../User/UserEvents-SettleDiscontinue-nonprod.json | 2 ++ .../DiscontinueClaim-SettleDiscontinue-nonprod.json | 4 ++-- ccd-definition/State.json | 7 +++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json index d9909285d5..40ac9c1158 100644 --- a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json @@ -10,5 +10,18 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseStateID": "CASE_DISCONTINUED", + "AccessControl": [ + { + "UserRoles": [ + "APP-SOL-UNSPEC-PROFILE", + "APP-SOL-SPEC-PROFILE" + ], + "CRUD": "CRU" + } + ] } ] diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index a16950e3f7..22fc126479 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -45,6 +45,8 @@ "ShowSummary": "Y", "ShowEventNotes": "N", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", "RetriesTimeoutAboutToStartEvent": 0 } ] diff --git a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json index 9b596545b9..37026866bd 100644 --- a/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/DiscontinueClaim-SettleDiscontinue-nonprod.json @@ -92,7 +92,7 @@ "PageFieldDisplayOrder": 2, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "N" + "ShowSummaryChangeOption": "Y" }, { "CaseTypeID":"CIVIL", @@ -219,7 +219,7 @@ "PageFieldDisplayOrder": 4, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "N" + "ShowSummaryChangeOption": "Y" }, { "CaseTypeID": "CIVIL", diff --git a/ccd-definition/State.json b/ccd-definition/State.json index 9f426c6d9c..8aa27a62ea 100644 --- a/ccd-definition/State.json +++ b/ccd-definition/State.json @@ -117,5 +117,12 @@ "Name": "Closed", "Description": "Closed", "DisplayOrder": 17 + }, + { + "CaseTypeID": "CIVIL", + "ID": "CASE_DISCONTINUED", + "Name": "Case Discontinued", + "Description": "Case Discontinued", + "DisplayOrder": 18 } ] From beaa7f00d2549dda6c4bc14ed2234e3c8425f555 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Fri, 5 Jul 2024 16:30:20 +0100 Subject: [PATCH 59/77] CIV-14194 testcase added --- ...onCaseState-settleDiscontinue-nonprod.json | 4 ++- e2e/api/steps_LRspec.js | 26 ++++++++++++----- .../events/discontinueClaim2v1Spec.js | 29 ++++++++++++++----- ..._settle_discontinue_claim_2v1_spec_test.js | 8 +++++ 4 files changed, 52 insertions(+), 15 deletions(-) diff --git a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json index 40ac9c1158..c06682d8a0 100644 --- a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json @@ -18,7 +18,9 @@ { "UserRoles": [ "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" + "APP-SOL-SPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-systemupdate" ], "CRUD": "CRU" } diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index ebf0e912fd..364a52eb7a 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1669,13 +1669,25 @@ module.exports = { await assertValidData(disposalData, pageId); } - //TODO: Check the correct final submit state for discontinue claim - /*await assertSubmittedEvent('PROCEEDS_IN_HERITAGE_SYSTEM', { - header: '### Request is being reviewed', - body: '' - }, true);*/ - - await waitForFinishedBusinessProcess(caseId); + if (mpScenario === 'TWO_V_ONE') { //divergent + await assertSubmittedEvent('AWAITING_RESPONDENT_ACKNOWLEDGEMENT', { + header: '# We have noted your claim has been partly discontinued and your claim has been updated', + body: '' + }, true); + await waitForFinishedBusinessProcess(caseId); + } else if (mpScenario === 'ONE_V_TWO') { //non divergent + await assertSubmittedEvent('CASE_DISCONTINUED', { + header: '# Your claim has been discontinued', + body: '' + }, true); + await waitForFinishedBusinessProcess(caseId); + } else { + await assertSubmittedEvent('AWAITING_RESPONDENT_ACKNOWLEDGEMENT', { + header: '# Your request is being reviewed', + body: '' + }, true); + await waitForFinishedBusinessProcess(caseId); + } } }; diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index a5168e4d60..db3c6ea1df 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -19,13 +19,7 @@ module.exports = { }, DiscontinuingAgainstDefendants: { respondent2Represented: 'Yes', - isDiscontinuingAgainstBothDefendants: 'NO', - discontinuingAgainstOneDefendant: { - value: { - code: '321820a6-36cf-4fb2-9e78-2f34874ea9e8', - label: 'Second Defendant' - } - } + isDiscontinuingAgainstBothDefendants: 'YES', }, DiscontinuanceType: { typeOfDiscontinuance:'FULL_DISCONTINUANCE' @@ -68,6 +62,27 @@ module.exports = { }; } break; + case 'ONE_V_ONE': { + data.userInput = { + courtPermission: { + courtPermissionNeeded: 'YES', + courtPermissionNeededChecked: [ + 'CourtPermissionNeededChecked' + ] + }, + PermissionGranted: { + isPermissionGranted:'YES', + permissionGrantedComplex:{ + permissionGrantedJudge:'test', + permissionGrantedDate:'2023-02-01' + } + }, + DiscontinuanceType: { + typeOfDiscontinuance:'FULL_DISCONTINUANCE' + } + }; + } + break; } return data; } diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index 9083413f23..3e2899c60a 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -31,6 +31,14 @@ Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { } }); +Scenario('Discontinue claim 1v1 scenario', async ({I, api_spec}) => { + if (['preview', 'demo'].includes(config.runningEnv)) { + let mpScenario = 'ONE_V_ONE'; + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + } +}); + AfterSuite(async ({api_spec}) => { await api_spec.cleanUp(); }); From 02517033d267c92b0f0736dc0cb5fb9be49cb4ae Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Mon, 8 Jul 2024 09:40:48 +0100 Subject: [PATCH 60/77] CIV-14194 updated testcase --- .../AuthorisationCaseState-settleDiscontinue-nonprod.json | 1 - e2e/api/steps_LRspec.js | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json index c06682d8a0..3314030db8 100644 --- a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json @@ -19,7 +19,6 @@ "UserRoles": [ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE", - "caseworker-civil-admin", "caseworker-civil-systemupdate" ], "CRUD": "CRU" diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 364a52eb7a..9035d956a1 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1669,25 +1669,23 @@ module.exports = { await assertValidData(disposalData, pageId); } - if (mpScenario === 'TWO_V_ONE') { //divergent + if (mpScenario === 'TWO_V_ONE') { await assertSubmittedEvent('AWAITING_RESPONDENT_ACKNOWLEDGEMENT', { header: '# We have noted your claim has been partly discontinued and your claim has been updated', body: '' }, true); - await waitForFinishedBusinessProcess(caseId); - } else if (mpScenario === 'ONE_V_TWO') { //non divergent + } else if (mpScenario === 'ONE_V_TWO') { await assertSubmittedEvent('CASE_DISCONTINUED', { header: '# Your claim has been discontinued', body: '' }, true); - await waitForFinishedBusinessProcess(caseId); } else { await assertSubmittedEvent('AWAITING_RESPONDENT_ACKNOWLEDGEMENT', { header: '# Your request is being reviewed', body: '' }, true); - await waitForFinishedBusinessProcess(caseId); } + await waitForFinishedBusinessProcess(caseId); } }; From f8afcb1f85f9ac62fb645a3d0d747ee40648c8e3 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Mon, 8 Jul 2024 10:14:06 +0100 Subject: [PATCH 61/77] CIV-14236 update permissions --- .../AuthorisationCaseField-SettleDiscontinue-nonprod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 38ead06276..4cfee3a236 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -348,7 +348,7 @@ "caseworker-civil-admin", "caseworker-civil-staff" ], - "CRUD": "R" + "CRUD": "CR" } ] }, @@ -361,7 +361,7 @@ "caseworker-civil-admin", "caseworker-civil-staff" ], - "CRUD": "R" + "CRUD": "CR" } ] }, From f2bd9bf68c14c172074ed021a44874e367655372 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Mon, 8 Jul 2024 15:57:11 +0100 Subject: [PATCH 62/77] CIV-14236 Fix variable issue --- .../CaseField/CaseField-SettleDiscontinue-nonprod.json | 2 +- .../ConfirmOrderGivesPermissionList-nonprod.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json index f140d62180..4f80f84bfe 100644 --- a/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseField/CaseField-SettleDiscontinue-nonprod.json @@ -236,7 +236,7 @@ "ID": "confirmOrderGivesPermission", "Label": " ", "FieldType": "FixedRadioList", - "FieldTypeParameter": "ConfirmOrderGivesPermissionList", + "FieldTypeParameter": "ConfirmOrderGivesPermission", "SecurityClassification": "Public", "Searchable": "N" } diff --git a/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json b/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json index d7f9e1269c..eb25820534 100644 --- a/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json +++ b/ccd-definition/FixedLists/SettleDiscontinue/ConfirmOrderGivesPermissionList-nonprod.json @@ -1,12 +1,12 @@ [ { - "ID": "ConfirmOrderGivesPermissionList", + "ID": "ConfirmOrderGivesPermission", "ListElementCode": "YES", "ListElement": "Yes - generate a Notice of Discontinuance", "DisplayOrder": 1 }, { - "ID": "ConfirmOrderGivesPermissionList", + "ID": "ConfirmOrderGivesPermission", "ListElementCode": "NO", "ListElement": "No - the claimant will be notified and requested to resubmit", "DisplayOrder": 2 From 3d496b71619dc03f03f1ce7607fec4ca91d1abde Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 9 Jul 2024 21:00:22 +0100 Subject: [PATCH 63/77] CIV-14236 Add API tests --- e2e/api/steps_LRspec.js | 33 +++++++++++++++++++ .../validateDiscontinueClaimClaimantSpec.js | 29 ++++++++++++++++ ..._settle_discontinue_claim_2v1_spec_test.js | 30 +++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 9035d956a1..3a35f468dc 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -37,6 +37,7 @@ const evidenceUploadApplicant = require('../fixtures/events/evidenceUploadApplic const evidenceUploadRespondent = require('../fixtures/events/evidenceUploadRespondent'); const settleClaim1v1Spec = require('../fixtures/events/settleClaim1v1Spec'); const discontinueClaim2v1Spec = require('../fixtures/events/discontinueClaim2v1Spec'); +const validateDiscontinueClaimClaimantSpec = require('../fixtures/events/validateDiscontinueClaimClaimantSpec'); const {cloneDeep} = require('lodash'); const {adjustCaseSubmittedDateForMinti, getMintiTrackByClaimAmount, assertTrackAfterClaimCreation} = require('../helpers/mintiHelper'); @@ -85,6 +86,7 @@ const data = { SETTLE_CLAIM_MARK_PAID_FULL: (addApplicant2) => settleClaim1v1Spec.settleClaim(addApplicant2), SETTLE_CLAIM_MARK_PAID_FULL_SELECT_CLAIMANT: (addApplicant2) => settleClaim1v1Spec.claimantDetails(addApplicant2), DISCONTINUE_CLAIM: (mpScenario) => discontinueClaim2v1Spec.discontinueClaim(mpScenario), + VALIDATE_DISCONTINUE_CLAIM_CLAIMANT: (permission) => validateDiscontinueClaimClaimantSpec.validateDiscontinueClaimClaimant(permission), }; const eventData = { @@ -1686,6 +1688,37 @@ module.exports = { }, true); } await waitForFinishedBusinessProcess(caseId); + }, + + validateDiscontinueClaimClaimant: async (user, permission) => { + console.log('discontinueClaim for case id ' + caseId); + await apiRequest.setupTokens(user); + eventName = 'VALIDATE_DISCONTINUE_CLAIM_CLAIMANT'; + + let returnedCaseData = await apiRequest.startEvent(eventName, caseId); + delete returnedCaseData['SearchCriteria']; + caseData = returnedCaseData; + + assertContainsPopulatedFields(returnedCaseData); + + let disposalData = data.VALIDATE_DISCONTINUE_CLAIM_CLAIMANT(permission); + for (let pageId of Object.keys(disposalData.userInput)) { + await assertValidData(disposalData, pageId); + } + + if (permission === 'YES') { + await assertSubmittedEvent('CASE_DISCONTINUED', { + header: '# Information successfully validated', + body: '### Next steps:\n\n No further action required.' + }, true); + await waitForFinishedBusinessProcess(caseId); + } else { + await assertSubmittedEvent('AWAITING_RESPONDENT_ACKNOWLEDGEMENT', { + header: '# Unable to validate information', + body: '### Next steps:\n\n No further action required.' + }, true); + await waitForFinishedBusinessProcess(caseId); + } } }; diff --git a/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js b/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js new file mode 100644 index 0000000000..ffb0c1794e --- /dev/null +++ b/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js @@ -0,0 +1,29 @@ +module.exports = { + validateDiscontinueClaimClaimant: (permission) => { + const data ={}; + switch (permission) { + case 'YES': { + data.userInput = { + ValidateDiscontinuance: { + confirmOrderGivesPermission: 'YES', + permissionGrantedDateCopy: '2024-05-02', + permissionGrantedJudgeCopy: 'Judge name' + } + }; + } + break; + + case 'NO': { + data.userInput = { + ValidateDiscontinuance: { + confirmOrderGivesPermission: 'NO', + permissionGrantedDateCopy: '2024-05-02', + permissionGrantedJudgeCopy: 'Judge name' + } + }; + } + break; + } + return data; + } +}; diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index 3e2899c60a..91f885016e 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -39,6 +39,36 @@ Scenario('Discontinue claim 1v1 scenario', async ({I, api_spec}) => { } }); +Scenario('Validate discontinue claim claimant 1v1 scenario', async ({I, api_spec}) => { + if (['preview', 'demo'].includes(config.runningEnv)) { + let mpScenario = 'ONE_V_ONE'; + let permission = 'YES'; + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); + } +}); + +Scenario('Validate discontinue claim claimant 1v2 scenario', async ({I, api_spec}) => { + if (['preview', 'demo'].includes(config.runningEnv)) { + let mpScenario = 'ONE_V_TWO'; + let permission = 'YES'; + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); + } +}); + +Scenario('Validate discontinue claim claimant 1v2 negative scenario', async ({I, api_spec}) => { + if (['preview', 'demo'].includes(config.runningEnv)) { + let mpScenario = 'ONE_V_TWO'; + let permission = 'NO'; + await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); + } +}); + AfterSuite(async ({api_spec}) => { await api_spec.cleanUp(); }); From 62aae890c788a37f38bc95c2a2cc9f10f31f6ad0 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 9 Jul 2024 23:22:04 +0100 Subject: [PATCH 64/77] CIV-14236 Add API tests --- e2e/api/steps_LRspec.js | 4 ++-- e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js | 6 +++--- .../api_settle_discontinue_claim_2v1_spec_test.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index 3a35f468dc..1147fdc7d2 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1709,13 +1709,13 @@ module.exports = { if (permission === 'YES') { await assertSubmittedEvent('CASE_DISCONTINUED', { header: '# Information successfully validated', - body: '### Next steps:\n\n No further action required.' + body: '### Next steps:\n\nNo further action required.' }, true); await waitForFinishedBusinessProcess(caseId); } else { await assertSubmittedEvent('AWAITING_RESPONDENT_ACKNOWLEDGEMENT', { header: '# Unable to validate information', - body: '### Next steps:\n\n No further action required.' + body: '### Next steps:\n\nNo further action required.' }, true); await waitForFinishedBusinessProcess(caseId); } diff --git a/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js b/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js index ffb0c1794e..5f55753ae4 100644 --- a/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js +++ b/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js @@ -6,7 +6,7 @@ module.exports = { data.userInput = { ValidateDiscontinuance: { confirmOrderGivesPermission: 'YES', - permissionGrantedDateCopy: '2024-05-02', + permissionGrantedDateCopy: '2024-06-03', permissionGrantedJudgeCopy: 'Judge name' } }; @@ -16,8 +16,8 @@ module.exports = { case 'NO': { data.userInput = { ValidateDiscontinuance: { - confirmOrderGivesPermission: 'NO', - permissionGrantedDateCopy: '2024-05-02', + confirmOrderGivesPermission: 'YES', + permissionGrantedDateCopy: '2024-08-04', permissionGrantedJudgeCopy: 'Judge name' } }; diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index 91f885016e..3bd85129e2 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -2,7 +2,7 @@ const config = require('../../../config.js'); const caseWorkerUser = config.hearingCenterAdminWithRegionId2; -// To use on local because the idam images are different +// To use on local because the idam images are different: // const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local; Feature('CCD Settle and discontinue claim 2v1 API test @api-spec @api-nonprod @api-settle-discont'); From d04266b4370e8cc69d23c5c77474f4a1aa1b175e Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 10 Jul 2024 10:03:31 +0100 Subject: [PATCH 65/77] CIV-14236 Fix merge issue --- .../UserEvents-SettleDiscontinue-nonprod.json | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json index aa7814cd56..97b842fef0 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -57,6 +57,7 @@ "DisplayOrder": 15, "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", "PostConditionState": "*", + "EventEnablingCondition": "isPermissionGranted = \"YES\"", "SecurityClassification": "Public", "ShowSummary": "N", "ShowEventNotes": "N", @@ -64,20 +65,5 @@ "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", "RetriesTimeoutAboutToStartEvent": 0 - }, - { - "CaseTypeID": "CIVIL", - "ID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", - "Name": "Validate discontinuance", - "Description": "Validate discontinuance", - "DisplayOrder": 15, - "PreConditionState(s)": "AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;IN_MEDIATION;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING;DECISION_OUTCOME", - "PostConditionState": "*", - "EventEnablingCondition": "isPermissionGranted = \"YES\"", - "SecurityClassification": "Public", - "ShowSummary": "N", - "ShowEventNotes": "N", - "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", - "RetriesTimeoutAboutToStartEvent": 0 } ] From dbc3c98c959be8a0188df70a0bca29a58c1bcd09 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 10 Jul 2024 13:08:17 +0100 Subject: [PATCH 66/77] CIV-14236 Fix API tests --- .../events/discontinueClaim2v1Spec.js | 25 +++++++++++++++++++ .../validateDiscontinueClaimClaimantSpec.js | 2 +- ..._settle_discontinue_claim_2v1_spec_test.js | 4 +-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/e2e/fixtures/events/discontinueClaim2v1Spec.js b/e2e/fixtures/events/discontinueClaim2v1Spec.js index db3c6ea1df..99c89ba632 100644 --- a/e2e/fixtures/events/discontinueClaim2v1Spec.js +++ b/e2e/fixtures/events/discontinueClaim2v1Spec.js @@ -83,6 +83,31 @@ module.exports = { }; } break; + case 'ONE_V_TWO_P_NEEDED': { + data.userInput = { + courtPermission: { + courtPermissionNeeded: 'YES', + courtPermissionNeededChecked: [ + 'CourtPermissionNeededChecked' + ] + }, + PermissionGranted: { + isPermissionGranted:'YES', + permissionGrantedComplex:{ + permissionGrantedJudge:'test', + permissionGrantedDate:'2023-02-01' + } + }, + DiscontinuingAgainstDefendants: { + respondent2Represented: 'Yes', + isDiscontinuingAgainstBothDefendants: 'YES', + }, + DiscontinuanceType: { + typeOfDiscontinuance:'FULL_DISCONTINUANCE' + } + }; + } + break; } return data; } diff --git a/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js b/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js index 5f55753ae4..d50d18841e 100644 --- a/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js +++ b/e2e/fixtures/events/validateDiscontinueClaimClaimantSpec.js @@ -16,7 +16,7 @@ module.exports = { case 'NO': { data.userInput = { ValidateDiscontinuance: { - confirmOrderGivesPermission: 'YES', + confirmOrderGivesPermission: 'NO', permissionGrantedDateCopy: '2024-08-04', permissionGrantedJudgeCopy: 'Judge name' } diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index 3bd85129e2..1eaea7eb66 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -54,7 +54,7 @@ Scenario('Validate discontinue claim claimant 1v2 scenario', async ({I, api_spec let mpScenario = 'ONE_V_TWO'; let permission = 'YES'; await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, 'ONE_V_TWO_P_NEEDED'); await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); } }); @@ -64,7 +64,7 @@ Scenario('Validate discontinue claim claimant 1v2 negative scenario', async ({I, let mpScenario = 'ONE_V_TWO'; let permission = 'NO'; await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.discontinueClaim(config.applicantSolicitorUser, 'ONE_V_TWO_P_NEEDED'); await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); } }); From c2055841fbb6a87057e6a5e8671bca0d07d596b6 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 10 Jul 2024 13:49:06 +0100 Subject: [PATCH 67/77] CIV-14236 Fix permission --- .../AuthorisationCaseState-settleDiscontinue-nonprod.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json index 532d4aaa17..803abe2fc7 100644 --- a/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseState/AuthorisationCaseState-settleDiscontinue-nonprod.json @@ -28,6 +28,8 @@ "UserRoles": [ "APP-SOL-UNSPEC-PROFILE", "APP-SOL-SPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-staff", "caseworker-civil-systemupdate" ], "CRUD": "CRU" From 2e8e7603a19c6ea084f219ebdbc375d40626e763 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Fri, 12 Jul 2024 14:24:27 +0100 Subject: [PATCH 68/77] CIV-14295 Notification events and permissions --- ...onCaseEvent-SettleDiscontinue-nonprod.json | 19 +++++++++++++++++++ ...onCaseField-SettleDiscontinue-nonprod.json | 3 ++- ...ationEvents-SettleDiscontinue-nonprod.json | 14 +++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index 7ac9990b0c..b77f0d5a0c 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -95,5 +95,24 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "NOTIFY_VALIDATION_FAILURE_CLAIMANT", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-systemupdate" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "R" + } + ] } ] diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 0b89ad3cf6..002d3e5163 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -407,7 +407,8 @@ { "UserRoles": [ "caseworker-civil-admin", - "caseworker-civil-staff" + "caseworker-civil-staff", + "caseworker-civil-systemupdate" ], "CRUD": "CRU" } diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json index bf3ebc93b0..20ce0e5cb2 100644 --- a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json @@ -24,6 +24,18 @@ "ShowSummary": "N", "ShowEventNotes": "N", "RetriesTimeoutURLAboutToSubmitEvent": 0 + }, + { + "CaseTypeID": "CIVIL", + "ID": "NOTIFY_VALIDATION_FAILURE_CLAIMANT", + "Name": "Notify Validation Failure Claimant", + "Description": "Notify Validation Failure Claimant", + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "ShowSummary": "N", + "ShowEventNotes": "N", + "RetriesTimeoutURLAboutToSubmitEvent": 0 } - ] From dc479cc98dc2ceb825407b754a4b76f759529ff7 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Mon, 15 Jul 2024 13:23:36 +0100 Subject: [PATCH 69/77] CIV-14295 Add new notification --- .../Camunda/NotificationEvents-SettleDiscontinue-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json index 20ce0e5cb2..4475aa5f0d 100644 --- a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json @@ -28,7 +28,7 @@ { "CaseTypeID": "CIVIL", "ID": "NOTIFY_VALIDATION_FAILURE_CLAIMANT", - "Name": "Notify Validation Failure Claimant", + "Name": "Notify Validation Failure", "Description": "Notify Validation Failure Claimant", "PreConditionState(s)": "*", "PostConditionState": "*", From b349a2aa604fa9f382ce7f053982678c99528b0d Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Mon, 15 Jul 2024 15:39:36 +0100 Subject: [PATCH 70/77] CIV-14295 Update event name --- .../AuthorisationCaseEvent-SettleDiscontinue-nonprod.json | 2 +- .../Camunda/NotificationEvents-SettleDiscontinue-nonprod.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index b77f0d5a0c..a853ead691 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -98,7 +98,7 @@ }, { "CaseTypeID": "CIVIL", - "CaseEventID": "NOTIFY_VALIDATION_FAILURE_CLAIMANT", + "CaseEventID": "NOTIFY_CLAIMANT_LR_VALIDATION_DICONTINUANCE_FAILURE", "AccessControl": [ { "UserRoles": [ diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json index 4475aa5f0d..4af1bc74d8 100644 --- a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json @@ -27,7 +27,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "NOTIFY_VALIDATION_FAILURE_CLAIMANT", + "ID": "NOTIFY_CLAIMANT_LR_VALIDATION_DICONTINUANCE_FAILURE", "Name": "Notify Validation Failure", "Description": "Notify Validation Failure Claimant", "PreConditionState(s)": "*", From 81bfa31cbf63363a921c57b7787062d42a3b9270 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 16 Jul 2024 09:21:49 +0100 Subject: [PATCH 71/77] CIV-14295 Update event name --- .../AuthorisationCaseEvent-SettleDiscontinue-nonprod.json | 2 +- .../Camunda/NotificationEvents-SettleDiscontinue-nonprod.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index a853ead691..247df94fe7 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -98,7 +98,7 @@ }, { "CaseTypeID": "CIVIL", - "CaseEventID": "NOTIFY_CLAIMANT_LR_VALIDATION_DICONTINUANCE_FAILURE", + "CaseEventID": "NOTIFY_VALIDATION_DICONTINUANCE_FAILURE_CLAIMANT", "AccessControl": [ { "UserRoles": [ diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json index 4af1bc74d8..4241534b84 100644 --- a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json @@ -27,7 +27,7 @@ }, { "CaseTypeID": "CIVIL", - "ID": "NOTIFY_CLAIMANT_LR_VALIDATION_DICONTINUANCE_FAILURE", + "ID": "NOTIFY_VALIDATION_DICONTINUANCE_FAILURE_CLAIMANT", "Name": "Notify Validation Failure", "Description": "Notify Validation Failure Claimant", "PreConditionState(s)": "*", From 3e4fef937ba0a189b99ef687fd5d832b4c8e077e Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 16 Jul 2024 10:56:33 +0100 Subject: [PATCH 72/77] CIV-14295 Add new camunda event --- ...onCaseEvent-SettleDiscontinue-nonprod.json | 19 +++++++++++++++++++ ...ationEvents-SettleDiscontinue-nonprod.json | 13 +++++++++++++ 2 files changed, 32 insertions(+) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json index 247df94fe7..e446a34512 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json @@ -114,5 +114,24 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "UPDATE_VISIBILITY_NOTICE_OF_DISCONTINUANCE", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-systemupdate" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "R" + } + ] } ] diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json index 4241534b84..1c1991c779 100644 --- a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json @@ -37,5 +37,18 @@ "ShowSummary": "N", "ShowEventNotes": "N", "RetriesTimeoutURLAboutToSubmitEvent": 0 + }, + { + "CaseTypeID": "CIVIL", + "ID": "UPDATE_VISIBILITY_NOTICE_OF_DISCONTINUANCE", + "Name": "Update Visibility Notice Disc", + "Description": "Update Visibility Notice of Discontinuance", + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "ShowSummary": "N", + "ShowEventNotes": "N", + "RetriesTimeoutURLAboutToSubmitEvent": 0 } ] From 92b201cbefecbdb4cc80ad4b20a33e158cbe151d Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 16 Jul 2024 12:24:06 +0100 Subject: [PATCH 73/77] CIV-14295 Update API tests user for local --- ..._settle_discontinue_claim_2v1_spec_test.js | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js index 1eaea7eb66..625e6a54c2 100644 --- a/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js +++ b/e2e/tests/api_tests/settle-discontinue/api_settle_discontinue_claim_2v1_spec_test.js @@ -1,41 +1,42 @@ /* eslint-disable no-unused-vars */ const config = require('../../../config.js'); +const solicitorUser = config.applicantSolicitorUser; const caseWorkerUser = config.hearingCenterAdminWithRegionId2; // To use on local because the idam images are different: -// const caseWorkerUser = config.tribunalCaseworkerWithRegionId1Local; +// const caseWorkerUser = config.hearingCenterAdminLocal; Feature('CCD Settle and discontinue claim 2v1 API test @api-spec @api-nonprod @api-settle-discont'); Scenario('Settle claim 2v1 scenario', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'TWO_V_ONE'); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, 'TWO_V_ONE'); await api_spec.createCaseFlags(caseWorkerUser); await api_spec.manageCaseFlags(caseWorkerUser); - await api_spec.settleClaimSelectClaimant(config.applicantSolicitorUser, 'YES'); + await api_spec.settleClaimSelectClaimant(solicitorUser, 'YES'); } }); Scenario('Discontinue claim 1v2 scenario', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { let mpScenario = 'ONE_V_TWO'; - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario); + await api_spec.discontinueClaim(solicitorUser, mpScenario); } }); Scenario('Discontinue claim 2v1 scenario', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { let mpScenario = 'TWO_V_ONE'; - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario); + await api_spec.discontinueClaim(solicitorUser, mpScenario); } }); Scenario('Discontinue claim 1v1 scenario', async ({I, api_spec}) => { if (['preview', 'demo'].includes(config.runningEnv)) { let mpScenario = 'ONE_V_ONE'; - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario); + await api_spec.discontinueClaim(solicitorUser, mpScenario); } }); @@ -43,8 +44,8 @@ Scenario('Validate discontinue claim claimant 1v1 scenario', async ({I, api_spec if (['preview', 'demo'].includes(config.runningEnv)) { let mpScenario = 'ONE_V_ONE'; let permission = 'YES'; - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, mpScenario); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario); + await api_spec.discontinueClaim(solicitorUser, mpScenario); await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); } }); @@ -53,8 +54,8 @@ Scenario('Validate discontinue claim claimant 1v2 scenario', async ({I, api_spec if (['preview', 'demo'].includes(config.runningEnv)) { let mpScenario = 'ONE_V_TWO'; let permission = 'YES'; - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, 'ONE_V_TWO_P_NEEDED'); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario); + await api_spec.discontinueClaim(solicitorUser, 'ONE_V_TWO_P_NEEDED'); await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); } }); @@ -63,8 +64,8 @@ Scenario('Validate discontinue claim claimant 1v2 negative scenario', async ({I, if (['preview', 'demo'].includes(config.runningEnv)) { let mpScenario = 'ONE_V_TWO'; let permission = 'NO'; - await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); - await api_spec.discontinueClaim(config.applicantSolicitorUser, 'ONE_V_TWO_P_NEEDED'); + await api_spec.createClaimWithRepresentedRespondent(solicitorUser, mpScenario); + await api_spec.discontinueClaim(solicitorUser, 'ONE_V_TWO_P_NEEDED'); await api_spec.validateDiscontinueClaimClaimant(caseWorkerUser, permission); } }); From 43415754800f9b3a7e25ce11854ca5be4a23fff7 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 16 Jul 2024 15:51:47 +0100 Subject: [PATCH 74/77] CIV-14295 test pr --- 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..2589bd57cc 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-5075' keyVaults: civil: resourceGroup: civil From dfae9e5208d3ed42f1fb8fe1fc789bdf0f3c4552 Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Tue, 16 Jul 2024 16:00:13 +0100 Subject: [PATCH 75/77] CIV-14295 test pr --- Jenkinsfile_CNP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 4c8d1b3905..85d54c7a25 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -6,7 +6,7 @@ import uk.gov.hmcts.contino.GithubAPI def type = "nodejs" def product = "civil" def component = "ccd" -def camundaBranch = "master" +def camundaBranch = "feat/CIV-14295" def dmnBranch = "master" def waStandaloneBranch = "master" From bee7cc5dcdaf13957ebdcf675e689dd9bc18d6cc Mon Sep 17 00:00:00 2001 From: hmcts-version1-ignacio Date: Wed, 17 Jul 2024 10:41:53 +0100 Subject: [PATCH 76/77] CIV-14295 fix charts --- .../civil-ccd/values.enableNotifyEmails.preview.template.yaml | 2 +- charts/civil-ccd/values.preview.template.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/civil-ccd/values.enableNotifyEmails.preview.template.yaml b/charts/civil-ccd/values.enableNotifyEmails.preview.template.yaml index 58b1eb03de..caa3110f12 100644 --- a/charts/civil-ccd/values.enableNotifyEmails.preview.template.yaml +++ b/charts/civil-ccd/values.enableNotifyEmails.preview.template.yaml @@ -1,6 +1,6 @@ civil-service: java: - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-5075' keyVaults: civil: resourceGroup: civil diff --git a/charts/civil-ccd/values.preview.template.yaml b/charts/civil-ccd/values.preview.template.yaml index 2589bd57cc..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-5075' + image: 'hmctspublic.azurecr.io/civil/service:latest' keyVaults: civil: resourceGroup: civil From 262ca2688b496187d7a69ebfc43d9bced98afc1e Mon Sep 17 00:00:00 2001 From: Azam <106387766+Azam-Hmcts@users.noreply.github.com> Date: Thu, 18 Jul 2024 17:34:37 +0100 Subject: [PATCH 77/77] Update Jenkinsfile_CNP --- Jenkinsfile_CNP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 85d54c7a25..4c8d1b3905 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -6,7 +6,7 @@ import uk.gov.hmcts.contino.GithubAPI def type = "nodejs" def product = "civil" def component = "ccd" -def camundaBranch = "feat/CIV-14295" +def camundaBranch = "master" def dmnBranch = "master" def waStandaloneBranch = "master"