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

Merge branch 'Development' into SIPS-Sprint-5-dev-merge-csp

Browse Source
This commit is contained in:
robbond
2025-04-16 15:46:10 +01:00
parent 2dc8a721ab dabc5a0697
commit 81fe090ce0
60 changed files with 493 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/search/addresssearchresults.js
+6 -6
View File
@@ -97,7 +97,7 @@ const SearchResults = (props) => {
const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath({
path:
"$..value[?(@._pinswg_watchedcase_value=='" +
"$..value[?(@ && @._pinswg_watchedcase_value=='" +
whichIncident +
"')]",
json: watchedCases,
@@ -247,7 +247,7 @@ const SearchResults = (props) => {
resultsArrPaged.map((item, key) => {
let detailsObj = jsonpath({
path:
'$..value[?(@.pinswg_name=="' +
'$..value[?(@ && @.pinswg_name=="' +
item.pinswg_name +
'")]',
@@ -462,7 +462,7 @@ const SearchResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
] +
@@ -480,7 +480,7 @@ const SearchResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
@@ -503,7 +503,7 @@ const SearchResults = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"pinswg_appealType"
] +
@@ -525,7 +525,7 @@ const SearchResults = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
components/search/advancedsearch.js
+3 -3
View File
@@ -128,7 +128,7 @@ const RenderCaseStatusList = ({
: router.locale == "cy"
? jsonpath({
path:
'$..[?(@.statuscode=="' +
'$..[?(@ && @.statuscode=="' +
optionsObj[key]
.statuscode +
'")].value_cy',
@@ -253,7 +253,7 @@ let AdvancedSearch = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
optionsObj[key]
.name +
'")].value_cy',
@@ -358,7 +358,7 @@ let AdvancedSearch = (props) => {
: router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
optionsObj[key]
.value +
'")].value_cy',
components/search/dnssearchresults.js
+4 -4
View File
@@ -174,7 +174,7 @@ const DNSSearchResults = (props) => {
const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath({
path:
"$..value[?(@._pinswg_watchedcase_value=='" +
"$..value[?(@ && @._pinswg_watchedcase_value=='" +
whichIncident +
"')]",
json: watchedCases,
@@ -314,7 +314,7 @@ const DNSSearchResults = (props) => {
resultsArr.map((item, key) => {
let detailsObj = jsonpath({
path:
'$..value[?(@.pinswg_name=="' +
'$..value[?(@ && @.pinswg_name=="' +
item.title +
'")]',
json: searchDetailsObj,
@@ -517,7 +517,7 @@ const DNSSearchResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
detailsObj[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
@@ -540,7 +540,7 @@ const DNSSearchResults = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +
components/search/searchresults.js
+5 -5
View File
@@ -103,7 +103,7 @@ const SearchResults = (props) => {
const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath({
path:
"$..value[?(@._pinswg_watchedcase_value=='" +
"$..value[?(@ && @._pinswg_watchedcase_value=='" +
whichIncident +
"')]",
@@ -253,7 +253,7 @@ const SearchResults = (props) => {
resultsArr.map((item, key) => {
let detailsObj = jsonpath({
path:
'$..value[?(@.pinswg_name=="' +
'$..value[?(@ && @.pinswg_name=="' +
item.title +
'")]',
json: searchDetailsObj,
@@ -482,7 +482,7 @@ const SearchResults = (props) => {
? router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
] +
@@ -505,7 +505,7 @@ const SearchResults = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] +
@@ -528,7 +528,7 @@ const SearchResults = (props) => {
{router.locale == "cy"
? jsonpath({
path:
'$..[?(@.value=="' +
'$..[?(@ && @.value=="' +
item[
"statuscode@OData.Community.Display.V1.FormattedValue"
] +