robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 2392: updated project types for new sub grid

Browse Source 
updated project types for new sub grid

Related work items: #23752
This commit is contained in:
Robert Bond
2026-06-16 17:44:04 +00:00
parent 3efaafdb72
commit ca244e5de1
4 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/api/endpoint/getadvancedsearchpaged_api.js
+46 -15
View File
@@ -153,25 +153,56 @@ export default async function ApiProxy(req, res) {
: "");
if (_.has(searchString, "projecttype")) {
const sipsFilters = [
"pinswg_sips_pinswg_sipsprojecttype/any(pt: pt/pinswg_sipsprojecttypeid eq " +
searchString.projecttype +
")"
];
if (Object.prototype.hasOwnProperty.call(searchString, "q")) {
sipsFilters.push(
"contains(pinswg_projectname, '" +
searchString.q.replace(/'/g, "''") +
"')"
);
}
if (Object.prototype.hasOwnProperty.call(searchString, "lpa")) {
sipsFilters.push(
"_pinswg_associatedlpa_value eq " + searchString.lpa
);
}
const skipToken =
pageNumber && pageNumber !== "1"
? "&$skiptoken=" + '<cookie pagenumber="' + pageNumber + '" />'
: "";
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=" +
('<cookie pagenumber="' + pageNumber + '" />')
: "");
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=" + '<cookie pagenumber="' + pageNumber + '" />'
// : "");
}
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;
},
pages/api/endpoint/getbasicsearchdetails_api.js
+1 -1
View File
@@ -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);