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

15439 sips advanced search

Browse Source
This commit is contained in:
robbond
2025-03-31 17:19:50 +01:00
parent e6498c813d
commit 479f30b0a4
2 changed files with 297 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/search/searchresults.js
+16 -11
View File
@@ -253,6 +253,8 @@ const SearchResults = (props) => {
searchDetailsObj searchDetailsObj
); );
Object.assign(item, item.pinswg_sipscase);
detailsObj = detailsObj[0] || {}; detailsObj = detailsObj[0] || {};
return ( return (
<div <div
@@ -318,17 +320,20 @@ const SearchResults = (props) => {
{item.title} {item.title}
</Link> </Link>
{detailsObj.hasOwnProperty( {item.hasOwnProperty(
"_pinswg_projecttype_value@OData.Community.Display.V1.FormattedValue" "pinswg_sipscase"
) && ( ) &&
<div className="govuk-!-font-size-14"> item.hasOwnProperty(
{ "_pinswg_projecttype_value@OData.Community.Display.V1.FormattedValue"
detailsObj[ ) && (
"_pinswg_projecttype_value@OData.Community.Display.V1.FormattedValue" <div className="govuk-!-font-size-14">
] {
} item[
</div> "_pinswg_projecttype_value@OData.Community.Display.V1.FormattedValue"
)} ]
}
</div>
)}
<RepsOnResults <RepsOnResults
detailsObj={detailsObj} detailsObj={detailsObj}
/> />
pages/api/endpoint/getadvancedsearchpaged_api.js
+281 -106
View File
@@ -1,51 +1,51 @@
/** // /**
* @swagger // * @swagger
* /api/endpoint/getadvancedsearchpaged_api: // * /api/endpoint/getadvancedsearchpaged_api:
* get: // * get:
* tags: [Search] // * tags: [Search]
* description: Advanced search paged // * description: Advanced search paged
* parameters: // * parameters:
* - name: searchstring // * - name: searchstring
* description: search string // * description: search string
* in: query // * in: query
* required: false // * required: false
* example: { // * example: {
* "q":"cas-", // * "q":"cas-",
* "lpa":"744c69f4-48da-eb11-aac5-00224800be9c", // * "lpa":"744c69f4-48da-eb11-aac5-00224800be9c",
* "apt":"846040000", // * "apt":"846040000",
* "statuscode":"1"} // * "statuscode":"1"}
* schema: // * schema:
* type: string // * type: string
* - name: pageNumber // * - name: pageNumber
* in: query // * in: query
* required: true // * required: true
* example: 1 // * example: 1
* schema: // * schema:
* type: string // * type: string
* - name: orderby // * - name: orderby
* in: query // * in: query
* required: true // * required: true
* example: createdon // * example: createdon
* schema: // * schema:
* type: string // * type: string
* - name: fieldSort // * - name: fieldSort
* in: query // * in: query
* required: true // * required: true
* description: asc or desc // * description: asc or desc
* example: asc // * example: asc
* schema: // * schema:
* type: string // * type: string
* - name: showNumberOfRecords // * - name: showNumberOfRecords
* in: query // * in: query
* required: true // * required: true
* description: number of records to return per page // * description: number of records to return per page
* example: 10 // * example: 10
* schema: // * schema:
* type: string // * type: string
* responses: // * responses:
* 200: // * 200:
* description: Success // * description: Success
*/ // */
import axios from "axios"; import axios from "axios";
import CryptoJS from "crypto-js"; import CryptoJS from "crypto-js";
@@ -53,6 +53,7 @@ import _ from "lodash";
import { import {
azureHeadersPagedCustom, azureHeadersPagedCustom,
azureHeadersPaged, azureHeadersPaged,
azureHeaders,
consoleLogger, consoleLogger,
getToken, getToken,
} from "../../../actions"; } from "../../../actions";
@@ -127,7 +128,29 @@ export default async function ApiProxy(req, res) {
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />') ? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
: ""); : "");
//console.log("adv qu: ", queryUrl); if (_.has(searchString, "projecttype")) {
queryUrl =
"pinswg_sipses?$count=true&$expand=pinswg_sipscase&$filter=_pinswg_projecttype_value eq " +
searchString.projecttype +
(searchString.hasOwnProperty("q")
? " and contains(pinswg_projectname, '" + searchString.q + "')"
: "") +
(searchString.hasOwnProperty("lpa")
? " and _pinswg_associatedlpa_value eq " +
searchString.lpa +
" "
: "") +
"&$orderby=" +
orderby +
" " +
fieldSort +
(typeof pageNumber != "undefined"
? "&$skiptoken=" +
('<cookie pagenumber="' + pageNumber + '" />')
: "");
}
console.log("adv qu: ", queryUrl);
var apiResponse = _.isEmpty(searchString) var apiResponse = _.isEmpty(searchString)
? res.status(400).json() ? res.status(400).json()
@@ -146,63 +169,57 @@ export default async function ApiProxy(req, res) {
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
if (_.has(searchString, "projecttype")) { if (_.has(searchString, "projecttype")) {
await updateValueArray(data, token); // await updateValueArray(data, token);
// async function updateValueArray(data, token) {
async function updateValueArray(data, token) { // for (let i = 0; i < data.value.length; i++) {
for (let i = 0; i < data.value.length; i++) { // const item = data.value[i];
const item = data.value[i]; // try {
// // Axios call using the `incidentid` to fetch additional data
try { // const response = await axios.get(
// Axios call using the `incidentid` to fetch additional data // WEBAPI_URL +
const response = await axios.get( // "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
WEBAPI_URL + // item.incidentid +
"pinswg_sipses?$filter=_pinswg_sipscase_value eq " + // " and _pinswg_projecttype_value eq " +
item.incidentid + // searchString.projecttype +
" and _pinswg_projecttype_value eq " + // "&$select=_pinswg_projecttype_value" +
searchString.projecttype + // hashAPIPath(
"&$select=_pinswg_projecttype_value" + // "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
hashAPIPath( // item.incidentid +
"pinswg_sipses?$filter=_pinswg_sipscase_value eq " + // " and _pinswg_projecttype_value eq " +
item.incidentid + // searchString.projecttype +
" and _pinswg_projecttype_value eq " + // "&$select=_pinswg_projecttype_value"
searchString.projecttype + // ),
"&$select=_pinswg_projecttype_value" // azureHeadersPaged(token.access_token)
), // );
azureHeadersPaged(token.access_token) // // Assuming the response contains the additional data you want to add
); // // console.log(response.data.value[0]);
// console.log(response.data.value);
// Assuming the response contains the additional data you want to add // if (
// console.log(response.data.value[0]); // response.data.value.length > 0 &&
console.log(response.data.value); // response.data.value[0]
// ._pinswg_projecttype_value != null
if ( // ) {
response.data.value.length > 0 && // Object.assign(
response.data.value[0] // item,
._pinswg_projecttype_value != null // response.data.value[0]
) { // ); // Update item with new data
Object.assign( // } else {
item, // console.log(
response.data.value[0] // `No project type found for incident ID ${item.incidentid}`
); // Update item with new data // );
} else { // }
console.log( // } catch (error) {
`No project type found for incident ID ${item.incidentid}` // console.error(
); // `Error fetching data for incident ID ${item.incidentid}:`,
} // error
} catch (error) { // );
console.error( // }
`Error fetching data for incident ID ${item.incidentid}:`, // }
error // }
); // data.value = data.value.filter(
} // (item) => item._pinswg_projecttype_value != null
} // );
} // data["@odata.count"] = data.value.length;
data.value = data.value.filter(
(item) => item._pinswg_projecttype_value != null
);
data["@odata.count"] = data.value.length;
} }
res.status(200).json(data); res.status(200).json(data);
@@ -214,3 +231,161 @@ export default async function ApiProxy(req, res) {
return apiResponse; return apiResponse;
} }
// export default async function ApiProxy(req, res) {
// var searchString = req.query.searchstring;
// var pageNumber = req.query.pageNumber;
// var token = await getToken();
// var orderby = req.query.orderby;
// var fieldSort = req.query.fieldSort;
// var showNumberOfRecords = req.query.showNumberOfRecords;
// searchString = _.isEmpty(searchString)
// ? searchString
// : JSON.parse(decodeURI(searchString));
// var queryString = "";
// queryString +=
// _.has(searchString, "q") && searchString.q != null
// ? "(contains(title, '" +
// searchString.q.replace(/\'/g, "''") +
// "') or contains(ticketnumber,'" +
// searchString.q.replace(/\'/g, "''") +
// "')) and"
// : "";
// queryString +=
// (_.has(searchString, "lpa") || _.has(searchString, "LPA")) &&
// searchString.lpa != null
// ? " _pinswg_associatedlpa_value eq " + searchString.lpa + " and"
// : "";
// queryString +=
// _.has(searchString, "apt") && searchString.apt != null
// ? " pinswg_appealcasetype eq " + searchString.apt + " and"
// : "";
// queryString +=
// _.has(searchString, "statuscode") && searchString.statuscode != null
// ? " statuscode eq " + searchString.statuscode + " and"
// : "";
// var queryUrl =
// "incidents?$select=pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title,_primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=" +
// queryString +
// " pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=" +
// orderby +
// " " +
// fieldSort +
// "&$count=true";
// console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
// var apiResponse = _.isEmpty(searchString)
// ? res.status(400).json()
// : axios
// .get(
// WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
// azureHeadersPagedCustom(
// token.access_token,
// showNumberOfRecords
// )
// )
// .then(async ({ data }) => {
// var dataStr;
// _.has(data, "@odata.nextLink") == true &&
// ((dataStr = JSON.stringify(data["@odata.nextLink"])),
// (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
// if (_.has(searchString, "projecttype")) {
// await updateValueArray(data, token);
// async function updateValueArray(data, token) {
// let hasNextPage = true;
// let nextPageUrl = data["@odata.nextLink"];
// // Loop through all pages
// while (hasNextPage) {
// // Iterate through current data and process it
// for (let i = 0; i < data.value.length; i++) {
// const item = data.value[i];
// try {
// // Axios call using the `incidentid` to fetch additional data
// const response = await axios.get(
// WEBAPI_URL +
// "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
// item.incidentid +
// " and _pinswg_projecttype_value eq " +
// searchString.projecttype +
// "&$select=_pinswg_projecttype_value" +
// hashAPIPath(
// "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
// item.incidentid +
// " and _pinswg_projecttype_value eq " +
// searchString.projecttype +
// "&$select=_pinswg_projecttype_value"
// ),
// azureHeadersPaged(token.access_token)
// );
// if (
// response.data.value.length > 0 &&
// response.data.value[0]
// ._pinswg_projecttype_value != null
// ) {
// Object.assign(
// item,
// response.data.value[0]
// ); // Update item with new data
// } else {
// console.log(
// `No project type found for incident ID ${item.incidentid}`
// );
// }
// } catch (error) {
// console.error(
// `Error fetching data for incident ID ${item.incidentid}:`,
// error
// );
// }
// }
// // If there's a next page, fetch it
// if (nextPageUrl) {
// const nextPageData = await axios.get(
// WEBAPI_URL +
// nextPageUrl +
// hashAPIPath(nextPageUrl),
// azureHeadersPaged(token.access_token)
// );
// data.value = [
// ...data.value,
// ...nextPageData.data.value,
// ];
// nextPageUrl =
// nextPageData.data["@odata.nextLink"];
// } else {
// hasNextPage = false;
// }
// }
// }
// data.value = data.value.filter(
// (item) => item._pinswg_projecttype_value != null
// );
// data["@odata.count"] = data.value.length;
// }
// res.status(200).json(data);
// })
// .catch((error) => {
// consoleLogger(error);
// res.status(400).json(error);
// });
// return apiResponse;
// }