From ca244e5de1ef1dc074f82cb1b7ceb08f972a8e77 Mon Sep 17 00:00:00 2001 From: Robert Bond Date: Tue, 16 Jun 2026 17:44:04 +0000 Subject: [PATCH] Merged PR 2392: updated project types for new sub grid updated project types for new sub grid Related work items: #23752 --- .../case/summaryTypes/pinswg_sipscase.js | 57 +++++++++++------ .../endpoint/getadvancedsearchpaged_api.js | 61 ++++++++++++++----- .../api/endpoint/getbasicsearchdetails_api.js | 2 +- tsconfig.json | 4 +- 4 files changed, 86 insertions(+), 38 deletions(-) diff --git a/components/case/summaryTypes/pinswg_sipscase.js b/components/case/summaryTypes/pinswg_sipscase.js index 59d4c299..22095153 100644 --- a/components/case/summaryTypes/pinswg_sipscase.js +++ b/components/case/summaryTypes/pinswg_sipscase.js @@ -38,6 +38,12 @@ const Pinswg_sipscase = (props) => { new Date(a.pinswg_newcasedeadline) )[0]; + const projectTypes = Array.isArray( + detailsObj.pinswg_sips_pinswg_sipsprojecttype + ) + ? detailsObj.pinswg_sips_pinswg_sipsprojecttype + : []; + return ( <> {detailsObj.pinswg_projectdescription != null ? ( @@ -118,28 +124,40 @@ const Pinswg_sipscase = (props) => { } /> - {hasValidKey( - detailsObj, - "_pinswg_projecttype_value" - ) && ( + {projectTypes.length > 0 && ( + {projectTypes.map( + (projectType) => { + const projectTypeName = + projectType.pinswg_name; + + const translatedProjectTypeName = + router.locale == + "cy" + ? jsonpath( + '$..[?(@.value=="' + + projectTypeName + + '")].value_cy', + transLookup + ) + : projectTypeName; + + return ( +
+ {translatedProjectTypeName || + projectTypeName} +
+ ); + } + )} + } /> )} @@ -266,7 +284,6 @@ const Pinswg_sipscase = (props) => { ) } /> - {/* ' + : ""; + queryUrl = - "pinswg_sipses?$count=true&$expand=pinswg_sipscase&$filter=_pinswg_projecttype_value eq " + - searchString.projecttype + - (Object.prototype.hasOwnProperty.call(searchString, "q") - ? " and contains(pinswg_projectname, '" + searchString.q + "')" - : "") + - (Object.prototype.hasOwnProperty.call(searchString, "lpa") - ? " and _pinswg_associatedlpa_value eq " + - searchString.lpa + - " " - : "") + + "pinswg_sipses?$count=true" + + "&$expand=" + + "pinswg_sipscase($select=incidentid,ticketnumber,title,statuscode,pinswg_appealcasetype,pinswg_caseaddress,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname,_pinswg_associatedlpa_value)," + + "pinswg_sips_pinswg_sipsprojecttype($select=_pinswg_sector_value,pinswg_name,pinswg_sipsprojecttypeid)" + + "&$filter=" + + sipsFilters.join(" and ") + "&$orderby=" + orderby + " " + fieldSort + - (typeof pageNumber != "undefined" - ? "&$skiptoken=" + - ('') - : ""); + skipToken; + + // queryUrl = + // "pinswg_sipses?$count=true" + + // "&$expand=pinswg_sips_pinswg_sipsprojecttype($select=_pinswg_sector_value,pinswg_name,pinswg_sipsprojecttypeid)" + + // "&$filter=" + + // sipsFilters.join(" and ") + + // "&$orderby=" + + // orderby + + // " " + + // fieldSort + + // (typeof pageNumber != "undefined" + // ? "&$skiptoken=" + '' + // : ""); } const relayPolicy = RELAY_POLICY_SEARCH_PAGED; @@ -186,7 +217,7 @@ export default async function ApiProxy(req, res) { let dataStr; _.has(data, "@odata.nextLink") === true && ((dataStr = JSON.stringify(data["@odata.nextLink"])), - (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); + (data["@odata.nextLink"] = dataStr.split("/v9.2/")[1])); return data; }, diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js index 1c9657c0..484e8cb3 100644 --- a/pages/api/endpoint/getbasicsearchdetails_api.js +++ b/pages/api/endpoint/getbasicsearchdetails_api.js @@ -88,7 +88,7 @@ export default async function ApiProxy(req, res) { navigationProperty + "($select=ticketnumber,statuscode)" + (primaryIdAttribute == "pinswg_sipscase" - ? ",pinswg_sipscase($select=ticketnumber),pinswg_CaseDeadlineExtension_pinswg_sips($select=pinswg_casedeadlineextensionid,pinswg_noofdaysextended,pinswg_reasonforextension,pinswg_agreedorimposedextension,pinswg_newcasedeadline),pinswg_sips_pinswg_sipsevent($select=pinswg_enddateofevent,pinswg_eventpublishflag,pinswg_linktotheevent,pinswg_linktotheeventstreamwelsh,pinswg_name,pinswg_dateeventrequested,pinswg_typeofevent,createdon,modifiedon)" + ? ",pinswg_sipscase($select=ticketnumber),pinswg_CaseDeadlineExtension_pinswg_sips($select=pinswg_casedeadlineextensionid,pinswg_noofdaysextended,pinswg_reasonforextension,pinswg_agreedorimposedextension,pinswg_newcasedeadline),pinswg_sips_pinswg_sipsevent($select=pinswg_enddateofevent,pinswg_eventpublishflag,pinswg_linktotheevent,pinswg_linktotheeventstreamwelsh,pinswg_name,pinswg_dateeventrequested,pinswg_typeofevent,createdon,modifiedon),pinswg_sips_pinswg_sipsprojecttype($select=pinswg_sipsprojecttypeid,pinswg_name,_pinswg_sector_value)" : ""); queryUrl = queryUrl + getSelectQuery(appealTypeName); diff --git a/tsconfig.json b/tsconfig.json index d55eb308..8a5672e6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,9 +10,9 @@ "strict": false, "noEmit": true, "incremental": true, - "module": "esnext", + "module": "Node16", "esModuleInterop": true, - "moduleResolution": "node", + "moduleResolution": "Node16", "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve"