From 2015a98c2a0874ae2264d1514f1b81b36b92e81e Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Date: Wed, 31 Jul 2024 12:42:06 +0100 Subject: [PATCH] CIV-14440 Validate Discontinuance Claim Claimant (#4654) * CIV-14112 Added ccd event for discontinue claim * CIV-14112 Changed ccd event id * CIV-14112 Fix event name * CIV-14112 Fix event name * CIV-14112 Fix precondition states * Update UserEvents-SettleDiscontinue-nonprod.json * CIV-14128: Initial Commit * CIV-14128:Added midEvent for new Claim Consent page * CIV-14128:Added page title for Claimant Consent screen * CIV-14128:Removed the file as its not needed * CIV-14145 CCD changes for add the court permission view * CIV-14145 CCD changes for add the court permission view * CIV-14128: Added API test for Discontinue Claim * CIV-14145 CCD changes for add the court permission view * CIV-14145 CCD changes for add the court permission view * CIV-14128: Uncommented the lines that are mistakenly committed * CIV-14128: Fixed build errors * CIV-14145 CCD changes for add the court permission view * CIV-14128: Removed the caseworker roles as per review comments * CIV-14145 CCD merge error fixed * CIV-14145 Update current API test with new page data * CIV-14145 Update current API test with new page data * CIV-14128: Removed the caseworker roles as per review comments * CIV-14128: Reverted the change as partiesName is already used in Settle Claim * CIV-14128: Updated the ClaimantConsent pageId to be consistent with other page ids * CIV-14148 Add new screen * CIV-14145 Fix tests tags * CIV-14156: Type of Discontinuance page - Initial Commit * CIV-14145 Fix cosmetic change for parties name * CIV-14148 Add new screen elements * CIV-14148 Update new screen show condition * CIV-14148 Update fields * CIV-14148 delete repeated list * CIV-14148 Add API tests * CIV-14148 Refactor Yes or No list * CIV-14146: Added ccd fields - Initial Commit * CIV-14146: Added fields for Permission Granted page * CIV-14146: Updated code to fix midEvent issue * CIV-14146: Updated field definition with HintText * CIV-14146: Updated as per review comments * CIV-14146: Removed duplicate fields * CIV-14146: Added a missing condition * CIV-14146: Updated page display order * CIV-14156:Updated the page labels * CIV-14156: Updated API tests * CIV-14156: Updated labels to make them bold * CIV-14156: Updated labels to make them bold - few more * CIV-14156: Updated to single quotes * CIV-14156: Updated as per review comments * CIV-14156: Updated to just field labels as discussed with Ignacio. This also makes summary page looks consistent * CIV-14156: Updated label for Permission granted complex type as Summary has no heading displyaed for this * CIV-14244 Permissions for notification events for DiscontinueClaim * CIV-14156 Add lines to screens * CIV-14194 initial commit * CIV-14194 testcase added * CIV-14194 updated testcase * CIV-14244 Permissions for notification events for DiscontinueClaim * CIV-14244 Change tipe of options * CIV-14244 Flowflag permissions * CIV-14244 Revert some changes related to type * CIV-14244 Revert some changes related to type * CIV-14259 initial changes * CIV-14244 Fixing the order for the casefield * CIV-14259 role permision added * CIV-14259 role permission updated * CIV-14440 initial commit * CIV-14440 publish flag added * CIV-14440 toggleFlag added * CIV-14440 publishFlag added * CIV-14440 preview testing * CIV-14440 role permission added * CIV-14440 Testing issue fixed * CIV-14440 role permission updated * Update values.preview.template.yaml * CIV-14440 reverted preview changes * CIV-14440 role permission added * CIV-14440 removed role update * CIV-14440 reverted change * CIV-14440 role permission updated --------- Co-authored-by: GermanAmoros Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> Co-authored-by: JamiS Co-authored-by: sjamihmcts <110464983+sjamihmcts@users.noreply.github.com> Co-authored-by: German-A-Amoros <152271535+German-A-Amoros@users.noreply.github.com> Co-authored-by: Omaira-Melo-Hmcts <148855113+Omaira-Melo-Hmcts@users.noreply.github.com> Co-authored-by: hmcts-version1-ignacio Co-authored-by: hmcts-version1-ignacio <107860328+hmcts-version1-ignacio@users.noreply.github.com> --- ...onCaseField-SettleDiscontinue-nonprod.json | 29 +++++++- .../UserEvents-SettleDiscontinue-nonprod.json | 3 +- ...le-WAToggle-SettleDiscontinue-nonprod.json | 12 +++ ...Discontinue-SettleDiscontinue-nonprod.json | 73 ++++++++++++++++++- 4 files changed, 113 insertions(+), 4 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json index 47c18c4f9c..92e710156c 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json @@ -158,9 +158,18 @@ { "UserRoles": [ "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" + "APP-SOL-SPEC-PROFILE", + "caseworker-civil-systemupdate", + "caseworker-civil-admin", + "caseworker-civil-staff" ], "CRUD": "CRU" + }, + { + "UserRoles": [ + "judge-profile" + ], + "CRUD": "R" } ] }, @@ -188,6 +197,13 @@ "caseworker-civil-systemupdate" ], "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "R" } ] }, @@ -304,7 +320,9 @@ { "UserRoles": [ "APP-SOL-UNSPEC-PROFILE", - "APP-SOL-SPEC-PROFILE" + "APP-SOL-SPEC-PROFILE", + "caseworker-civil-admin", + "caseworker-civil-staff" ], "CRUD": "CRU" } @@ -333,6 +351,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 a687ccd206..fc70d52587 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-SettleDiscontinue-nonprod.json @@ -65,6 +65,7 @@ "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 + "RetriesTimeoutAboutToStartEvent": 0, + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-SettleDiscontinue-nonprod.json index cb58b5f6ef..05a2bd80d7 100644 --- a/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/FeatureToggle-WAToggle-SettleDiscontinue-nonprod.json @@ -34,5 +34,17 @@ "PageShowCondition": "partiesNames = \"DO_NOT_SHOW_IN_UI\"", "ShowSummaryChangeOption": "N", "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "featureToggleWA", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "WorkAllocation", + "PageShowCondition": "confirmOrderGivesPermission = \"DO_NOT_SHOW_IN_UI\"", + "ShowSummaryChangeOption": "N", + "Publish": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json index f7cd5b4fcb..5cdf8d7f1e 100644 --- a/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json +++ b/ccd-definition/CaseEventToFields/ValidateDiscontinue-SettleDiscontinue-nonprod.json @@ -57,6 +57,77 @@ "PageFieldDisplayOrder": 5, "PageColumnNumber": 1, "DisplayContext": "MANDATORY", - "ShowSummaryChangeOption": "N" + "ShowSummaryChangeOption": "N", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "selectedClaimantForDiscontinuance", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 6, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "confirmOrderGivesPermission = \"DO_NOT_SHOW_IN_UI\"", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "courtPermissionNeeded", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 7, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "confirmOrderGivesPermission = \"DO_NOT_SHOW_IN_UI\"", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "typeOfDiscontinuance", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 9, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "confirmOrderGivesPermission = \"DO_NOT_SHOW_IN_UI\"", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "isDiscontinuingAgainstBothDefendants", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 10, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "confirmOrderGivesPermission = \"DO_NOT_SHOW_IN_UI\"", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "VALIDATE_DISCONTINUE_CLAIM_CLAIMANT", + "CaseFieldID": "hearingDate", + "PageID": "ValidateDiscontinuance", + "PageLabel": "Validate order information", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder":11, + "PageColumnNumber": 1, + "DisplayContext": "READONLY", + "ShowSummaryChangeOption": "N", + "FieldShowCondition":"confirmOrderGivesPermission=\"DO NOT SHOW ON UI\"", + "Publish": "Y" } ]