Merged PR 2381: ROW case stage updates

Related work items: #23564, #23779, #23780

components/case/summary/utils/caseStagesByAppealType.js

@@ -357,7 +357,7 @@ export const stagesByCaseType = {
         {
             stageId: 846040013,
             titleKey: "case-closed",
-            descriptionKey: "case-closed-desc-application"
+            descriptionKey: "case-closed-desc"
         }
     ]),
 
@@ -428,7 +428,7 @@ export const stagesByCaseType = {
         {
             stageId: 846040010,
             titleKey: "statements",
-            descriptionKey: "statements-desc"
+            descriptionKey: "statements-desc-application"
         },
         {
             stageId: 846040063,

locales/cy/case-stages.json

@@ -24,10 +24,10 @@
   "minister-s-decision-desc": "Mae Gweinidogion Cymru wedi cyhoeddi eu penderfyniad ar y cais hwn.",
   "minister-s-decision-desc-callin": "Bydd Gweinidogion Cymru yn cyhoeddi eu penderfyniad.",
   "case-closed": "Achos wedi'i Gau",
-  "case-closed-nonval": "Achos Ar Gau - Penderfyniad Wedi'i Gyhoeddi",
+  "case-closed-nonval": "Achos Ar Gau",
   "case-closed-desc": "Mae PEDW wedi penderfynu ar yr apêl ac mae'r achos bellach wedi'i gau.",
   "case-closed-desc-order": "Mae PEDW wedi penderfynu ar y gorchymyn ac mae'r achos bellach wedi'i gau.",
-  "case-closed-desc-application": "Mae PEDW wedi penderfynu ar y cais ac mae'r achos bellach wedi'i gau.",
+  "case-closed-desc-application": "Mae PEDW wedi penderfynu ar yr apêl ac mae'r achos bellach wedi'i gau.",
   "case-closed-desc-dnssips": "Mae'r Cais wedi'i benderfynu.",
   "case-closed-desc-callin": "Mae PEDW wedi penderfynu ar y cais a alwyd i mewn ac mae'r achos bellach wedi'i gau.",
   "appeal-submitted": "Apêl wedi'i Chyflwyno",

locales/en/case-stages.json

@@ -24,7 +24,7 @@
   "minister-s-decision-desc": "The Welsh Ministers have issued their decision on this application.",
   "minister-s-decision-desc-callin": "The Welsh Ministers will issue their decision.",
   "case-closed": "Case Closed",
-  "case-closed-nonval": "Case Closed - Decision Issued",
+  "case-closed-nonval": "Case Closed",
   "case-closed-desc": "PEDW has determined the appeal and the case has now been closed.",
   "case-closed-desc-order": "PEDW has determined the order and the case has now been closed.",
   "case-closed-desc-application": "PEDW has determined the application and the case has now been closed.",

pages/api/admin/getStatusCountsByAppealAndLPA_api.js

@@ -2,13 +2,19 @@ import { azureHeaders } from "../../../actions/core/headers";
 import { relayGet } from "../middleware/relayForwarding";
 import { RELAY_POLICY_BOUNDED_READ } from "../middleware/relayPolicyPresets";
 
-import { statusValues } from "../../../components/utils/caseStagesObj";
-
 export default async function ApiProxy(req, res) {
-    // const queryUrl =
-    //     "incidents?$apply=groupby((statuscode,pinswg_appealcasetype),aggregate($count as caseCount))&$filter=pinswg_publishtoweb eq true";
+    const { lpaId } = req.query;
+
+    const filters = ["pinswg_publishtoweb eq true"];
+
+    if (lpaId) {
+        filters.push(`_pinswg_associatedlpa_value eq ${lpaId}`);
+    }
+
     const queryUrl =
-        "incidents?$select=statuscode,pinswg_appealcasetype,_pinswg_associatedlpa_value&$filter=pinswg_publishtoweb eq true";
+        "incidents?$select=statuscode,pinswg_appealcasetype,_pinswg_associatedlpa_value" +
+        `&$filter=${filters.join(" and ")}`;
+
     return relayGet({
         queryUrl,
         res,
@@ -44,7 +50,6 @@ export default async function ApiProxy(req, res) {
                 }
 
                 acc[key].caseCount += 1;
-
                 return acc;
             }, {});