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

14769 search by project type

Browse Source
This commit is contained in:
robbond
2025-03-21 17:40:11 +00:00
parent 4d4d1fe995
commit b50f94074b
14 changed files with 379 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/advancedsearch.js
+7 -4
View File
@@ -3,14 +3,14 @@ import useTranslation from "next-translate/useTranslation";
import Head from "next/head";
import { useRouter } from "next/router";
import { connect } from "react-redux";
import { getAppealsTypes, getLPA } from "../actions";
import { getAppealsTypes, getProjectTypes, getLPA } from "../actions";
import Breadcrumbs from "../components/breadcrumbs";
import CookieBanner from "../components/cookieBanner";
import CRMError from "../components/crmError";
import Footer from "../components/footer";
import Header from "../components/header";
import Search from "../components/search";
import { setAppealType } from "../store/appealType/action";
import { setAppealType, setProjectType } from "../store/appealType/action";
import { setLPA } from "../store/lpa/action";
import { wrapper } from "../store/store";
import ServiceBanner from "../components/servicebanner";
@@ -110,6 +110,7 @@ const Home = (props) => {
<Search
lpadata={props.LPAData}
appealType={props.appealType}
props={props}
/>
)}
</div>
@@ -122,8 +123,9 @@ const Home = (props) => {
export const getServerSideProps = wrapper.getServerSideProps(
(store) =>
async ({ query, req, res }) => {
let [appealTypeData, lpaData] = await Promise.all([
let [appealTypeData, projectTypeData, lpaData] = await Promise.all([
await getAppealsTypes(),
await getProjectTypes(),
await getLPA(),
]);
@@ -131,6 +133,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
//const appealTypeData = require("../data/appealtypes.json");
store.dispatch(setAppealType(appealTypeData));
store.dispatch(setProjectType(projectTypeData));
store.dispatch(setLPA(lpaData));
}
);
@@ -142,7 +145,7 @@ const mapStateToProps = (state) => {
formData: state.formData,
appealType: state.appealType,
LPAData: state.LPAData,
//form: state.form,
form: state.form,
accountDetails: state.accountDetails,
};
};
pages/api/endpoint/getadvancedsearch_api.js
+64 -1
View File
@@ -95,11 +95,74 @@ export default async function ApiProxy(req, res) {
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
azureHeadersPaged(token.access_token)
)
.then(({ data }) => {
.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) {
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)
);
// Assuming the response contains the additional data you want to add
// console.log(response.data.value[0]);
console.log(response.data.value);
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
);
}
}
}
data.value = data.value.filter(
(item) => item._pinswg_projecttype_value != null
);
data["@odata.count"] = data.value.length;
// console.log(newDataObj);
}
res.status(200).json(data);
})
.catch((error) => {
pages/api/endpoint/getadvancedsearchpaged_api.js
+63 -1
View File
@@ -52,6 +52,7 @@ import CryptoJS from "crypto-js";
import _ from "lodash";
import {
azureHeadersPagedCustom,
azureHeadersPaged,
consoleLogger,
getToken,
} from "../../../actions";
@@ -138,11 +139,72 @@ export default async function ApiProxy(req, res) {
showNumberOfRecords
)
)
.then(({ data }) => {
.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) {
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)
);
// Assuming the response contains the additional data you want to add
// console.log(response.data.value[0]);
console.log(response.data.value);
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
);
}
}
}
data.value = data.value.filter(
(item) => item._pinswg_projecttype_value != null
);
data["@odata.count"] = data.value.length;
}
res.status(200).json(data);
})
.catch((error) => {
pages/api/endpoint/getprojecttypes_api.js
+54
View File
@@ -0,0 +1,54 @@
/**
* @swagger
* /api/endpoint/getappealtypes_api:
* get:
* tags: [Misc]
* description: Get Appeal Types
* responses:
* 200:
* description: Success
*/
import axios from "axios";
import CryptoJS from "crypto-js";
import { azureHeaders, consoleLogger, getToken } from "../../../actions";
const WORDKEY = process.env.HASHKEY;
const WEBAPI_URL =
process.env.RELAY_ROOT ||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
const hashAPIPath = (queryPath) => {
var hashlink = CryptoJS.HmacSHA256(
queryPath,
CryptoJS.enc.Hex.parse(WORDKEY)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
//return "&hash=" + hashlink;
return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
};
export default async function ApiProxy(req, res) {
var token = await getToken();
var queryUrl =
"pinswg_sipsprojecttypes?$select=pinswg_name,pinswg_sector,pinswg_sipsprojecttypeid&$orderby=pinswg_name asc&$count=true";
//console.log(queryUrl);
return axios
.get(
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
azureHeaders(token.access_token)
)
.then(({ data }) => {
res.status(200).json(data);
})
.catch((error) => {
consoleLogger(error);
res.status(400).json(error);
});
}