Merge branch 'master' into feat/CIV-15612

hmcts · Dec 10, 2024 · dac5e18 · dac5e18
2 parents 16d91ea + a9d6ccc
commit dac5e18
Show file tree

Hide file tree

Showing 163 changed files with 3,215 additions and 355 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,4 +61,5 @@ allure-report/
 playwright-report/
 /playwright-e2e/fixtures/.users/
 /playwright-e2e/fixtures/.user-cookies/
+/playwright-e2e/fixtures/.user-assigned-cases/
 /playwright-e2e/fixtures/data/bankHolidays.json
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -10,7 +10,9 @@ GLOB_PATTERNS=(
     'playwright-e2e/steps/*.ts'        
     'playwright-e2e/steps/**/*.ts'      
     'playwright-e2e/requests/*.ts'      
-    'playwright-e2e/requests/**/*.ts'   
+    'playwright-e2e/requests/**/*.ts',
+    'playwright-e2e/data-builders/*.ts'      
+    'playwright-e2e/data-builders/**/*.ts' 
 )
 
 # Get the list of changed files

diff --git a/.prettierrc b/.prettierrc
@@ -4,7 +4,7 @@
   "trailingComma": "all",
   "overrides": [
     {
-      "files": ["playwright-e2e/tests/**/*.ts", "playwright-e2e/playwright-fixtures/**/*.ts"],
+      "files": ["playwright-e2e/playwright-fixtures/**/*.ts"],
       "options": {
         "arrowParens": "always",
         "trailingComma": "none",

diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly
@@ -5,6 +5,7 @@ properties([
   parameters([
     string(name: 'ENVIRONMENT', defaultValue: 'aat', description: 'Environment to test'),
     string(name: 'PLAYWRIGHT_WORKERS', defaultValue: '5', description: 'Number of workers for playwright'),
+    string(name: 'PLAYWRIGHT_RETRIES', defaultValue: '2', description: 'Number of times playwright will retry tests'),
     string(name: 'PLAYWRIGHT_RUN_ACCESSIBILITY_TESTS', defaultValue: 'false', description: 'Runs accessibility tests for playwright during test execution'),
     string(name: 'PLAYWRIGHT_RUN_SETUP', defaultValue: 'true', description: 'Runs setup projects before functional test suite'),
     string(name: 'FRONTEND_URL', defaultValue: 'https://manage-case.aat.platform.hmcts.net',
@@ -79,8 +80,10 @@ def secrets = [
 withNightlyPipeline(type, product, component) {
   env.ENVIRONMENT=params.ENVIRONMENT
   env.PLAYWRIGHT_WORKERS=params.PLAYWRIGHT_WORKERS
+  env.PLAYWRIGHT_RETRIES=params.PLAYWRIGHT_RETRIES
   env.PLAYWRIGHT_RUN_ACCESSIBILITY_TESTS=params.PLAYWRIGHT_RUN_ACCESSIBILITY_TESTS
   env.PLAYWRIGHT_RUN_SETUP=params.PLAYWRIGHT_RUN_SETUP
+  env.PLAYWRIGHT_UNASSIGN_CASES = true
   env.URL=params.FRONTEND_URL
   env.DM_STORE_URL=params.DM_STORE_URL
   env.IDAM_WEB_URL=params.IDAM_WEB_URL

diff --git a/bin/build-release-ccd-definition.sh b/bin/build-release-ccd-definition.sh
@@ -6,7 +6,6 @@ set -eu
 environment=${1:-prod}
 activateShutter=${2:-false}
 
-
 # if any exclusions are updated here, please also update the exclusions map in e2e/tests/unit/utils/dataProvider.js
 if [ ${environment} == preview ]; then
    excludedFilenamePatterns="-e *-prod.json"

diff --git a/...uthorisationCaseEvent-CUI-CP-nonprod.json → ...eEvent/AuthorisationCaseEvent-CUI-CP.json b/...uthorisationCaseEvent-CUI-CP-nonprod.json → ...eEvent/AuthorisationCaseEvent-CUI-CP.json
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json
@@ -113,5 +113,18 @@
         "CRUD": "CRU"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SEND_AND_REPLY",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
   }
 ]
diff --git a/...aseEvent/systemupdate-CUI-CP-nonprod.json → ...isationCaseEvent/systemupdate-CUI-CP.json b/...aseEvent/systemupdate-CUI-CP-nonprod.json → ...isationCaseEvent/systemupdate-CUI-CP.json
diff --git a/...uthorisationCaseField-CUI-CP-nonprod.json → ...eField/AuthorisationCaseField-CUI-CP.json b/...uthorisationCaseField-CUI-CP-nonprod.json → ...eField/AuthorisationCaseField-CUI-CP.json
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json
@@ -280,6 +280,15 @@
     ],
     "CRUD": "CRU"
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "joSetAsideApplicationDate",
+    "UserRoles": [
+      "caseworker-civil-admin",
+      "caseworker-civil-staff"
+    ],
+    "CRUD": "CRU"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "joShowRegisteredWithRTLOption",

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json
@@ -382,5 +382,27 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "taskManagementLocations",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-ras-validation",
+          "caseworker-civil-systemupdate",
+          "GS_profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
   }
 ]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json
@@ -223,8 +223,125 @@
           "caseworker-civil-admin",
           "cui-admin-profile"
         ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "sendAndReplyOption",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "messagesToReplyTo",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "sendMessageMetadata",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "sendMessageContent",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "sendMessageContextTitle",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "sendMessageContentTitle",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "messages",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "messageReplyMetadata",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "messageHistory",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
   }
 ]
diff --git a/...uthorisationCaseState-CUI-CP-nonprod.json → ...eState/AuthorisationCaseState-CUI-CP.json b/...uthorisationCaseState-CUI-CP-nonprod.json → ...eState/AuthorisationCaseState-CUI-CP.json
diff --git a/...nt/Camunda/CaseEvents-CUI-CP-nonprod.json → .../CaseEvent/Camunda/CaseEvents-CUI-CP.json b/...nt/Camunda/CaseEvents-CUI-CP-nonprod.json → .../CaseEvent/Camunda/CaseEvents-CUI-CP.json
diff --git a/...munda/DashboardEvents-CUI-CP-nonprod.json → ...Event/Camunda/DashboardEvents-CUI-CP.json b/...munda/DashboardEvents-CUI-CP-nonprod.json → ...Event/Camunda/DashboardEvents-CUI-CP.json
diff --git a/...da/NotificationEvents-CUI-CP-nonprod.json → ...nt/Camunda/NotificationEvents-CUI-CP.json b/...da/NotificationEvents-CUI-CP-nonprod.json → ...nt/Camunda/NotificationEvents-CUI-CP.json
diff --git a/...Event/User/UserEvents-CUI-CP-nonprod.json → ...ion/CaseEvent/User/UserEvents-CUI-CP.json b/...Event/User/UserEvents-CUI-CP-nonprod.json → ...ion/CaseEvent/User/UserEvents-CUI-CP.json
diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json
@@ -152,6 +152,24 @@
     "RetriesTimeoutURLAboutToSubmitEvent": 0,
     "EventEnablingCondition": "preStayState != \"IN_MEDIATION\""
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "SEND_AND_REPLY",
+    "Name": "Send and reply to messages",
+    "Description": "Send and reply to messages",
+    "DisplayOrder": 25,
+    "PreConditionState(s)": "PENDING_CASE_ISSUED;CASE_ISSUED;AWAITING_CASE_DETAILS_NOTIFICATION;AWAITING_RESPONDENT_ACKNOWLEDGEMENT;AWAITING_APPLICANT_INTENTION;CASE_PROGRESSION;All_FINAL_ORDERS_ISSUED;PREPARE_FOR_HEARING_CONDUCT_HEARING;JUDICIAL_REFERRAL;CASE_SETTLED;CLOSED;CASE_DISCONTINUED;HEARING_READINESS;CASE_STAYED",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "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",
+    "ShowSummary": "Y",
+    "ShowEventNotes": "N",
+    "RetriesTimeoutAboutToStartEvent": 0,
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "Publish": "Y"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "ID": "CONFIRM_ORDER_REVIEW",

diff --git a/ccd-definition/CaseEventToComplexTypes/SendAndReply-caseWorkerEvents-nonprod.json b/ccd-definition/CaseEventToComplexTypes/SendAndReply-caseWorkerEvents-nonprod.json
@@ -0,0 +1,58 @@
+[
+  {
+    "ID": "SendMessageMetadata",
+    "CaseEventID": "SEND_AND_REPLY",
+    "CaseFieldID": "sendMessageMetadata",
+    "ListElementCode": "recipientRoleType",
+    "EventElementLabel": "Who are you sending the message to?",
+    "FieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "SendMessageMetadata",
+    "CaseEventID": "SEND_AND_REPLY",
+    "CaseFieldID": "sendMessageMetadata",
+    "ListElementCode": "isUrgent",
+    "EventElementLabel": "Is this urgent?",
+    "FieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "SendMessageMetadata",
+    "CaseEventID": "SEND_AND_REPLY",
+    "CaseFieldID": "sendMessageMetadata",
+    "ListElementCode": "subjectType",
+    "EventElementLabel": "What is this message about?",
+    "FieldDisplayOrder": 3,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "SendMessageMetadata",
+    "CaseEventID": "SEND_AND_REPLY",
+    "CaseFieldID": "sendMessageMetadata",
+    "ListElementCode": "subject",
+    "EventElementLabel": "Enter the subject",
+    "FieldShowCondition": "sendMessageMetadata.subjectType = \"*\"",
+    "FieldDisplayOrder": 4,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "SendMessageMetadata",
+    "CaseEventID": "SEND_AND_REPLY",
+    "CaseFieldID": "messageReplyMetadata",
+    "ListElementCode": "isUrgent",
+    "EventElementLabel": "Is this urgent?",
+    "FieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "SendMessageMetadata",
+    "CaseEventID": "SEND_AND_REPLY",
+    "CaseFieldID": "messageReplyMetadata",
+    "ListElementCode": "messageContent",
+    "EventElementLabel": "Enter your message",
+    "EventHintText": "Explain what you're requesting and why. Include any answers and decision you need.",
+    "FieldDisplayOrder": 3,
+    "DisplayContext": "MANDATORY"
+  }
+]
diff --git a/...xTypes/WorkAllocation-CUI-CP-nonprod.json → ...ToComplexTypes/WorkAllocation-CUI-CP.json b/...xTypes/WorkAllocation-CUI-CP-nonprod.json → ...ToComplexTypes/WorkAllocation-CUI-CP.json
diff --git a/...lds/FeePaymentOutcome-CUI-CP-nonprod.json → ...entToFields/FeePaymentOutcome-CUI-CP.json b/...lds/FeePaymentOutcome-CUI-CP-nonprod.json → ...entToFields/FeePaymentOutcome-CUI-CP.json
diff --git a/...ToFields/HelpWithFees-CUI-CP-nonprod.json → ...aseEventToFields/HelpWithFees-CUI-CP.json b/...ToFields/HelpWithFees-CUI-CP-nonprod.json → ...aseEventToFields/HelpWithFees-CUI-CP.json