Merge branch 'Development' into SIPS-Development
This commit is contained in:
@@ -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"}
|
||||
|
||||
Reference in New Issue
Block a user