diff --git a/components/case/caseNoticeBanner.js b/components/case/caseNoticeBanner.js index 23d63cd2..b510801b 100644 --- a/components/case/caseNoticeBanner.js +++ b/components/case/caseNoticeBanner.js @@ -20,7 +20,7 @@ export default function CaseNoticeBanner(props) { return ( <> {messagesObjArr.map((message, index) => ( - <> +
{todaysDate.toISOString() >= message.scheduledstart && todaysDate.toISOString() <= message.scheduledend && (
)} - +
))} ); diff --git a/components/case/documents.js b/components/case/documents.js index bc401367..315b15b3 100644 --- a/components/case/documents.js +++ b/components/case/documents.js @@ -158,9 +158,9 @@ const DocumentDetails = (props) => { @@ -175,11 +175,11 @@ const DocumentDetails = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item.pinswg_isharedocumentlocationsLabel + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item.pinswg_isharedocumentlocationsLabel || t( @@ -325,7 +325,7 @@ const DocumentDetails = (props) => { documentDetailsArr.map((item, key) => { let detailsObj = jsonpath({ path: - "$..[?(@._pinswg_documentids_value=='" + + "$..[?(@ && @._pinswg_documentids_value=='" + incidentid + "')]", json: item, @@ -413,7 +413,7 @@ const DocumentDetails = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue" ] + @@ -581,7 +581,7 @@ const DocumentDetails = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item.pinswg_isharedocumentlocationsLabel + '")].value_cy', jsonL: transLookup, @@ -742,11 +742,11 @@ const DocumentDetails = (props) => { documentDetailsArr.map((item, key) => { let detailsObj = jsonpath({ path: - "$..[?(@._pinswg_documentids_value=='" + + "$..[?(@ && @._pinswg_documentids_value=='" + incidentid + "')]", json: item, - sandbox: {}, + eval: true, }); detailsObj = item; return ( @@ -835,13 +835,13 @@ const DocumentDetails = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/representation/index.js b/components/case/representation/index.js index ce849cbe..10fe030d 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -210,20 +210,20 @@ let MakeRepresentation = (props) => { currentType == "searchResultsObj" ? (casesObj = jsonpath({ - path: '$..[?(@.title=="' + caseReference + '")]', + path: '$..[?(@ && @.title=="' + caseReference + '")]', json: setCaseQueryObj, - sandbox: {}, + eval: true, })) : currentType == "watchedCases" ? (casesObj = jsonpath({ - path: '$..[?(@.ticketnumber=="' + caseReference + '")]', + path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]', json: watchedCases, - sandbox: {}, + eval: true, })) : (casesObj = jsonpath({ - path: '$..[?(@.reference=="' + caseReference + '")]', + path: '$..[?(@ && @.reference=="' + caseReference + '")]', json: setCaseQueryObj, - sandbox: {}, + eval: true, })); casesObj = Object.assign({}, ...casesObj); @@ -267,11 +267,11 @@ let MakeRepresentation = (props) => { resultsObj = jsonpath({ path: - '$..[?(@.ticketnumber=="' + + '$..[?(@ && @.ticketnumber=="' + currentView.caseReference.currentReference + '")]', json: setCaseResultsObj, - sandbox: {}, + eval: true, }); resultsObj = resultsObj[0]; @@ -280,25 +280,27 @@ let MakeRepresentation = (props) => { ? router.query.state == "edit" ? jsonpath({ path: - '$..[?(@.repfile_name =="' + router.query.created + '")]', + '$..[?(@ && @.repfile_name =="' + + router.query.created + + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_name =="' + + '$..[?(@ && @.pinswg_name =="' + currentView.caseReference.currentReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_name =="' + + '$..[?(@ && @.pinswg_name =="' + currentView.caseReference.currentReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; @@ -943,9 +945,9 @@ let MakeRepresentation = (props) => { var detailsObj = {}; detailsObj = jsonpath({ - path: '$..[?(@.pinswg_name=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js index c5c39db2..6e13b87e 100644 --- a/components/case/representation/representationAgent.js +++ b/components/case/representation/representationAgent.js @@ -287,13 +287,13 @@ const RepAgent = (props) => { props.props.props.form[props.form] .values || {}; - console.log("valuesobj:", valuesObj); + //console.log("valuesobj:", valuesObj); delete valuesObj[ "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateRepresentation( valuesObj, false, diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js index 64ccd627..5dc66794 100644 --- a/components/case/representation/representationAppellant.js +++ b/components/case/representation/representationAppellant.js @@ -275,13 +275,13 @@ const RepAppellant = (props) => { props.props.props.form[props.form] .values || {}; - console.log("valuesobj:", valuesObj); + //console.log("valuesobj:", valuesObj); delete valuesObj[ "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateRepresentation( valuesObj, false, diff --git a/components/case/representation/representationDetails.js b/components/case/representation/representationDetails.js index 8b32d7a3..0276a089 100644 --- a/components/case/representation/representationDetails.js +++ b/components/case/representation/representationDetails.js @@ -29,9 +29,9 @@ const RepDetails = (props) => { : caseReference; detailsObj = jsonpath({ - path: '$..[?(@.pinswg_name=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js index 6967c61d..11c3cca6 100644 --- a/components/case/representation/representationInterestedPartyPerson.js +++ b/components/case/representation/representationInterestedPartyPerson.js @@ -283,13 +283,13 @@ const RepInterestedPartyPerson = (props) => { props.props.props.form[props.form] .values || {}; - console.log("valuesobj:", valuesObj); + //console.log("valuesobj:", valuesObj); delete valuesObj[ "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateRepresentation( valuesObj, false, diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js index d2950f83..9818fe09 100644 --- a/components/case/representation/representationLPA.js +++ b/components/case/representation/representationLPA.js @@ -178,11 +178,11 @@ let RepLPA = (props) => { detailsObj = jsonpath({ path: - '$..[?(@.pinswg_name=="' + + '$..[?(@ && @.pinswg_name=="' + currentView.caseReference.currentReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }); let setCaseResultssObj = router.query.hasOwnProperty("state") @@ -197,11 +197,11 @@ let RepLPA = (props) => { resultsObj = jsonpath({ path: - '$..[?(@.pinswg_name=="' + + '$..[?@ && @.pinswg_name=="' + currentView.caseReference.currentReference + '")]', json: setCaseResultssObj, - sandbox: {}, + eval: true, }); resultsObj = resultsObj[0]; @@ -480,16 +480,16 @@ let RepLPA = (props) => { props.form ].values || {}; - console.log( - "valuesobj:", - valuesObj - ); + // console.log( + // "valuesobj:", + // valuesObj + // ); delete valuesObj[ "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateRepresentation( valuesObj, false, @@ -515,13 +515,13 @@ let RepLPA = (props) => { props.props.props.form[props.form] .values || {}; - console.log("valuesobj:", valuesObj); + //console.log("valuesobj:", valuesObj); delete valuesObj[ "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateRepresentation( valuesObj, false, @@ -571,16 +571,16 @@ let RepLPA = (props) => { props.form ].values || {}; - console.log( - "valuesobj:", - valuesObj - ); + // console.log( + // "valuesobj:", + // valuesObj + // ); delete valuesObj[ "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateRepresentation( valuesObj, false, diff --git a/components/case/representation/representationLPADetails.js b/components/case/representation/representationLPADetails.js index b9433e0b..55c19618 100644 --- a/components/case/representation/representationLPADetails.js +++ b/components/case/representation/representationLPADetails.js @@ -21,9 +21,9 @@ const RepLPADetails = (props) => { var detailsObj = {}; detailsObj = jsonpath({ - path: '$..[?(@.pinswg_name=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js index ef433f52..d8fdfbe0 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js @@ -60,11 +60,11 @@ let Enforcement_Questionnaire = (props) => { detailsObj = jsonpath({ path: - '$..[?(@.pinswg_name=="' + + '$..[?(@ && @.pinswg_name=="' + currentView.caseReference.currentReference + '")]', json: setCaseDetailsObj, - sandbox: {}, + eval: true, }); let setCaseResultssObj = router.query.hasOwnProperty("state") @@ -83,11 +83,11 @@ let Enforcement_Questionnaire = (props) => { resultsObj = jsonpath({ path: - '$..[?(@.ticketnumber=="' + + '$..[?(@ && @.ticketnumber=="' + currentView.caseReference.currentReference + '")]', json: setCaseResultssObj, - sandbox: {}, + eval: true, }); resultsObj = resultsObj[0]; diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index 20b6cc6a..b0260007 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -62,11 +62,11 @@ let S78_Questionnaire = (props) => { detailsObj = jsonpath({ path: - '$..[?(@.pinswg_name=="' + + '$..[?(@ && @.pinswg_name=="' + currentView.caseReference.currentReference + '")]', json: setCaseResultssObj, - sandbox: {}, + eval: true, }); let setCaseResultssObj = router.query.hasOwnProperty("state") @@ -85,7 +85,7 @@ let S78_Questionnaire = (props) => { resultsObj = jsonpath({ path: - "$..[?(@." + + "$..[?(@ && @." + (router.query.hasOwnProperty("state") ? router.query.state == "edit" ? "caseRef" @@ -95,7 +95,7 @@ let S78_Questionnaire = (props) => { currentView.caseReference.currentReference + '")]', json: setCaseResultssObj, - sandbox: {}, + eval: true, }); resultsObj = resultsObj[0]; diff --git a/components/case/representationList.js b/components/case/representationList.js index 7c24ae12..13f81d5f 100644 --- a/components/case/representationList.js +++ b/components/case/representationList.js @@ -59,11 +59,11 @@ const RepresentationList = (props) => { {representationsArr.map((item, key) => { let detailsObj = jsonpath({ path: - "$..[?(@.pinswg_representationsid=='" + + "$..[?(@ && @.pinswg_representationsid=='" + incidentid + "')]", json: item, - sandbox: {}, + eval: true, }); detailsObj = item; @@ -91,7 +91,7 @@ const RepresentationList = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue" ] + diff --git a/components/case/summary.js b/components/case/summary.js index 58afabab..48677fe2 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -141,11 +141,11 @@ const CaseSummary = (props) => { const isWatchedCase = (whichIncident) => { let isWatched = jsonpath({ path: - "$..value[?(@._pinswg_watchedcase_value=='" + + "$..value[?(@ && @._pinswg_watchedcase_value=='" + whichIncident + "')]", json: watchedCases, - sandbox: {}, + eval: true, }); return isWatched; @@ -183,32 +183,32 @@ const CaseSummary = (props) => { currentType == "searchResultsObj" ? (casesObj = jsonpath({ - path: '$..[?(@.title=="' + caseReference + '")]', + path: '$..[?(@ && @.title=="' + caseReference + '")]', json: searchResultsObj, - sandbox: {}, + eval: true, })) : currentType == "watchedCases" ? (casesObj = jsonpath({ - path: '$..[?(@.pinswg_title=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_title=="' + caseReference + '")]', json: setCaseQueryObj, - sandbox: {}, + eval: true, })) : currentType == "myCases" ? (casesObj = jsonpath({ - path: '$..[?(@.pinswg_title=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_title=="' + caseReference + '")]', json: setCaseQueryObj, - sandbox: {}, + eval: true, })) : currentType == "directResultsObj" ? (casesObj = jsonpath({ - path: '$..[?(@.ticketnumber=="' + caseReference + '")]', + path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]', json: setCaseQueryObj, - sandbox: {}, + eval: true, })) : (casesObj = jsonpath({ - path: '$..[?(@.reference=="' + caseReference + '")]', + path: '$..[?(@ && @.reference=="' + caseReference + '")]', json: setCaseQueryObj, - sandbox: {}, + eval: true, })); casesObj = Object.assign({}, ...casesObj); @@ -217,16 +217,16 @@ const CaseSummary = (props) => { currentType == "searchResultsObj" ? (detailsObj = jsonpath({ - path: '$..[?(@.pinswg_name=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]', json: searchDetailsObj, - sandbox: {}, + eval: true, })) : currentType == "directResultsObj" ? (detailsObj = setCaseDetailsObj[0].value[0]) : (detailsObj = jsonpath({ - path: '$..[?(@.pinswg_name=="' + caseReference + '")]', + path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]', jsopn: setCaseDetailsObj, - sandbox: {}, + eval: true, })); detailsObj = typeof detailsObj == "object" ? detailsObj : detailsObj[0]; @@ -667,14 +667,16 @@ const CaseSummary = (props) => {
{router.locale == "cy" - ? jsonpath( - '$..[?(@.value=="' + + ? jsonpath({ + path: + '$..[?(@.value=="' + detailsObj[ "pinswg_casestage@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', - transLookup - ) + json: transLookup, + eval: true, + }) : detailsObj[ "pinswg_casestage@OData.Community.Display.V1.FormattedValue" ] || diff --git a/components/case/summaryTypes/pinswg_advertsid.js b/components/case/summaryTypes/pinswg_advertsid.js index bb6c293c..4780d17c 100644 --- a/components/case/summaryTypes/pinswg_advertsid.js +++ b/components/case/summaryTypes/pinswg_advertsid.js @@ -29,13 +29,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -54,13 +54,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue" @@ -76,13 +76,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -119,13 +119,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -140,13 +140,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -161,13 +161,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -186,13 +186,13 @@ const Pinswg_advertsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js index fd9ea020..ba4ce00e 100644 --- a/components/case/summaryTypes/pinswg_callinss77id.js +++ b/components/case/summaryTypes/pinswg_callinss77id.js @@ -29,13 +29,13 @@ const Pinswg_callinss77id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_callinss77id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_callinss77id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_callinss77id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_callinss77id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_callinss77id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js index 94a67779..bebd21c3 100644 --- a/components/case/summaryTypes/pinswg_commonlandid.js +++ b/components/case/summaryTypes/pinswg_commonlandid.js @@ -29,13 +29,13 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -238,19 +238,19 @@ const Pinswg_commonlandid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js index 461bd49b..91f6c14a 100644 --- a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js +++ b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js @@ -29,13 +29,13 @@ const Pinswg_communityinfrastructurelevyid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_communityinfrastructurelevyid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_communityinfrastructurelevyid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_communityinfrastructurelevyid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_communityinfrastructurelevyid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_communityinfrastructurelevyid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js index a6bbcfac..8549d427 100644 --- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js +++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js @@ -29,13 +29,13 @@ const Pinswg_compulsorypurchaseordersid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -76,13 +76,13 @@ const Pinswg_compulsorypurchaseordersid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -97,13 +97,13 @@ const Pinswg_compulsorypurchaseordersid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -118,13 +118,13 @@ const Pinswg_compulsorypurchaseordersid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -142,13 +142,13 @@ const Pinswg_compulsorypurchaseordersid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -218,19 +218,19 @@ const Pinswg_compulsorypurchaseordersid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js index 8d88cf5d..0ea6b66e 100644 --- a/components/case/summaryTypes/pinswg_dnsid.js +++ b/components/case/summaryTypes/pinswg_dnsid.js @@ -124,14 +124,14 @@ const Pinswg_dnsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -153,11 +153,11 @@ const Pinswg_dnsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_webaddress + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : ( { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -236,13 +236,13 @@ const Pinswg_dnsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue" @@ -260,7 +260,7 @@ const Pinswg_dnsid = (props) => { {router.locale == "cy" ? jsonpath({path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + @@ -299,13 +299,13 @@ const Pinswg_dnsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -368,13 +368,13 @@ const Pinswg_dnsid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -468,7 +468,7 @@ const Pinswg_dnsid = (props) => {
{router.locale == "cy" ? jsonpath({path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_recommendation + '")].value_cy', transLookup, diff --git a/components/case/summaryTypes/pinswg_electricityactid.js b/components/case/summaryTypes/pinswg_electricityactid.js index 91a6b106..f3919b04 100644 --- a/components/case/summaryTypes/pinswg_electricityactid.js +++ b/components/case/summaryTypes/pinswg_electricityactid.js @@ -67,13 +67,13 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -91,13 +91,13 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -153,13 +153,13 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -176,13 +176,13 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -197,13 +197,13 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -221,13 +221,13 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -297,11 +297,11 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_recommendation + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj.pinswg_recommendation || t( @@ -320,11 +320,11 @@ const Pinswg_electricityactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_webaddress + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj.pinswg_webaddress || t( diff --git a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js index 142d968b..94c84cea 100644 --- a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js +++ b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js @@ -29,13 +29,13 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js index fc6db4ad..1e713049 100644 --- a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js +++ b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js @@ -29,13 +29,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js index 78301cad..7faeef9e 100644 --- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js +++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js @@ -29,13 +29,13 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -238,19 +238,19 @@ const Pinswg_environmentalpermittingid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js index 16afe185..c962a7fd 100644 --- a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js +++ b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js @@ -67,13 +67,13 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -91,13 +91,13 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -153,13 +153,13 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -174,13 +174,13 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -198,13 +198,13 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -274,11 +274,11 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_recommendation + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj.pinswg_recommendation || t( @@ -297,11 +297,11 @@ const Pinswg_harbourrevisionorderid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_webaddress + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj.pinswg_webaddress || t( diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js index b9fdd905..d1b348da 100644 --- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js +++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js @@ -29,13 +29,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -54,13 +54,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue" @@ -76,13 +76,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -119,13 +119,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -140,13 +140,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -161,13 +161,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -185,13 +185,13 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -261,19 +261,19 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/case/summaryTypes/pinswg_householderappealhasid.js b/components/case/summaryTypes/pinswg_householderappealhasid.js index 26a4d08b..13f57a48 100644 --- a/components/case/summaryTypes/pinswg_householderappealhasid.js +++ b/components/case/summaryTypes/pinswg_householderappealhasid.js @@ -29,13 +29,13 @@ const Pinswg_householderappealhasid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_householderappealhasid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_householderappealhasid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_householderappealhasid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -141,13 +141,13 @@ const Pinswg_householderappealhasid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js index 2d067aa4..d41b4303 100644 --- a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js +++ b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js @@ -29,13 +29,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_ldpid.js b/components/case/summaryTypes/pinswg_ldpid.js index 0b162e76..772a69c7 100644 --- a/components/case/summaryTypes/pinswg_ldpid.js +++ b/components/case/summaryTypes/pinswg_ldpid.js @@ -29,13 +29,13 @@ const Pinswg_ldpid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_ldpid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -75,13 +75,13 @@ const Pinswg_ldpid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_ldpid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_ldpid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -141,13 +141,13 @@ const Pinswg_ldpid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js index a7f1cc5a..e715c0fe 100644 --- a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js +++ b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js @@ -29,13 +29,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_listedbuildingandconservationrid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js index c359db9a..5b00ec2f 100644 --- a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js +++ b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js @@ -29,13 +29,13 @@ const Pinswg_maintenanceoflands217id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_maintenanceoflands217id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_maintenanceoflands217id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_maintenanceoflands217id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_maintenanceoflands217id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_maintenanceoflands217id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js index 9c7f875b..dc159628 100644 --- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js +++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js @@ -29,13 +29,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -238,19 +238,19 @@ const Pinswg_miscellaneouscasewordid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/case/summaryTypes/pinswg_nonvalidationid.js b/components/case/summaryTypes/pinswg_nonvalidationid.js index b768263f..64dd529b 100644 --- a/components/case/summaryTypes/pinswg_nonvalidationid.js +++ b/components/case/summaryTypes/pinswg_nonvalidationid.js @@ -29,13 +29,13 @@ const Pinswg_nonvalidationid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_nonvalidationid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -74,13 +74,13 @@ const Pinswg_nonvalidationid = (props) => {
{router.locale == "cy" ? jsonpath({path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -95,13 +95,13 @@ const Pinswg_nonvalidationid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -119,13 +119,13 @@ const Pinswg_nonvalidationid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_planningappeals78id.js b/components/case/summaryTypes/pinswg_planningappeals78id.js index 91e5fb8e..27098810 100644 --- a/components/case/summaryTypes/pinswg_planningappeals78id.js +++ b/components/case/summaryTypes/pinswg_planningappeals78id.js @@ -29,13 +29,13 @@ const Pinswg_planningappeals78id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_planningappeals78id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_planningappeals78id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_planningappeals78id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -141,13 +141,13 @@ const Pinswg_planningappeals78id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -165,13 +165,13 @@ const Pinswg_planningappeals78id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_dicision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_dicision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js index a735f2c6..6561c998 100644 --- a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js +++ b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js @@ -29,13 +29,13 @@ const Pinswg_planningconditionss73s79id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_planningconditionss73s79id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_planningconditionss73s79id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_planningconditionss73s79id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_planningconditionss73s79id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_planningconditionss73s79id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js index 8da3edaf..dfbd39cf 100644 --- a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js +++ b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js @@ -29,13 +29,13 @@ const Pinswg_planningobligationappeals106id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_planningobligationappeals106id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_planningobligationappeals106id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_planningobligationappeals106id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_planningobligationappeals106id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_planningobligationappeals106id = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js index 84f94424..134851b2 100644 --- a/components/case/summaryTypes/pinswg_rowid.js +++ b/components/case/summaryTypes/pinswg_rowid.js @@ -29,13 +29,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -54,13 +54,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue" @@ -76,13 +76,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -119,13 +119,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -140,13 +140,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -161,13 +161,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -185,13 +185,13 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -261,19 +261,19 @@ const Pinswg_rowid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/case/summaryTypes/pinswg_transportandworkactid.js b/components/case/summaryTypes/pinswg_transportandworkactid.js index d0e478e2..4b57bd1d 100644 --- a/components/case/summaryTypes/pinswg_transportandworkactid.js +++ b/components/case/summaryTypes/pinswg_transportandworkactid.js @@ -67,13 +67,13 @@ const Pinswg_transportandworkactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -118,11 +118,11 @@ const Pinswg_transportandworkactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_recommendation + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj.pinswg_recommendation || t( @@ -141,11 +141,11 @@ const Pinswg_transportandworkactid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj.pinswg_webaddress + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj.pinswg_webaddress || t( diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js index db885366..71675f1d 100644 --- a/components/case/summaryTypes/pinswg_wayleaveid.js +++ b/components/case/summaryTypes/pinswg_wayleaveid.js @@ -29,13 +29,13 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -53,13 +53,13 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -96,13 +96,13 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_procedure@OData.Community.Display.V1.FormattedValue" @@ -117,13 +117,13 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" @@ -138,13 +138,13 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : casesObj[ "statuscode@OData.Community.Display.V1.FormattedValue" @@ -162,13 +162,13 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "pinswg_decision@OData.Community.Display.V1.FormattedValue" @@ -238,19 +238,19 @@ const Pinswg_wayleaveid = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.pinswg_lpa=="' + + '$..[?(@ && @.pinswg_lpa=="' + detailsObj.pinswg_relevantauthorityname + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || t( "case:summary-no-date-entered-label" diff --git a/components/elements/index.js b/components/elements/index.js index 5f3b594b..931edf43 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -37,6 +37,7 @@ const ReactQuill = dynamic(() => import("react-quill-new"), { ssr: false }); import { useStore as store, useSelector } from "react-redux"; import { useDispatch } from "react-redux"; +import { validateField } from "./validationUtils"; // Import the validation function const RenderTextfield = ({ id, @@ -223,7 +224,9 @@ export function Textfield(props) { // console.log(parentField, formProps, form); //console.log("validation props:", validation); - + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return (
{parentField != false ? ( @@ -234,7 +237,15 @@ export function Textfield(props) { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function label={props.label} maxFieldLength={props.maxFieldLength} /> @@ -246,7 +257,15 @@ export function Textfield(props) { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function label={props.label} errorMsg={t("newappeal:is-required-label")} maxFieldLength={props.maxFieldLength} @@ -356,6 +375,9 @@ export function MultiLinefield(props) { //console.log(showIfHasParentShowValue, formProps[form].values[parentField]); let { t } = useTranslation(); + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return ( <> {parentField != false ? ( @@ -383,7 +405,15 @@ export function MultiLinefield(props) { rows="5" className="govuk-textarea govuk-input--width-30" aria-describedby={props.name + "-hint"} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function maxFieldLength={props.maxFieldLength} />
@@ -412,7 +442,15 @@ export function MultiLinefield(props) { rows="5" className="govuk-textarea govuk-input--width-30" aria-describedby={props.name + "-hint"} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function maxFieldLength={props.maxFieldLength} /> @@ -517,6 +555,9 @@ export function RichMultiLinefield(props) { //console.log(showIfHasParentShowValue, formProps[form].values[parentField]); let { t } = useTranslation(); + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return ( <> {parentField != false ? ( @@ -543,7 +584,15 @@ export function RichMultiLinefield(props) { rows="5" className="govuk-textarea govuk-input--width-30" aria-describedby={props.name + "-hint"} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function maxFieldLength={props.maxFieldLength} /> @@ -572,7 +621,15 @@ export function RichMultiLinefield(props) { rows="5" className="govuk-textarea govuk-input--width-30" aria-describedby={props.name + "-hint"} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function maxFieldLength={props.maxFieldLength} /> @@ -738,6 +795,9 @@ export function DateFieldPicker(props) { _.has(formProps[form].values, parentField) && formProps[form].values[parentField]) == parentFieldShowOnValue; + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return (
{parentField != false ? ( @@ -747,7 +807,15 @@ export function DateFieldPicker(props) { id={name} label={label} component={RenderDatePicker} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function errorMsg={t("newappeal:select-a-date-label")} dateStart={dateStart} dateEnd={dateEnd} @@ -760,7 +828,15 @@ export function DateFieldPicker(props) { id={name} label={label} component={RenderDatePicker} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function errorMsg={t("newappeal:select-a-date-label")} dateStart={dateStart} dateEnd={dateEnd} @@ -1187,6 +1263,9 @@ export function Radiofield(props) { (showIfHasParentShowValue == parentField) != false && showIfHasParentShowValue; + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return ( <> {parentField != false ? ( @@ -1202,7 +1281,15 @@ export function Radiofield(props) { component={RenderRadio} inline={props.inline} hint={props.hint} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function requiredDocumentLabel={props.requiredDocumentLabel} requiredDocumentValue={props.requiredDocumentValue} setDocumentsList={props.setDocumentsList} @@ -1221,7 +1308,15 @@ export function Radiofield(props) { component={RenderRadio} inline={props.inline} hint={props.hint} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function requiredDocumentLabel={props.requiredDocumentLabel} requiredDocumentValue={props.requiredDocumentValue} setDocumentsList={props.setDocumentsList} @@ -1340,9 +1435,10 @@ const RenderPickList = ({ let { t } = useTranslation(); var dropdownObj = jsonpath({ - path: "$..value[?(@.LogicalName=='" + datafieldname + "')]..Options", + path: + "$..value[?(@ && @.LogicalName=='" + datafieldname + "')]..Options", json: picklistData, - sandbox: {}, + eval: true, }); dropdownObj = dropdownObj[0]; @@ -1457,7 +1553,9 @@ export function NumericField(props) { showIfHasParentShowValue; //console.log("parentField:", parentField, showIfHasParentShowValue); - + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return ( <> {parentField != false ? ( @@ -1473,7 +1571,15 @@ export function NumericField(props) { pattern="[0-9]*" inputMode="numeric" parse={Number} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function component={RenderTextfield} label={label} maxFieldLength={props.maxFieldLength} @@ -1585,6 +1691,9 @@ export function DecimalField(props) { return undefined; }; + const requiredMessage = t("newappeal:is-required-label"); + const emojiNotAllowedMessage = t("newappeal:emojis-not-allowed-label"); + const invalidPostcodeMessage = t("newappeal:invalid-postcode-label"); return ( <> {parentField != false ? ( @@ -1601,7 +1710,15 @@ export function DecimalField(props) { pattern="[0-9]*" inputMode="numeric" parse={Number} - validate={eval(validation)} + validate={(value) => + validateField( + value, + validation, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ) + } // Use the external validate function component={RenderTextfield} label={props.label} maxFieldLength={props.maxFieldLength} @@ -1720,15 +1837,15 @@ export const FieldsTranslations = (label) => { let formObj = jsonpath({ path: "$['" + appealtypes + "']", json: fieldLookup, - sandbox: {}, + eval: true, }); let labelTrans = router.locale == "cy" ? jsonpath({ - path: '$..[?(@.value=="' + label + '")].value_cy', + path: '$..[?(@ && @.value=="' + label + '")].value_cy', json: formObj, - sandbox: {}, + eval: true, })[0] : label; @@ -1745,9 +1862,9 @@ const PickListTranslations = (optionValue) => { let optionTrans = router.locale == "cy" ? jsonpath({ - path: '$..[?(@.value=="' + optionValue + '")].value_cy', + path: '$..[?(@ && @.value=="' + optionValue + '")].value_cy', json: pickListLookup, - sandbox: {}, + eval: true, }) : optionValue; //console.log(optionTrans, optionValue); @@ -1945,9 +2062,9 @@ const RenderFileUpload = (field) => { const filelistObj = field.fileList || {}; const blobList = jsonpath({ - path: "$..[?(@.documentType=='" + field.documentTypeCode + "')]", + path: "$..[?(@ && @.documentType=='" + field.documentTypeCode + "')]", json: filelistObj, - sandbox: {}, + eval: true, }); //const blobList = filelistObj; diff --git a/components/elements/validationUtils.js b/components/elements/validationUtils.js new file mode 100644 index 00000000..43f9dbef --- /dev/null +++ b/components/elements/validationUtils.js @@ -0,0 +1,69 @@ +// validationUtils.js + +// Validation functions +const required = (value, requiredMessage, emojiNotAllowedMessage) => { + let errors; + if (!value) { + errors = requiredMessage; + } else { + const emojiRegex = + /[\u{1F600}-\u{1F64F}\u{1F300}-\u{1F5FF}\u{1F680}-\u{1F6FF}\u{1F700}-\u{1F77F}\u{1F780}-\u{1F7FF}\u{1F800}-\u{1F8FF}\u{1F900}-\u{1F9FF}\u{1FA00}-\u{1FA6F}\u{1FA70}-\u{1FAFF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}\u{2300}-\u{23FF}\u{2B50}\u{1F004}-\u{1F0CF}\u{1F0A0}-\u{1F0A5}\u{1F170}-\u{1F251}]/gu; + + if (emojiRegex.test(value)) { + errors = emojiNotAllowedMessage; + } + } + return errors; +}; + +const postcode = (value, invalidPostcodeMessage) => + value && + !/^([A-Z][A-HJ-Y]?[0-9][A-Z0-9]? ?[0-9][A-Z]{2}|GIR ?0A{2})$/i.test(value) + ? "Invalid postcode" + : undefined; + +// Function to parse the validation string +export const parseValidationString = (validationString) => { + if (typeof validationString !== "string") { + return []; // Return an empty array if it's not a string + } + + // Remove square brackets and split by commas + return validationString + .replace(/[\[\]']+/g, "") // Remove square brackets + .split(",") // Split by commas + .map((rule) => rule.trim()); // Trim each validation rule +}; + +// Function to handle multiple validation rules +export const validateField = ( + value, + validationString, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage +) => { + const validations = parseValidationString(validationString); // Parse the validation string + let errors; + for (let validationRule of validations) { + const validationFunc = validationFunctions[validationRule]; + if (validationFunc) { + errors = validationFunc( + value, + requiredMessage, + emojiNotAllowedMessage, + invalidPostcodeMessage + ); + } + if (errors) break; // Exit if any validation fails + } + + return errors; +}; + +// Map validation strings to actual validation functions +export const validationFunctions = { + required, + postcode, + // Add other validation functions as needed +}; diff --git a/components/myportal.js b/components/myportal.js index 9162deb8..495bb19d 100644 --- a/components/myportal.js +++ b/components/myportal.js @@ -108,13 +108,13 @@ const MyPortal = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + props.accountDetails.accountDetails[ "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : props.accountDetails.accountDetails[ "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" diff --git a/components/myportal/advancedsearch.js b/components/myportal/advancedsearch.js index 58b95e7e..87d56566 100644 --- a/components/myportal/advancedsearch.js +++ b/components/myportal/advancedsearch.js @@ -148,12 +148,12 @@ let AdvancedSearch = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + optionsObj[key] .name + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : optionsObj[key].name || t( @@ -253,12 +253,12 @@ let AdvancedSearch = (props) => { : router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + optionsObj[key] .value + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : optionsObj[key].value || t( diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js index bca702d2..26baf861 100644 --- a/components/myportal/awaitingsubmissionfromblob.js +++ b/components/myportal/awaitingsubmissionfromblob.js @@ -204,14 +204,14 @@ const AwaitingSubmissionFromBlob = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + getFormCollectionByID( showTopThreeArr[key] .pinswg_appealcasetype ).value + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : getFormCollectionByID( showTopThreeArr[key] @@ -297,13 +297,13 @@ const AwaitingSubmissionFromBlob = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + showTopThreeArr[key][ "pinswg_lpaname" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : showTopThreeArr[key][ "pinswg_lpaname" diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js index 640e9c96..9d61d7fc 100644 --- a/components/myportal/topthree.js +++ b/components/myportal/topthree.js @@ -328,13 +328,13 @@ const TopThree = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + showTopThreeArr[key][ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : showTopThreeArr[key][ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -400,13 +400,13 @@ const TopThree = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + showTopThreeArr[key][ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : 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 c60f87a1..1b9ab569 100644 --- a/components/myportal/topthree_reps.js +++ b/components/myportal/topthree_reps.js @@ -271,11 +271,11 @@ const TopThree = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + showTopThreeArr[key].representationType + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : showTopThreeArr[key].representationType || ""}
@@ -285,7 +285,7 @@ const TopThree = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + showTopThreeArr[key] .representationCapacity + '" ||@.value_cy=="' + @@ -293,25 +293,25 @@ const TopThree = (props) => { .representationCapacity + '" )].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.value_cy=="' + + '$..[?(@ && @.value_cy=="' + showTopThreeArr[key] .representationCapacity + '")].value', json: transLookup, - sandbox: {}, + eval: true, }).length > 0 ? jsonpath({ path: - '$..[?(@.value_cy=="' + + '$..[?(@ && @.value_cy=="' + showTopThreeArr[key] .representationCapacity + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) : showTopThreeArr[key].representationCapacity} @@ -327,13 +327,13 @@ const TopThree = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + showTopThreeArr[key][ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : showTopThreeArr[key][ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" diff --git a/components/myportal/uploadFile.js b/components/myportal/uploadFile.js index 015a303d..492c8b84 100644 --- a/components/myportal/uploadFile.js +++ b/components/myportal/uploadFile.js @@ -290,7 +290,7 @@ let UploadFile = (props) => { const uploadAction = await uploadFiles(dataObj, fileObj).then( (data) => { - console.log("hello", data); + console.log("$1", data); } ); // router.push({ diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index 2cb23571..249992fb 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -118,7 +118,7 @@ const ViewAllResults = (props) => { (currentView.viewKey == "myRepresentations" ? "" : "..value") + - '[?(@.pinswg_name=="' + + '[?(@ && @.pinswg_name=="' + (currentView.viewKey == "awaitingSubmissionDetails" ? item.title : currentView.viewKey == "watchedCases" @@ -128,7 +128,7 @@ const ViewAllResults = (props) => { : item.pinswg_title) + '")]', json: searchDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; @@ -480,11 +480,11 @@ const ViewAllResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + resultsArr[key].pinswg_lpaname + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : resultsArr[key].pinswg_lpaname || "N/A" : ""} @@ -494,13 +494,13 @@ const ViewAllResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + resultsArr[key][ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : resultsArr[key][ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -512,13 +512,13 @@ const ViewAllResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + searchDetailsObj[key].value[0][ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : currentView.viewKey == "myRepresentations" ? searchDetailsObj[key].value @@ -532,13 +532,13 @@ const ViewAllResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + resultsArr[key][ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : resultsArr[key][ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" @@ -550,13 +550,13 @@ const ViewAllResults = (props) => { router.locale == "cy" && jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + searchDetailsObj[key][ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, })}
@@ -568,13 +568,13 @@ const ViewAllResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + getFormCollectionByID( item.pinswg_appealcasetype ).value + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : getFormCollectionByID( item.pinswg_appealcasetype @@ -582,13 +582,13 @@ const ViewAllResults = (props) => { : router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -601,13 +601,13 @@ const ViewAllResults = (props) => { (router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + getFormCollectionByID( searchDetailsObj[key].appealType ).value + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, })[0] : getFormCollectionByID( searchDetailsObj[key].appealType @@ -629,25 +629,25 @@ const ViewAllResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.statuscode=="' + + '$..[?(@ && @.statuscode=="' + item.statuscode + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : jsonpath({ path: - '$..[?(@.statuscode=="' + + '$..[?(@ && @.statuscode=="' + item.statuscode + '")].value', json: transLookup, - sandbox: {}, + eval: true, }) || "N/A" : currentView.viewKey == "myRepresentations" ? repRaisedDate(item.repfile_name) // ? router.locale == "cy" : // ? jsonpath({path: // - // '$..[?(@.value=="' + + // '$..[?(@ && @.value=="' + // searchDetailsObj[key].value[0][ // "statuscode@OData.Community.Display.V1.FormattedValue" // ] + @@ -659,7 +659,7 @@ const ViewAllResults = (props) => { // : router.locale == "cy" // ? jsonpath({path: // - // '$..[?(@.value=="' + + // '$..[?(@ && @.value=="' + // item[ // "statuscode@OData.Community.Display.V1.FormattedValue" // ] + @@ -669,13 +669,13 @@ const ViewAllResults = (props) => { router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "statuscode@OData.Community.Display.V1.FormattedValue" diff --git a/components/newappeal/buildcheckrow.js b/components/newappeal/buildcheckrow.js index 374080bc..3934ed05 100644 --- a/components/newappeal/buildcheckrow.js +++ b/components/newappeal/buildcheckrow.js @@ -66,15 +66,15 @@ let BuildCheckRow = (props) => { let formObj = jsonpath({ path: "$['" + appealtypes + "']", json: fieldLookup, - sandbox: {}, + eval: true, }); let labelTrans = router.locale == "cy" ? jsonpath({ - path: '$..[?(@.value=="' + label + '")].value_cy', + path: '$..[?(@ && @.value=="' + label + '")].value_cy', json: formObj, - sandbox: {}, + eval: true, }) : label; return labelTrans; @@ -103,11 +103,11 @@ let BuildCheckRow = (props) => { var datafieldname = xpath.select("//@datafieldname", doc); const isRequiredField = jsonpath({ path: - "$..value[?(@.LogicalName=='" + + "$..value[?(@ && @.LogicalName=='" + datafieldname[0].value + "')]", json: mandatoryFieldsData, - sandbox: {}, + eval: true, }); var documentTypeCode = xpath.select( diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js index 519f5c1e..58030988 100644 --- a/components/newappeal/buildchecksection.js +++ b/components/newappeal/buildchecksection.js @@ -130,15 +130,15 @@ let BuildCheckSection = (props) => { let formObj = jsonpath({ path: "$['" + appealtypes + "']", json: fieldLookup, - sandbox: {}, + eval: true, }); let labelTrans = router.locale == "cy" ? jsonpath({ - path: '$..[?(@.value=="' + label + '")].value_cy', + path: '$..[?(@ && @.value=="' + label + '")].value_cy', json: formObj, - sandbox: {}, + eval: true, }) : label; return labelTrans; diff --git a/components/newappeal/buildrow.js b/components/newappeal/buildrow.js index 8150df40..bb48a1d5 100644 --- a/components/newappeal/buildrow.js +++ b/components/newappeal/buildrow.js @@ -111,7 +111,7 @@ export default function BuildRow(props) { dateEnd = !_.isEmpty(dateEnd) && dateEnd[0].value; //const isRequiredField = jsonpath({path: - // "$..value[?(@.LogicalName=='" + + // "$..value[?(@ && @.LogicalName=='" + // datafieldname[0].value + // "')]", // mandatoryFieldsData diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js index 2cf10ef7..712bff39 100644 --- a/components/newappeal/buildsection.js +++ b/components/newappeal/buildsection.js @@ -125,7 +125,7 @@ let BuildSection = (props) => { props.props.accountDetails.containerID, props.props.appealType.caseReference.ticketnumber ).then((data) => { - console.log("hello", data); + console.log("$1", data); setCompletedUploadFiles(true); return data; }); @@ -488,7 +488,7 @@ let BuildSection = (props) => { "_pinswg_appellant_value" ]; - console.log("on save:", valuesObj); + //console.log("on save:", valuesObj); updateCaseProgress( valuesObj, false, @@ -593,10 +593,10 @@ let BuildSection = (props) => { props.props.form[props.form] .values || {}; - console.log( - "valuesobj:", - valuesObj - ); + // console.log( + // "valuesobj:", + // valuesObj + // ); delete valuesObj[ "_pinswg_appellant_value" diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js index da9b9aee..b7b29e07 100644 --- a/components/newappeal/createCase.js +++ b/components/newappeal/createCase.js @@ -67,11 +67,11 @@ const RenderLPAList = ({ {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + optionsObj[key].name + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : optionsObj[key].name} @@ -151,11 +151,11 @@ const RenderAppealTypeList = ({ : router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + optionsObj[key].value + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : optionsObj[key].value} diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js index efb4e758..06609d61 100644 --- a/components/pdftemplates/appealRow_pdf.js +++ b/components/pdftemplates/appealRow_pdf.js @@ -151,7 +151,7 @@ export const AppealRow_pdf = (props) => { let formObj = jsonpath({ path: "$['" + appealtypes + "']", json: fieldLookup, - sandbox: {}, + eval: true, }); let labelTrans = label; @@ -395,7 +395,7 @@ export const AppealRow_pdf = (props) => { break; case "{16D63FD6-119B-4353-BDCA-18358721C3FE}": // const blobList = jsonpath({path: - // "$..[?(@.documentType=='" + + // "$..[?(@ && @.documentType=='" + // documentTypeCode[0].value + // "')]", // props.filesList diff --git a/components/search/addresssearchresults.js b/components/search/addresssearchresults.js index 30918cba..51fb4479 100644 --- a/components/search/addresssearchresults.js +++ b/components/search/addresssearchresults.js @@ -97,11 +97,11 @@ const SearchResults = (props) => { const isWatchedCase = (whichIncident) => { let isWatched = jsonpath({ path: - "$..value[?(@._pinswg_watchedcase_value=='" + + "$..value[?(@ && @._pinswg_watchedcase_value=='" + whichIncident + "')]", json: watchedCases, - sandbox: {}, + eval: true, }); return isWatched; @@ -247,12 +247,12 @@ const SearchResults = (props) => { resultsArrPaged.map((item, key) => { let detailsObj = jsonpath({ path: - '$..value[?(@.pinswg_name=="' + + '$..value[?(@ && @.pinswg_name=="' + item.pinswg_name + '")]', json: searchDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; return ( @@ -462,13 +462,13 @@ const SearchResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue" @@ -480,13 +480,13 @@ const SearchResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -503,13 +503,13 @@ const SearchResults = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "pinswg_appealType" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item["pinswg_appealType"] || "N/A"} @@ -525,13 +525,13 @@ const SearchResults = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "statuscode@OData.Community.Display.V1.FormattedValue" diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js index 8a863dbc..84721148 100644 --- a/components/search/advancedsearch.js +++ b/components/search/advancedsearch.js @@ -128,12 +128,12 @@ const RenderCaseStatusList = ({ : router.locale == "cy" ? jsonpath({ path: - '$..[?(@.statuscode=="' + + '$..[?(@ && @.statuscode=="' + optionsObj[key] .statuscode + '")].value_cy', json: optionsObj, - sandbox: {}, + eval: true, }) : optionsObj[key].value || t( @@ -253,12 +253,12 @@ let AdvancedSearch = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + optionsObj[key] .name + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : optionsObj[key].name || t( @@ -358,12 +358,12 @@ let AdvancedSearch = (props) => { : router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + optionsObj[key] .value + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : optionsObj[key].value || t( diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index c8e6965c..19f7df43 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -174,11 +174,11 @@ const DNSSearchResults = (props) => { const isWatchedCase = (whichIncident) => { let isWatched = jsonpath({ path: - "$..value[?(@._pinswg_watchedcase_value=='" + + "$..value[?(@ && @._pinswg_watchedcase_value=='" + whichIncident + "')]", json: watchedCases, - sandbox: {}, + eval: true, }); return isWatched; @@ -314,11 +314,11 @@ const DNSSearchResults = (props) => { resultsArr.map((item, key) => { let detailsObj = jsonpath({ path: - '$..value[?(@.pinswg_name=="' + + '$..value[?(@ && @.pinswg_name=="' + item.title + '")]', json: searchDetailsObj, - sandbox: {}, + eval: true, }); detailsObj = detailsObj[0]; @@ -517,13 +517,13 @@ const DNSSearchResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + detailsObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : detailsObj[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -540,13 +540,13 @@ const DNSSearchResults = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "statuscode@OData.Community.Display.V1.FormattedValue" diff --git a/components/search/searchresults.js b/components/search/searchresults.js index 52c76863..19739055 100644 --- a/components/search/searchresults.js +++ b/components/search/searchresults.js @@ -103,12 +103,12 @@ const SearchResults = (props) => { const isWatchedCase = (whichIncident) => { let isWatched = jsonpath({ path: - "$..value[?(@._pinswg_watchedcase_value=='" + + "$..value[?(@ && @._pinswg_watchedcase_value=='" + whichIncident + "')]", json: watchedCases, - sandbox: {}, + eval: true, }); return isWatched; @@ -253,11 +253,11 @@ const SearchResults = (props) => { resultsArr.map((item, key) => { let detailsObj = jsonpath({ path: - '$..value[?(@.pinswg_name=="' + + '$..value[?(@ && @.pinswg_name=="' + item.title + '")]', json: searchDetailsObj, - sandbox: {}, + eval: true, }); Object.assign(item, item.pinswg_sipscase); @@ -482,13 +482,13 @@ const SearchResults = (props) => { ? router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" @@ -505,13 +505,13 @@ const SearchResults = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" @@ -528,13 +528,13 @@ const SearchResults = (props) => { {router.locale == "cy" ? jsonpath({ path: - '$..[?(@.value=="' + + '$..[?(@ && @.value=="' + item[ "statuscode@OData.Community.Display.V1.FormattedValue" ] + '")].value_cy', json: transLookup, - sandbox: {}, + eval: true, }) : item[ "statuscode@OData.Community.Display.V1.FormattedValue" diff --git a/components/utils/index.js b/components/utils/index.js index fb846316..041b12c4 100644 --- a/components/utils/index.js +++ b/components/utils/index.js @@ -18,65 +18,65 @@ import xpath from "xpath"; */ export const getFormCollection = (formtype) => { const collectionName = jsonpath({ - path: "$..[?(@.LogicalName=='" + formtype + "')]", + path: "$..[?(@ && @.LogicalName=='" + formtype + "')]", json: data, - sandbox: {}, + eval: true, }); return collectionName[0]; }; export const getFormCollectionByID = (appealTypeID) => { const collectionName = jsonpath({ - path: "$..[?(@.appealTypeID =='" + appealTypeID + "')]", + path: "$..[?(@ && @.appealTypeID =='" + appealTypeID + "')]", json: data, - sandbox: {}, + eval: true, }); return collectionName[0]; }; export const getFormIDByLogicalName = (appealTypeLogicalName) => { const collectionName = jsonpath({ - path: "$..[?(@.LogicalName =='" + appealTypeLogicalName + "')]", + path: "$..[?(@ && @.LogicalName =='" + appealTypeLogicalName + "')]", json: data, - sandbox: {}, + eval: true, }); return collectionName[0]; }; export const getPickListLabel = (data, picklistType, picklistID) => { const pickListData = jsonpath({ - path: "$..[?(@.LogicalName=='" + picklistType + "')]", + path: "$..[?(@ && @.LogicalName=='" + picklistType + "')]", json: data, - sandbox: {}, + eval: true, }); const pickListLabel = jsonpath({ path: - "$..[?(@.Value=='" + + "$..[?(@ && @.Value=='" + picklistID + "')].Label.LocalizedLabels..Label", json: pickListData, - sandbox: {}, + eval: true, }); return pickListLabel[0]; }; export const getRadioLabel = (data, radiotListName, radioListID) => { const radioListData = jsonpath({ - path: "$..[?(@.LogicalName=='" + radiotListName + "')]", + path: "$..[?(@ && @.LogicalName=='" + radiotListName + "')]", json: data, - sandbox: {}, + eval: true, }); const pickListLabel = jsonpath({ path: - "$..[?(@.Value=='" + + "$..[?(@ && @.Value=='" + radioListID + "')].Label.LocalizedLabels..Label", json: radioListData, - sandbox: {}, + eval: true, }); return pickListLabel[0]; }; @@ -336,11 +336,11 @@ export const getProgressObj = ( const isRequiredField = jsonpath({ path: - "$..value[?(@.LogicalName=='" + + "$..value[?(@ && @.LogicalName=='" + datafieldname[0].value + "')]", json: mandatoryFieldsData, - sandbox: {}, + eval: true, }); if (datafieldname[0].value.includes("pinswg_fileUpload")) { diff --git a/middleware.js b/middleware.js index afd4fc0b..d8a952ed 100644 --- a/middleware.js +++ b/middleware.js @@ -14,6 +14,7 @@ export function middleware(request) { font-src 'self' https://pro.fontawesome.com/ https://fonts.gstatic.com/ ; object-src 'none'; base-uri 'self'; + frame-src https://datamap.gov.wales/; form-action 'self' ` + process.env.NEXTAUTH_URL + `; diff --git a/pages/api/endpoint/getbasicsearch_by_address_api.js b/pages/api/endpoint/getbasicsearch_by_address_api.js index 683121e6..1c423986 100644 --- a/pages/api/endpoint/getbasicsearch_by_address_api.js +++ b/pages/api/endpoint/getbasicsearch_by_address_api.js @@ -630,7 +630,7 @@ export default async function ApiProxy(req, res) { searchResultsObj = jsonpath({ path: "$..[?(@ && @.pinswg_name)]", json: searchResultsObj, - sandbox: {}, + eval: true, }); searchResultsObj = searchResultsObj.filter((arr) => arr.incidentid != null); diff --git a/pages/api/endpoint/getmylpacases_api.js b/pages/api/endpoint/getmylpacases_api.js index 25db7730..32bca1ad 100644 --- a/pages/api/endpoint/getmylpacases_api.js +++ b/pages/api/endpoint/getmylpacases_api.js @@ -49,13 +49,13 @@ export default async function ApiProxy(req, res) { const lpaList = await getLPA(); const lpaGUID = jsonpath({ - path: '$..[?(@.name=="' + lpaid + '")]', + path: '$..[?(@ && @.name=="' + lpaid + '")]', json: lpaList, - sandbox: {}, + eval: true, }); //console.log( - // '$..[?(@.name="' + lpaid + '")]', + // '$..[?(@ && @.name="' + lpaid + '")]', // lpaList, // lpaid, // "LPAGUID=", diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js index 74d6d1ee..950c7e41 100644 --- a/pages/myportal/[appealtypes].js +++ b/pages/myportal/[appealtypes].js @@ -77,9 +77,9 @@ let Home = (props) => { let optionsStr = props.appealType.appealTypeOptions.value || {}; let selectedObj = jsonpath({ - path: "$..[?(@.attributevalue=='" + router.query.apt + "')]", + path: "$..[?(@ && @.attributevalue=='" + router.query.apt + "')]", json: optionsStr, - sandbox: {}, + eval: true, }); //let optionsTitleObj = []; diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js index e4be195a..0878d677 100644 --- a/pages/newappeal/[appealtypes].js +++ b/pages/newappeal/[appealtypes].js @@ -69,9 +69,9 @@ let Home = (props) => { let optionsStr = props.appealType.appealTypeOptions.value; let selectedObj = jsonpath({ - path: "$..[?(@.attributevalue=='" + router.query.apt + "')]", + path: "$..[?(@ && @.attributevalue=='" + router.query.apt + "')]", json: optionsStr, - sandbox: {}, + eval: true, }); //let optionsTitleObj = [];