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

Merged PR 1566: merge of dev csp work

Browse Source 
Related work items: #15520
This commit is contained in:
Robert Bond
2025-04-16 14:48:21 +00:00
parent 0c8f166410 0d91e75811
commit 0433304faf
63 changed files with 762 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/caseNoticeBanner.js
+2 -2
View File
@@ -20,7 +20,7 @@ export default function CaseNoticeBanner(props) {
return (
<>
{messagesObjArr.map((message, index) => (
<>
<div key={index}>
{todaysDate.toISOString() >= message.scheduledstart &&
todaysDate.toISOString() <= message.scheduledend && (
<div
@@ -98,7 +98,7 @@ export default function CaseNoticeBanner(props) {
</div>
</div>
)}
</>
</div>
))}
</>
);
components/case/documents.js
+11 -11
View File
@@ -158,9 +158,9 @@ const DocumentDetails = (props) => {
<option value="all" key="00">
{router.locale == "cy"
? jsonpath({
path: '$..[?(@.value=="All")].value_cy',
path: '$..[?(@ && @.value=="All")].value_cy',
json: transLookup,
sandbox: {},
eval: true,
})
: "All"}
</option>
@@ -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"
components/case/representation/index.js
+18 -16
View File
@@ -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];
components/case/representation/representationAgent.js
+2 -2
View File
@@ -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,
components/case/representation/representationAppellant.js
+2 -2
View File
@@ -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,
components/case/representation/representationDetails.js
+2 -2
View File
@@ -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];
components/case/representation/representationInterestedPartyPerson.js
+2 -2
View File
@@ -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,
components/case/representation/representationLPA.js
+16 -16
View File
@@ -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,
components/case/representation/representationLPADetails.js
+2 -2
View File
@@ -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];
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+4 -4
View File
@@ -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];
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+4 -4
View File
@@ -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];
components/case/representationList.js
+3 -3
View File
@@ -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"
] +
components/case/summary.js
+22 -20
View File
@@ -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) => {
</dt>
<dd className="govuk-summary-list__value">
{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"
] ||
components/case/summaryTypes/pinswg_advertsid.js
+14 -14
View File
@@ -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"
components/case/summaryTypes/pinswg_callinss77id.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_commonlandid.js
+16 -16
View File
@@ -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"
components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+14 -14
View File
@@ -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"
components/case/summaryTypes/pinswg_dnsid.js
+14 -14
View File
@@ -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,
})
: (
<a
@@ -191,13 +191,13 @@ const Pinswg_dnsid = (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"
@@ -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) => {
<dd className="govuk-summary-list__value">
{router.locale == "cy"
? jsonpath({path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
detailsObj.pinswg_recommendation +
'")].value_cy',
transLookup,
components/case/summaryTypes/pinswg_electricityactid.js
+16 -16
View File
@@ -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(
components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_environmentalpermittingid.js
+16 -16
View File
@@ -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"
components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+14 -14
View File
@@ -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(
components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+18 -18
View File
@@ -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"
components/case/summaryTypes/pinswg_householderappealhasid.js
+10 -10
View File
@@ -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"
components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_ldpid.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_maintenanceoflands217id.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+16 -16
View File
@@ -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"
components/case/summaryTypes/pinswg_nonvalidationid.js
+10 -10
View File
@@ -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) => {
<dd className="govuk-summary-list__value">
{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"
components/case/summaryTypes/pinswg_planningappeals78id.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_planningconditionss73s79id.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_planningobligationappeals106id.js
+12 -12
View File
@@ -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"
components/case/summaryTypes/pinswg_rowid.js
+18 -18
View File
@@ -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"
components/case/summaryTypes/pinswg_transportandworkactid.js
+6 -6
View File
@@ -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(
components/case/summaryTypes/pinswg_wayleaveid.js
+16 -16
View File
@@ -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"
components/elements/index.js
+140 -23
View File
@@ -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 (
<div className="govuk-form-group">
{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}
/>
</div>
@@ -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}
/>
</div>
@@ -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}
/>
</div>
@@ -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}
/>
</div>
@@ -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 (
<div className="govuk-form-group">
{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;
components/elements/validationUtils.js
+69
View File
@@ -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
};
components/myportal.js
+2 -2
View File
@@ -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"
components/myportal/advancedsearch.js
+4 -4
View File
@@ -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(
components/myportal/awaitingsubmissionfromblob.js
+4 -4
View File
@@ -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"
components/myportal/topthree.js
+4 -4
View File
@@ -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"
components/myportal/topthree_reps.js
+10 -10
View File
@@ -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 || ""}
</div>
@@ -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}
</div>
@@ -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"
components/myportal/uploadFile.js
+1 -1
View File
@@ -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({
components/myportal/viewall.js
+26 -26
View File
@@ -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,
})}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -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"
components/newappeal/buildcheckrow.js
+5 -5
View File
@@ -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(
components/newappeal/buildchecksection.js
+3 -3
View File
@@ -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;
components/newappeal/buildrow.js
+1 -1
View File
@@ -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
components/newappeal/buildsection.js
+6 -6
View File
@@ -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"
components/newappeal/createCase.js
+4 -4
View File
@@ -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}
</option>
@@ -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}
</option>
components/pdftemplates/appealRow_pdf.js
+2 -2
View File
@@ -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
components/search/addresssearchresults.js
+12 -12
View File
@@ -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"
components/search/advancedsearch.js
+6 -6
View File
@@ -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(
components/search/dnssearchresults.js
+8 -8
View File
@@ -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"
components/search/searchresults.js
+10 -10
View File
@@ -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"
components/utils/index.js
+16 -16
View File
@@ -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")) {
middleware.js
+1
View File
@@ -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 +
`;
pages/api/endpoint/getbasicsearch_by_address_api.js
+1 -1
View File
@@ -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);
pages/api/endpoint/getmylpacases_api.js
+3 -3
View File
@@ -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=",
pages/myportal/[appealtypes].js
+2 -2
View File
@@ -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 = [];
pages/newappeal/[appealtypes].js
+2 -2
View File
@@ -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 = [];