Merge remote-tracking branch 'origin/master' into DTSCCI-1509

hmcts · Feb 12, 2025 · 95ccb00 · 95ccb00
2 parents c004d22 + 367c93b
commit 95ccb00
Show file tree

Hide file tree

Showing 426 changed files with 6,300 additions and 3,779 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -12,7 +12,9 @@ GLOB_PATTERNS=(
     'playwright-e2e/requests/*.ts'      
     'playwright-e2e/requests/**/*.ts',
     'playwright-e2e/data-builders/*.ts'      
-    'playwright-e2e/data-builders/**/*.ts' 
+    'playwright-e2e/data-builders/**/*.ts'
+    'playwright-e2e/actions/*.ts'      
+    'playwright-e2e/actions/**/*.ts' 
 )
 
 # Get the list of changed files

diff --git a/bin/reimport-definitions-devuser-preview.sh b/bin/reimport-definitions-devuser-preview.sh
@@ -0,0 +1,14 @@
+camundaBranch=${1:-master}
+dmnBranch=${2:-master}
+waStandaloneBranch=${3:-master}
+
+echo "Loading Environment Variables"
+source ./bin/variables/load-dev-user-preview-environment-variables.sh
+echo "Importing CCD definitions"
+./bin/build-release-ccd-definition.sh preview
+ccdDefinitionFilePath="$(pwd)/build/ccd-release-config/civil-ccd-preview.xlsx"
+./bin/utils/ccd-import-definition.sh ${ccdDefinitionFilePath}
+rm -rf $(pwd)/build/ccd-release-config
+
+echo "ENV variables set for devuser-preview environment."
+echo "XUI_URL: $XUI_WEBAPP_URL"
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-JO-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-JO-nonprod.json
@@ -505,44 +505,6 @@
       }
     ]
   },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseEventID": "POST_DJ_NON_DIVERGENT_LETTER_DEFENDANT1",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "caseworker-civil-systemupdate"
-        ],
-        "CRUD": "CRU"
-      },
-      {
-        "UserRoles": [
-          "caseworker-civil-admin",
-          "caseworker-civil-staff"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseEventID": "POST_DJ_NON_DIVERGENT_LETTER_DEFENDANT2",
-    "AccessControl": [
-      {
-        "UserRoles": [
-          "caseworker-civil-systemupdate"
-        ],
-        "CRUD": "CRU"
-      },
-      {
-        "UserRoles": [
-          "caseworker-civil-admin",
-          "caseworker-civil-staff"
-        ],
-        "CRUD": "R"
-      }
-    ]
-  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "JUDGMENT_BY_ADMISSION_DEFENDANT1_PIN_IN_LETTER",

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-AHN-CUI-nonprod.json
@@ -0,0 +1,47 @@
+[
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "hearingDurationInMinutesAHN",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "CITIZEN-CLAIMANT-PROFILE",
+          "CITIZEN-DEFENDANT-PROFILE",
+          "citizen-profile",
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "claimantTrialReadyDocumentCreated",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "CITIZEN-CLAIMANT-PROFILE",
+          "CITIZEN-DEFENDANT-PROFILE",
+          "citizen-profile",
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "defendantTrialReadyDocumentCreated",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "CITIZEN-CLAIMANT-PROFILE",
+          "CITIZEN-DEFENDANT-PROFILE",
+          "citizen-profile",
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  }
+]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-R2-CUI.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-R2-CUI.json
@@ -2353,6 +2353,8 @@
     "AccessControl": [
       {
         "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-solicitor",
           "citizen-profile",
           "CITIZEN-DEFENDANT-PROFILE",
           "CITIZEN-CLAIMANT-PROFILE"

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json
@@ -4663,6 +4663,22 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "unfinishedBackEndProcess",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-solicitor",
+          "citizen-profile",
+          "CITIZEN-DEFENDANT-PROFILE",
+          "CITIZEN-CLAIMANT-PROFILE"
+        ],
+        "CRUD": "RU"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "respondent2ResponseDeadline",

diff --git a/ccd-definition/AuthorisationCaseField/systemUpdate.json b/ccd-definition/AuthorisationCaseField/systemUpdate.json
@@ -646,5 +646,11 @@
     "CaseFieldID": "respondent2OrgIndividuals",
     "UserRole": "caseworker-civil-systemupdate",
     "CRUD": "R"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "unfinishedBackEndProcess",
+    "UserRole": "caseworker-civil-systemupdate",
+    "CRUD": "R"
   }
 ]
diff --git a/ccd-definition/CaseEvent/Camunda/DocmosisEvents-JO-nonprod.json b/ccd-definition/CaseEvent/Camunda/DocmosisEvents-JO-nonprod.json
@@ -64,32 +64,6 @@
     "ShowEventNotes": "N",
     "RetriesTimeoutURLAboutToSubmitEvent": 0
   },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "ID": "POST_DJ_NON_DIVERGENT_LETTER_DEFENDANT1",
-    "Name": "Post DJ letter defendant1",
-    "Description": "Post DJ letter defendant 1 Legal Org",
-    "PreConditionState(s)": "*",
-    "PostConditionState": "*",
-    "SecurityClassification": "Public",
-    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
-    "ShowSummary": "N",
-    "ShowEventNotes": "N",
-    "RetriesTimeoutURLAboutToSubmitEvent": 0
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "ID": "POST_DJ_NON_DIVERGENT_LETTER_DEFENDANT2",
-    "Name": "Post DJ letter defendant2",
-    "Description": "Post DJ letter defendant 2 Legal Org",
-    "PreConditionState(s)": "*",
-    "PostConditionState": "*",
-    "SecurityClassification": "Public",
-    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
-    "ShowSummary": "N",
-    "ShowEventNotes": "N",
-    "RetriesTimeoutURLAboutToSubmitEvent": 0
-  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "ID": "JUDGMENT_BY_ADMISSION_DEFENDANT1_PIN_IN_LETTER",

diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-MINTI-nonprod.json
@@ -30,5 +30,25 @@
     "PageDisplayOrder": 99,
     "PageShowCondition": "relistHearingNotice=\"DONOTSHOW\"",
     "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "COURT_OFFICER_ORDER",
+    "CaseFieldID": "allocatedTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "COURT_OFFICER_ORDER",
+    "CaseFieldID": "responseClaimTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
   }
 ]
diff --git a/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json b/ccd-definition/CaseField/CaseField-AHN-CUI-nonprod.json
@@ -0,0 +1,26 @@
+[
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "hearingDurationInMinutesAHN",
+    "Label": "Duration AHN",
+    "FieldType": "Text",
+    "SecurityClassification": "Public",
+    "Searchable": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "claimantTrialReadyDocumentCreated",
+    "Label": "trial doc date",
+    "FieldType": "DateTime",
+    "SecurityClassification": "Public",
+    "Searchable": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "defendantTrialReadyDocumentCreated",
+    "Label": "trial doc date",
+    "FieldType": "DateTime",
+    "SecurityClassification": "Public",
+    "Searchable": "Y"
+  }
+]
diff --git a/ccd-definition/CaseField/CaseField.json b/ccd-definition/CaseField/CaseField.json
@@ -526,6 +526,15 @@
     "Searchable": "N",
     "Comment": "Field needs to be displayed twice for each respondent, ccd does not allow the same field twice in an event"
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "ID": "unfinishedBackEndProcess",
+    "Label": "The case processing has not completed, please refresh this page in one minute. If the problem persists please contact the helpdesk 0300 123 7050",
+    "FieldType": "Label",
+    "SecurityClassification": "Public",
+    "Searchable": "N",
+    "Comment": "Case is stuck in Camunda or the backend services are taking long to respond."
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "ID": "applicant2PartyNameLabel",

diff --git a/ccd-definition/CaseTypeTab/ServiceRequestHearingNotice-R2-CUI.json b/ccd-definition/CaseTypeTab/ServiceRequestHearingNotice-R2-CUI.json
@@ -12,8 +12,26 @@
     "TabID": "ServiceRequest",
     "TabLabel": "Service Request",
     "TabDisplayOrder": 6,
-    "CaseFieldID": "casePaymentWaysToPay",
+    "CaseFieldID": "businessProcess",
     "TabFieldDisplayOrder": 1,
-    "TabShowCondition": "hwfFeeType!=\"CLAIMISSUED\""
+    "FieldShowCondition": "casePaymentWaysToPay=\"DO_NOT_SHOW_IN_UI\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "ServiceRequest",
+    "TabLabel": "Service Request",
+    "TabDisplayOrder": 6,
+    "CaseFieldID": "casePaymentWaysToPay",
+    "TabFieldDisplayOrder": 2,
+    "FieldShowCondition": "hwfFeeType!=\"CLAIMISSUED\" AND businessProcess.status=\"FINISHED\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "TabID": "ServiceRequest",
+    "TabLabel": "Service Request",
+    "TabDisplayOrder": 6,
+    "CaseFieldID": "unfinishedBackEndProcess",
+    "TabFieldDisplayOrder": 3,
+    "FieldShowCondition": "businessProcess.status!=\"FINISHED\""
   }
 ]
diff --git a/ccd-definition/FixedLists/DocumentType-JO-nonprod.json b/ccd-definition/FixedLists/DocumentType-JO-nonprod.json
@@ -23,34 +23,28 @@
     "ListElement": "Default Judgment defendant",
     "DisplayOrder": 18
   },
-  {
-    "ID": "DocumentType",
-    "ListElementCode": "DEFAULT_JUDGMENT_COVER_LETTER",
-    "ListElement": "Default Judgment Cover Letter",
-    "DisplayOrder": 19
-  },
   {
     "ID": "DocumentType",
     "ListElementCode": "JUDGMENT_BY_ADMISSION_CLAIMANT",
     "ListElement": "Judgment by admission claimant",
-    "DisplayOrder": 20
+    "DisplayOrder": 19
   },
   {
     "ID": "DocumentType",
     "ListElementCode": "JUDGMENT_BY_ADMISSION_DEFENDANT",
     "ListElement": "Judgment by admission defendant",
-    "DisplayOrder": 21
+    "DisplayOrder": 20
   },
   {
     "ID": "DocumentType",
     "ListElementCode": "JUDGMENT_BY_DETERMINATION_CLAIMANT",
     "ListElement": "Judgment by determination claimant",
-    "DisplayOrder": 22
+    "DisplayOrder": 21
   },
   {
     "ID": "DocumentType",
     "ListElementCode": "JUDGMENT_BY_DETERMINATION_DEFENDANT",
     "ListElement": "Judgment by determination defendant",
-    "DisplayOrder": 23
+    "DisplayOrder": 22
   }
 ]
diff --git a/e2e/api/steps.js b/e2e/api/steps.js
@@ -1932,7 +1932,7 @@ const clearHearingLocationData = (responseBody) => {
 };
 
 const clearDataForDefendantResponse = (responseBody, solicitor) => {
-  delete responseBody.data['businessProcess'];
+
   delete responseBody.data['caseNotes'];
   delete responseBody.data['systemGeneratedCaseDocuments'];
   delete responseBody.data['respondentSolicitor2Reference'];

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -79,9 +79,10 @@ export default [
       'playwright-e2e/pages/**/*fragment.ts',
       'playwright-e2e/steps/**/*steps.ts',
       'playwright-e2e/data-builders/**/*data-builder.ts',
+      'playwright-e2e/data-builders/**/*actions.ts',
       'playwright-e2e/base/base-page.ts',
       'playwright-e2e/base/base-requests.ts',
-      'playwright-e2e/base/base-api-steps.ts',
+      'playwright-e2e/base/base-api.ts',
       'playwright-e2e/base/base-exui-steps.ts',
     ],
     rules: {

diff --git a/playwright-e2e/actions/ui/exui/caseworker/caseworker-actions-factory.ts b/playwright-e2e/actions/ui/exui/caseworker/caseworker-actions-factory.ts
@@ -0,0 +1,3 @@
+import BasePageActionsFactory from '../../../../base/base-page-actions-factory';
+
+export default class CaseworkerActionsFactory extends BasePageActionsFactory {}
diff --git a/playwright-e2e/actions/ui/exui/caseworker/create-case-flags-actions.ts b/playwright-e2e/actions/ui/exui/caseworker/create-case-flags-actions.ts
@@ -0,0 +1,14 @@
+import BaseTestData from '../../../../base/base-test-data';
+import { AllMethodsStep } from '../../../../decorators/test-steps';
+import TestData from '../../../../models/test-data';
+import CreateCaseFlagsPageFactory from '../../../../pages/exui/caseworker/create-case-flags/create-case-flags-page-factory';
+
+@AllMethodsStep()
+export default class CreateCaseFlagsActions extends BaseTestData {
+  private createCaseFlagsPageFactory: CreateCaseFlagsPageFactory;
+
+  constructor(createCaseFlagsPageFactory: CreateCaseFlagsPageFactory, testData: TestData) {
+    super(testData);
+    this.createCaseFlagsPageFactory = createCaseFlagsPageFactory;
+  }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import BasePageActionsFactory from '../../../../base/base-page-actions-factory';

		export default class CaseworkerActionsFactory extends BasePageActionsFactory {}