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

Merge branch 'Development' into SIPS-Development

Browse Source
This commit is contained in:
robbond
2025-04-15 13:22:35 +01:00
parent e24fe83d0a 854530e605
commit a26313c798
57 changed files with 1601 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/search/addresssearchresults.js
+39 -24
View File
@@ -95,10 +95,14 @@ const SearchResults = (props) => {
};
const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath(
"$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
watchedCases
);
let isWatched = jsonpath({
path:
"$..value[?(@._pinswg_watchedcase_value=='" +
whichIncident +
"')]",
json: watchedCases,
sandbox: {},
});
return isWatched;
};
@@ -241,12 +245,15 @@ const SearchResults = (props) => {
</div>
) : (
resultsArrPaged.map((item, key) => {
let detailsObj = jsonpath(
'$..value[?(@.pinswg_name=="' +
let detailsObj = jsonpath({
path:
'$..value[?(@.pinswg_name=="' +
item.pinswg_name +
'")]',
searchDetailsObj
);
json: searchDetailsObj,
sandbox: {},
});
detailsObj = detailsObj[0];
return (
<div
@@ -453,14 +460,16 @@ const SearchResults = (props) => {
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -469,14 +478,16 @@ const SearchResults = (props) => {
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -490,14 +501,16 @@ const SearchResults = (props) => {
:
</span>
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"pinswg_appealType"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item["pinswg_appealType"] ||
"N/A"}
</dd>
@@ -510,14 +523,16 @@ const SearchResults = (props) => {
</span>
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
components/search/advancedsearch.js
+18 -12
View File
@@ -126,13 +126,15 @@ const RenderCaseStatusList = ({
: _.isEmpty(optionsObj[key].value)
? ""
: router.locale == "cy"
? jsonpath(
'$..[?(@.statuscode=="' +
? jsonpath({
path:
'$..[?(@.statuscode=="' +
optionsObj[key]
.statuscode +
'")].value_cy',
optionsObj
)
json: optionsObj,
sandbox: {},
})
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
@@ -249,13 +251,15 @@ let AdvancedSearch = (props) => {
{/* {optionsObj[key].name} */}
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
optionsObj[key]
.name +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: optionsObj[key].name ||
t(
"case:summary-no-date-entered-label"
@@ -352,13 +356,15 @@ let AdvancedSearch = (props) => {
)
? ""
: router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
optionsObj[key]
.value +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
components/search/dnssearchresults.js
+26 -16
View File
@@ -172,10 +172,14 @@ const DNSSearchResults = (props) => {
};
const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath(
"$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
watchedCases
);
let isWatched = jsonpath({
path:
"$..value[?(@._pinswg_watchedcase_value=='" +
whichIncident +
"')]",
json: watchedCases,
sandbox: {},
});
return isWatched;
};
@@ -308,12 +312,14 @@ const DNSSearchResults = (props) => {
</div>
) : (
resultsArr.map((item, key) => {
let detailsObj = jsonpath(
'$..value[?(@.pinswg_name=="' +
let detailsObj = jsonpath({
path:
'$..value[?(@.pinswg_name=="' +
item.title +
'")]',
searchDetailsObj
);
json: searchDetailsObj,
sandbox: {},
});
detailsObj = detailsObj[0];
var appType =
@@ -509,14 +515,16 @@ const DNSSearchResults = (props) => {
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -530,14 +538,16 @@ const DNSSearchResults = (props) => {
:
</span>
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
components/search/searchresults.js
+33 -20
View File
@@ -101,10 +101,15 @@ const SearchResults = (props) => {
};
const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath(
"$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
watchedCases
);
let isWatched = jsonpath({
path:
"$..value[?(@._pinswg_watchedcase_value=='" +
whichIncident +
"')]",
json: watchedCases,
sandbox: {},
});
return isWatched;
};
@@ -246,12 +251,14 @@ const SearchResults = (props) => {
</div>
) : (
resultsArr.map((item, key) => {
let detailsObj = jsonpath(
'$..value[?(@.pinswg_name=="' +
let detailsObj = jsonpath({
path:
'$..value[?(@.pinswg_name=="' +
item.title +
'")]',
searchDetailsObj
);
json: searchDetailsObj,
sandbox: {},
});
Object.assign(item, item.pinswg_sipscase);
@@ -473,14 +480,16 @@ const SearchResults = (props) => {
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
])
? router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] || "N/A"
@@ -494,14 +503,16 @@ const SearchResults = (props) => {
:
</span>
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
@@ -515,14 +526,16 @@ const SearchResults = (props) => {
</span>
{router.locale == "cy"
? jsonpath(
'$..[?(@.value=="' +
? jsonpath({
path:
'$..[?(@.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
)
json: transLookup,
sandbox: {},
})
: item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || "N/A"}