{t("myportal:appeal-type-label")}:{" "}
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
getFormCollectionByID(
showTopThreeArr[key]
.pinswg_appealcasetype
).value +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: getFormCollectionByID(
showTopThreeArr[key]
.pinswg_appealcasetype
@@ -293,14 +295,16 @@ const AwaitingSubmissionFromBlob = (props) => {
:
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
showTopThreeArr[key][
"pinswg_lpaname"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: showTopThreeArr[key][
"pinswg_lpaname"
] || ""}
diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index 9c33cdbb..640e9c96 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -326,14 +326,16 @@ const TopThree = (props) => {
{t("myportal:appeal-type-label")}:{" "}
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
showTopThreeArr[key][
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: showTopThreeArr[key][
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] || ""}
@@ -396,14 +398,16 @@ const TopThree = (props) => {
{router.locale == "cy" ? "ACLl" : "LPA"}:
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
showTopThreeArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: showTopThreeArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || ""}
diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index 8ebbbaff..c60f87a1 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -269,42 +269,50 @@ const TopThree = (props) => {
{" "}
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
showTopThreeArr[key].representationType +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: showTopThreeArr[key].representationType || ""}
{t("myportal:capacity")}:
{" "}
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
showTopThreeArr[key]
.representationCapacity +
'" ||@.value_cy=="' +
showTopThreeArr[key]
.representationCapacity +
'" )].value_cy',
- transLookup
- )
- : jsonpath(
- '$..[?(@.value_cy=="' +
+ json: transLookup,
+ sandbox: {},
+ })
+ : jsonpath({
+ path:
+ '$..[?(@.value_cy=="' +
showTopThreeArr[key]
.representationCapacity +
'")].value',
- transLookup
- ).length > 0
- ? jsonpath(
- '$..[?(@.value_cy=="' +
+ json: transLookup,
+ sandbox: {},
+ }).length > 0
+ ? jsonpath({
+ path:
+ '$..[?(@.value_cy=="' +
showTopThreeArr[key]
.representationCapacity +
'")].value',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: showTopThreeArr[key].representationCapacity}
@@ -317,14 +325,16 @@ const TopThree = (props) => {
{" "}
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
showTopThreeArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: showTopThreeArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] || ""}
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index 8e353e9e..2cb23571 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -112,8 +112,9 @@ const ViewAllResults = (props) => {
let resultsRowArr = [];
const buildResultsRowArr = () => {
resultsArr.map((item, key) => {
- let detailsObj = jsonpath(
- "$" +
+ let detailsObj = jsonpath({
+ path:
+ "$" +
(currentView.viewKey == "myRepresentations"
? ""
: "..value") +
@@ -126,8 +127,9 @@ const ViewAllResults = (props) => {
? item.pinswg_name
: item.pinswg_title) +
'")]',
- searchDetailsObj
- );
+ json: searchDetailsObj,
+ sandbox: {},
+ });
detailsObj = detailsObj[0];
//console.log(searchDetailsObj[key]);
@@ -476,26 +478,30 @@ const ViewAllResults = (props) => {
{currentView.viewKey == "awaitingSubmissionDetails" &&
_.has(resultsArr[key], "pinswg_lpaname")
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
resultsArr[key].pinswg_lpaname +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: resultsArr[key].pinswg_lpaname || "N/A"
: ""}
{_.has(resultsArr[key], [
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
resultsArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: resultsArr[key][
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -504,14 +510,16 @@ const ViewAllResults = (props) => {
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
searchDetailsObj[key].value[0][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: currentView.viewKey == "myRepresentations"
? searchDetailsObj[key].value
: searchDetailsObj[key].value[0][
@@ -522,14 +530,16 @@ const ViewAllResults = (props) => {
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
resultsArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: resultsArr[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] ||
@@ -538,14 +548,16 @@ const ViewAllResults = (props) => {
: "N/A")
: currentView.viewKey == "myRepresentations" &&
router.locale == "cy" &&
- jsonpath(
- '$..[?(@.value=="' +
+ jsonpath({
+ path:
+ '$..[?(@.value=="' +
searchDetailsObj[key][
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )}
+ json: transLookup,
+ sandbox: {},
+ })}
@@ -554,26 +566,30 @@ const ViewAllResults = (props) => {
{currentView.viewKey == "awaitingSubmissionDetails"
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
getFormCollectionByID(
item.pinswg_appealcasetype
).value +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: getFormCollectionByID(
item.pinswg_appealcasetype
).value || "N/A"
: router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] ||
@@ -583,14 +599,16 @@ const ViewAllResults = (props) => {
{currentView.viewKey == "myRepresentations" &&
(router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
getFormCollectionByID(
searchDetailsObj[key].appealType
).value +
'")].value_cy',
- transLookup
- )[0]
+ json: transLookup,
+ sandbox: {},
+ })[0]
: getFormCollectionByID(
searchDetailsObj[key].appealType
).value)}
@@ -609,21 +627,25 @@ const ViewAllResults = (props) => {
{currentView.viewKey == "awaitingSubmissionDetails"
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.statuscode=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.statuscode=="' +
item.statuscode +
'")].value_cy',
- transLookup
- )
- : jsonpath(
- '$..[?(@.statuscode=="' +
+ json: transLookup,
+ sandbox: {},
+ })
+ : jsonpath({
+ path:
+ '$..[?(@.statuscode=="' +
item.statuscode +
'")].value',
- transLookup
- ) || "N/A"
+ json: transLookup,
+ sandbox: {},
+ }) || "N/A"
: currentView.viewKey == "myRepresentations"
? repRaisedDate(item.repfile_name) // ? router.locale == "cy"
- : // ? jsonpath(
+ : // ? jsonpath({path:
//
// '$..[?(@.value=="' +
// searchDetailsObj[key].value[0][
@@ -635,7 +657,7 @@ const ViewAllResults = (props) => {
// "statuscode@OData.Community.Display.V1.FormattedValue"
// ] || "N/A"
// : router.locale == "cy"
- // ? jsonpath(
+ // ? jsonpath({path:
//
// '$..[?(@.value=="' +
// item[
@@ -645,14 +667,16 @@ const ViewAllResults = (props) => {
// )
router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
diff --git a/components/newappeal/buildcheckrow.js b/components/newappeal/buildcheckrow.js
index 339da986..374080bc 100644
--- a/components/newappeal/buildcheckrow.js
+++ b/components/newappeal/buildcheckrow.js
@@ -63,11 +63,19 @@ let BuildCheckRow = (props) => {
const { locale } = router;
const { appealtypes } = router.query;
- let formObj = jsonpath("$['" + appealtypes + "']", fieldLookup);
+ let formObj = jsonpath({
+ path: "$['" + appealtypes + "']",
+ json: fieldLookup,
+ sandbox: {},
+ });
let labelTrans =
router.locale == "cy"
- ? jsonpath('$..[?(@.value=="' + label + '")].value_cy', formObj)
+ ? jsonpath({
+ path: '$..[?(@.value=="' + label + '")].value_cy',
+ json: formObj,
+ sandbox: {},
+ })
: label;
return labelTrans;
};
@@ -93,12 +101,14 @@ let BuildCheckRow = (props) => {
var rows = xpath.select("//label/@description", doc);
var fieldtype = xpath.select("//@classid", doc);
var datafieldname = xpath.select("//@datafieldname", doc);
- const isRequiredField = jsonpath(
- "$..value[?(@.LogicalName=='" +
+ const isRequiredField = jsonpath({
+ path:
+ "$..value[?(@.LogicalName=='" +
datafieldname[0].value +
"')]",
- mandatoryFieldsData
- );
+ json: mandatoryFieldsData,
+ sandbox: {},
+ });
var documentTypeCode = xpath.select(
"//@ishareDocumentCode",
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js
index ea5d2c9c..519f5c1e 100644
--- a/components/newappeal/buildchecksection.js
+++ b/components/newappeal/buildchecksection.js
@@ -127,11 +127,19 @@ let BuildCheckSection = (props) => {
const { locale } = router;
const { appealtypes } = router.query;
- let formObj = jsonpath("$['" + appealtypes + "']", fieldLookup);
+ let formObj = jsonpath({
+ path: "$['" + appealtypes + "']",
+ json: fieldLookup,
+ sandbox: {},
+ });
let labelTrans =
router.locale == "cy"
- ? jsonpath('$..[?(@.value=="' + label + '")].value_cy', formObj)
+ ? jsonpath({
+ path: '$..[?(@.value=="' + label + '")].value_cy',
+ json: formObj,
+ sandbox: {},
+ })
: label;
return labelTrans;
};
diff --git a/components/newappeal/buildrow.js b/components/newappeal/buildrow.js
index 1919a103..8150df40 100644
--- a/components/newappeal/buildrow.js
+++ b/components/newappeal/buildrow.js
@@ -110,7 +110,7 @@ export default function BuildRow(props) {
dateEnd = !_.isEmpty(dateEnd) && dateEnd[0].value;
- //const isRequiredField = jsonpath(
+ //const isRequiredField = jsonpath({path:
// "$..value[?(@.LogicalName=='" +
// datafieldname[0].value +
// "')]",
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index 93d6be68..da9b9aee 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -65,12 +65,14 @@ const RenderLPAList = ({
value={optionsObj[key].accountid}
>
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
optionsObj[key].name +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: optionsObj[key].name}
);
@@ -147,12 +149,14 @@ const RenderAppealTypeList = ({
: _.isEmpty(optionsObj[key].value)
? ""
: router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
optionsObj[key].value +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: optionsObj[key].value}
);
diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js
index a4671f82..efb4e758 100644
--- a/components/pdftemplates/appealRow_pdf.js
+++ b/components/pdftemplates/appealRow_pdf.js
@@ -148,7 +148,11 @@ export const AppealRow_pdf = (props) => {
const FieldsTranslations = (label) => {
const { appealtypes } = router.query;
- let formObj = jsonpath("$['" + appealtypes + "']", fieldLookup);
+ let formObj = jsonpath({
+ path: "$['" + appealtypes + "']",
+ json: fieldLookup,
+ sandbox: {},
+ });
let labelTrans = label;
return labelTrans;
@@ -390,7 +394,7 @@ export const AppealRow_pdf = (props) => {
);
break;
case "{16D63FD6-119B-4353-BDCA-18358721C3FE}":
- // const blobList = jsonpath(
+ // const blobList = jsonpath({path:
// "$..[?(@.documentType=='" +
// documentTypeCode[0].value +
// "')]",
diff --git a/components/search/addresssearchresults.js b/components/search/addresssearchresults.js
index ae86a26f..30918cba 100644
--- a/components/search/addresssearchresults.js
+++ b/components/search/addresssearchresults.js
@@ -95,10 +95,14 @@ const SearchResults = (props) => {
};
const isWatchedCase = (whichIncident) => {
- let isWatched = jsonpath(
- "$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
- watchedCases
- );
+ let isWatched = jsonpath({
+ path:
+ "$..value[?(@._pinswg_watchedcase_value=='" +
+ whichIncident +
+ "')]",
+ json: watchedCases,
+ sandbox: {},
+ });
return isWatched;
};
@@ -241,12 +245,15 @@ const SearchResults = (props) => {
) : (
resultsArrPaged.map((item, key) => {
- let detailsObj = jsonpath(
- '$..value[?(@.pinswg_name=="' +
+ let detailsObj = jsonpath({
+ path:
+ '$..value[?(@.pinswg_name=="' +
item.pinswg_name +
'")]',
- searchDetailsObj
- );
+
+ json: searchDetailsObj,
+ sandbox: {},
+ });
detailsObj = detailsObj[0];
return (
{
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -469,14 +478,16 @@ const SearchResults = (props) => {
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -490,14 +501,16 @@ const SearchResults = (props) => {
:
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"pinswg_appealType"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item["pinswg_appealType"] ||
"N/A"}
@@ -510,14 +523,16 @@ const SearchResults = (props) => {
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js
index 1c23b9a1..8a863dbc 100644
--- a/components/search/advancedsearch.js
+++ b/components/search/advancedsearch.js
@@ -126,13 +126,15 @@ const RenderCaseStatusList = ({
: _.isEmpty(optionsObj[key].value)
? ""
: router.locale == "cy"
- ? jsonpath(
- '$..[?(@.statuscode=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.statuscode=="' +
optionsObj[key]
.statuscode +
'")].value_cy',
- optionsObj
- )
+ json: optionsObj,
+ sandbox: {},
+ })
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
@@ -249,13 +251,15 @@ let AdvancedSearch = (props) => {
{/* {optionsObj[key].name} */}
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
optionsObj[key]
.name +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: optionsObj[key].name ||
t(
"case:summary-no-date-entered-label"
@@ -352,13 +356,15 @@ let AdvancedSearch = (props) => {
)
? ""
: router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
optionsObj[key]
.value +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index 29694ff9..c8e6965c 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -172,10 +172,14 @@ const DNSSearchResults = (props) => {
};
const isWatchedCase = (whichIncident) => {
- let isWatched = jsonpath(
- "$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
- watchedCases
- );
+ let isWatched = jsonpath({
+ path:
+ "$..value[?(@._pinswg_watchedcase_value=='" +
+ whichIncident +
+ "')]",
+ json: watchedCases,
+ sandbox: {},
+ });
return isWatched;
};
@@ -308,12 +312,14 @@ const DNSSearchResults = (props) => {
) : (
resultsArr.map((item, key) => {
- let detailsObj = jsonpath(
- '$..value[?(@.pinswg_name=="' +
+ let detailsObj = jsonpath({
+ path:
+ '$..value[?(@.pinswg_name=="' +
item.title +
'")]',
- searchDetailsObj
- );
+ json: searchDetailsObj,
+ sandbox: {},
+ });
detailsObj = detailsObj[0];
var appType =
@@ -509,14 +515,16 @@ const DNSSearchResults = (props) => {
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -530,14 +538,16 @@ const DNSSearchResults = (props) => {
:
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index 71442be0..52c76863 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -101,10 +101,15 @@ const SearchResults = (props) => {
};
const isWatchedCase = (whichIncident) => {
- let isWatched = jsonpath(
- "$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
- watchedCases
- );
+ let isWatched = jsonpath({
+ path:
+ "$..value[?(@._pinswg_watchedcase_value=='" +
+ whichIncident +
+ "')]",
+
+ json: watchedCases,
+ sandbox: {},
+ });
return isWatched;
};
@@ -246,12 +251,14 @@ const SearchResults = (props) => {
) : (
resultsArr.map((item, key) => {
- let detailsObj = jsonpath(
- '$..value[?(@.pinswg_name=="' +
+ let detailsObj = jsonpath({
+ path:
+ '$..value[?(@.pinswg_name=="' +
item.title +
'")]',
- searchDetailsObj
- );
+ json: searchDetailsObj,
+ sandbox: {},
+ });
Object.assign(item, item.pinswg_sipscase);
@@ -473,14 +480,16 @@ const SearchResults = (props) => {
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -494,14 +503,16 @@ const SearchResults = (props) => {
:
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
@@ -515,14 +526,16 @@ const SearchResults = (props) => {
{router.locale == "cy"
- ? jsonpath(
- '$..[?(@.value=="' +
+ ? jsonpath({
+ path:
+ '$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
- transLookup
- )
+ json: transLookup,
+ sandbox: {},
+ })
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
diff --git a/components/utils/index.js b/components/utils/index.js
index f3d07bde..fb846316 100644
--- a/components/utils/index.js
+++ b/components/utils/index.js
@@ -17,52 +17,67 @@ import xpath from "xpath";
* @param String formtype - string from appeal entity name
*/
export const getFormCollection = (formtype) => {
- const collectionName = jsonpath(
- "$..[?(@.LogicalName=='" + formtype + "')]",
- data
- );
+ const collectionName = jsonpath({
+ path: "$..[?(@.LogicalName=='" + formtype + "')]",
+ json: data,
+ sandbox: {},
+ });
return collectionName[0];
};
export const getFormCollectionByID = (appealTypeID) => {
- const collectionName = jsonpath(
- "$..[?(@.appealTypeID =='" + appealTypeID + "')]",
- data
- );
+ const collectionName = jsonpath({
+ path: "$..[?(@.appealTypeID =='" + appealTypeID + "')]",
+ json: data,
+ sandbox: {},
+ });
return collectionName[0];
};
export const getFormIDByLogicalName = (appealTypeLogicalName) => {
- const collectionName = jsonpath(
- "$..[?(@.LogicalName =='" + appealTypeLogicalName + "')]",
- data
- );
+ const collectionName = jsonpath({
+ path: "$..[?(@.LogicalName =='" + appealTypeLogicalName + "')]",
+ json: data,
+ sandbox: {},
+ });
return collectionName[0];
};
export const getPickListLabel = (data, picklistType, picklistID) => {
- const pickListData = jsonpath(
- "$..[?(@.LogicalName=='" + picklistType + "')]",
- data
- );
+ const pickListData = jsonpath({
+ path: "$..[?(@.LogicalName=='" + picklistType + "')]",
+ json: data,
+ sandbox: {},
+ });
- const pickListLabel = jsonpath(
- "$..[?(@.Value=='" + picklistID + "')].Label.LocalizedLabels..Label",
- pickListData
- );
+ const pickListLabel = jsonpath({
+ path:
+ "$..[?(@.Value=='" +
+ picklistID +
+ "')].Label.LocalizedLabels..Label",
+
+ json: pickListData,
+ sandbox: {},
+ });
return pickListLabel[0];
};
export const getRadioLabel = (data, radiotListName, radioListID) => {
- const radioListData = jsonpath(
- "$..[?(@.LogicalName=='" + radiotListName + "')]",
- data
- );
+ const radioListData = jsonpath({
+ path: "$..[?(@.LogicalName=='" + radiotListName + "')]",
+ json: data,
+ sandbox: {},
+ });
- const pickListLabel = jsonpath(
- "$..[?(@.Value=='" + radioListID + "')].Label.LocalizedLabels..Label",
- radioListData
- );
+ const pickListLabel = jsonpath({
+ path:
+ "$..[?(@.Value=='" +
+ radioListID +
+ "')].Label.LocalizedLabels..Label",
+
+ json: radioListData,
+ sandbox: {},
+ });
return pickListLabel[0];
};
@@ -319,12 +334,14 @@ export const getProgressObj = (
dateEnd = !_.isEmpty(dateEnd) && dateEnd[0].value;
- const isRequiredField = jsonpath(
- "$..value[?(@.LogicalName=='" +
+ const isRequiredField = jsonpath({
+ path:
+ "$..value[?(@.LogicalName=='" +
datafieldname[0].value +
"')]",
- mandatoryFieldsData
- );
+ json: mandatoryFieldsData,
+ sandbox: {},
+ });
if (datafieldname[0].value.includes("pinswg_fileUpload")) {
if (typeof isRequiredField[0] != "undefined") {
diff --git a/middleware.js b/middleware.js
index a07e56ce..afd4fc0b 100644
--- a/middleware.js
+++ b/middleware.js
@@ -40,7 +40,10 @@ export function middleware(request) {
.trim();
const requestHeaders = new Headers(request.headers);
+ // Unique trusted nonce
requestHeaders.set("x-nonce", nonce);
+
+ // CSP policy
requestHeaders.set(
"Content-Security-Policy",
contentSecurityPolicyHeaderValue
@@ -56,24 +59,29 @@ export function middleware(request) {
contentSecurityPolicyHeaderValue
);
+ // XSS protection (legacy)
+ response.headers.set("X-XSS-Protection", "1; mode=block");
+
+ // Prevent MIME type sniffing
+ response.headers.set("X-Content-Type-Options", "nosniff");
+
+ // Prevent iframe embedding
+ response.headers.set("X-Frame-Options", "DENY");
+
+ // Referrer policy
+ response.headers.set("Referrer-Policy", "strict-origin-when-cross-origin");
+
+ // Permissions lockdown
+ response.headers.set(
+ "Permissions-Policy",
+ "geolocation=(), camera=(), microphone=(), fullscreen=(self)"
+ );
+
+ // Enforce HTTPS via HSTS
+ response.headers.set(
+ "Strict-Transport-Security",
+ "max-age=63072000; includeSubDomains; preload"
+ );
+
return response;
}
-
-// export const config = {
-// matcher: [
-// /*
-// * Match all request paths except for the ones starting with:
-// * - api (API routes)
-// * - _next/static (static files)
-// * - _next/image (image optimization files)
-// * - favicon.ico (favicon file)
-// */
-// {
-// source: "/((?!api|_next/static|_next/image|favicon.ico).*)",
-// missing: [
-// { type: "header", key: "next-router-prefetch" },
-// { type: "header", key: "purpose", value: "prefetch" },
-// ],
-// },
-// ],
-// };
diff --git a/package.json b/package.json
index 25e7f5bd..42fe9764 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
"govuk-frontend": "^5.0.0",
"history": "^5.3.0",
"jsonpath": "^1.1.1",
- "jsonpath-plus": "^4.0.0",
+ "jsonpath-plus": "^10.3.0",
"leaflet": "^1.9.4",
"leaflet-defaulticon-compatibility": "^0.1.2",
"lodash": "^4.17.21",
@@ -104,4 +104,4 @@
"eslint-plugin-jsdoc": "^48.2.3",
"prisma": "^5.0.0"
}
-}
\ No newline at end of file
+}
diff --git a/pages/api/endpoint/getbasicsearch_by_address_api.js b/pages/api/endpoint/getbasicsearch_by_address_api.js
index 72101e2f..683121e6 100644
--- a/pages/api/endpoint/getbasicsearch_by_address_api.js
+++ b/pages/api/endpoint/getbasicsearch_by_address_api.js
@@ -627,7 +627,11 @@ export default async function ApiProxy(req, res) {
})
);
- searchResultsObj = jsonpath("$..[?(@ && @.pinswg_name)]", searchResultsObj);
+ searchResultsObj = jsonpath({
+ path: "$..[?(@ && @.pinswg_name)]",
+ json: searchResultsObj,
+ sandbox: {},
+ });
searchResultsObj = searchResultsObj.filter((arr) => arr.incidentid != null);
diff --git a/pages/api/endpoint/getmylpacases_api.js b/pages/api/endpoint/getmylpacases_api.js
index 5652e639..25db7730 100644
--- a/pages/api/endpoint/getmylpacases_api.js
+++ b/pages/api/endpoint/getmylpacases_api.js
@@ -48,7 +48,11 @@ export default async function ApiProxy(req, res) {
const lpaList = await getLPA();
- const lpaGUID = jsonpath('$..[?(@.name=="' + lpaid + '")]', lpaList);
+ const lpaGUID = jsonpath({
+ path: '$..[?(@.name=="' + lpaid + '")]',
+ json: lpaList,
+ sandbox: {},
+ });
//console.log(
// '$..[?(@.name="' + lpaid + '")]',
diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js
index c4975bb5..74d6d1ee 100644
--- a/pages/myportal/[appealtypes].js
+++ b/pages/myportal/[appealtypes].js
@@ -76,10 +76,11 @@ let Home = (props) => {
let optionsStr = props.appealType.appealTypeOptions.value || {};
- let selectedObj = jsonpath(
- "$..[?(@.attributevalue=='" + router.query.apt + "')]",
- optionsStr
- );
+ let selectedObj = jsonpath({
+ path: "$..[?(@.attributevalue=='" + router.query.apt + "')]",
+ json: optionsStr,
+ sandbox: {},
+ });
//let optionsTitleObj = [];
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index 4c5945b0..e4be195a 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -68,10 +68,11 @@ let Home = (props) => {
let optionsStr = props.appealType.appealTypeOptions.value;
- let selectedObj = jsonpath(
- "$..[?(@.attributevalue=='" + router.query.apt + "')]",
- optionsStr
- );
+ let selectedObj = jsonpath({
+ path: "$..[?(@.attributevalue=='" + router.query.apt + "')]",
+ json: optionsStr,
+ sandbox: {},
+ });
//let optionsTitleObj = [];