From 176f83e3e9e6b1c5f51e0e06b9ed96267542ecc7 Mon Sep 17 00:00:00 2001
From: drummondjm <mark.drummond@version.com>
Date: Tue, 28 Jan 2025 15:33:32 +0000
Subject: [PATCH] Remove redundant "request another listing" screen

---
 .../RequestAListing-MINTI-nonprod.json        | 16 -------------
 .../HearingNotice-MINTI-nonprod.json          | 23 -------------------
 ...CaseFieldRequestListing-MINTI-nonprod.json | 16 -------------
 .../values.enableWA.preview.template.yaml     |  1 +
 charts/civil-ccd/values.template.yaml         |  3 ++-
 5 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/ccd-definition/AuthorisationCaseField/RequestAListing-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/RequestAListing-MINTI-nonprod.json
index 4cb2bae47e..871aa85c1b 100644
--- a/ccd-definition/AuthorisationCaseField/RequestAListing-MINTI-nonprod.json
+++ b/ccd-definition/AuthorisationCaseField/RequestAListing-MINTI-nonprod.json
@@ -22,21 +22,5 @@
       "hearing-schedule-access"
     ],
     "CRUD": "CRU"
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseFieldID": "requestAnotherHearingLabel",
-    "UserRoles": [
-      "hearing-schedule-access"
-    ],
-    "CRUD": "CRU"
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseFieldID": "requestAnotherHearing",
-    "UserRoles": [
-      "hearing-schedule-access"
-    ],
-    "CRUD": "CRU"
   }
 ]
diff --git a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json
index 6430ef586b..82824e6268 100644
--- a/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json
+++ b/ccd-definition/CaseEventToFields/HearingNotice-MINTI-nonprod.json
@@ -46,28 +46,5 @@
     "PageColumnNumber": 1,
     "FieldShowCondition" : "requestHearingNoticeDynamic = \"OTHER\"",
     "ShowSummaryChangeOption": "Y"
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseEventID": "HEARING_SCHEDULED_RETRIGGER",
-    "CaseFieldID": "requestAnotherHearingLabel",
-    "PageFieldDisplayOrder": 1,
-    "DisplayContext": "READONLY",
-    "PageID": "RequestAnotherHearing",
-    "PageDisplayOrder": 2,
-    "PageColumnNumber": 1,
-    "PageShowCondition" : "allocatedTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR responseClaimTrack = \"INTERMEDIATE_CLAIM\"",
-    "ShowSummaryChangeOption": "N"
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "CaseEventID": "HEARING_SCHEDULED_RETRIGGER",
-    "CaseFieldID": "requestAnotherHearing",
-    "PageFieldDisplayOrder": 2,
-    "DisplayContext": "MANDATORY",
-    "PageID": "RequestAnotherHearing",
-    "PageDisplayOrder": 2,
-    "PageColumnNumber": 1,
-    "ShowSummaryChangeOption": "Y"
   }
 ]
diff --git a/ccd-definition/CaseField/CaseFieldRequestListing-MINTI-nonprod.json b/ccd-definition/CaseField/CaseFieldRequestListing-MINTI-nonprod.json
index b0b93c8c5e..87dc165cf3 100644
--- a/ccd-definition/CaseField/CaseFieldRequestListing-MINTI-nonprod.json
+++ b/ccd-definition/CaseField/CaseFieldRequestListing-MINTI-nonprod.json
@@ -30,21 +30,5 @@
     "FieldType": "Text",
     "SecurityClassification": "Public",
     "Searchable": "N"
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "ID": "requestAnotherHearingLabel",
-    "Label": "## Do you want to request another listing?",
-    "FieldType": "Label",
-    "SecurityClassification": "Public",
-    "Searchable": "N"
-  },
-  {
-    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
-    "ID": "requestAnotherHearing",
-    "Label": "Request another hearing?",
-    "FieldType": "YesOrNo",
-    "SecurityClassification": "Public",
-    "Searchable": "N"
   }
 ]
diff --git a/charts/civil-ccd/values.enableWA.preview.template.yaml b/charts/civil-ccd/values.enableWA.preview.template.yaml
index bf4a326871..cddb2cdd93 100644
--- a/charts/civil-ccd/values.enableWA.preview.template.yaml
+++ b/charts/civil-ccd/values.enableWA.preview.template.yaml
@@ -97,6 +97,7 @@ wa:
         disabled: true
   camunda-bpm:
     java:
+      image: hmctsprivatetemp.azurecr.io/camunda/bpm:latest
       environment:
         CAMUNDA_DB_USER_NAME: "hmcts"
         CAMUNDA_DB_PASSWORD: ${POSTGRES_PASSWORD}
diff --git a/charts/civil-ccd/values.template.yaml b/charts/civil-ccd/values.template.yaml
index bbd04ddc5d..ac07750d33 100644
--- a/charts/civil-ccd/values.template.yaml
+++ b/charts/civil-ccd/values.template.yaml
@@ -6,7 +6,7 @@ civil-translation:
 
 am-org-role-mapping-service:
   enabled: false
-  
+
 civil-general-applications:
   java:
     image: 'hmctspublic.azurecr.io/civil/general-applications:latest'
@@ -345,6 +345,7 @@ camunda-bpm:
   enabled: true
   java:
     imagePullPolicy: Always
+    image: hmctsprivatetemp.azurecr.io/camunda/bpm:latest
     ingressHost: camunda-${SERVICE_FQDN}
     disableKeyVaults: true
     releaseNameOverride: ${SERVICE_NAME}-camunda