diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js
index 7d0c2fcd..148fd790 100644
--- a/components/case/summaryTypes/pinswg_commonlandid.js
+++ b/components/case/summaryTypes/pinswg_commonlandid.js
@@ -219,11 +219,16 @@ const Pinswg_commonlandid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
+ '$..[?(@.pinswg_lpa=="' +
detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj.pinswg_relevantauthorityname ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
index 4dd770ac..86357cbf 100644
--- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
@@ -201,11 +201,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
+ '$..[?(@.pinswg_lpa=="' +
detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj.pinswg_relevantauthorityname ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js
index 4e830074..49c27e26 100644
--- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js
+++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js
@@ -219,11 +219,16 @@ const Pinswg_environmentalpermittingid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
+ '$..[?(@.pinswg_lpa=="' +
detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj.pinswg_relevantauthorityname ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
index 132ea262..d677f870 100644
--- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
@@ -219,15 +219,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
- detailsObj[
- "pinswg_relevantauthorityname@OData.Community.Display.V1.FormattedValue"
- ] +
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj[
- "pinswg_relevantauthorityname@OData.Community.Display.V1.FormattedValue"
- ] ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
index 4f58b8e8..a53adc98 100644
--- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
@@ -219,15 +219,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
- detailsObj[
- "pinswg_relevantauthorityname@OData.Community.Display.V1.FormattedValue"
- ] +
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj[
- "pinswg_relevantauthorityname@OData.Community.Display.V1.FormattedValue"
- ] ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js
index c5e9bc8b..80cbbea1 100644
--- a/components/case/summaryTypes/pinswg_rowid.js
+++ b/components/case/summaryTypes/pinswg_rowid.js
@@ -219,11 +219,16 @@ const Pinswg_rowid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
+ '$..[?(@.pinswg_lpa=="' +
detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj.pinswg_relevantauthorityname ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js
index 3b4c3f93..bc29d184 100644
--- a/components/case/summaryTypes/pinswg_wayleaveid.js
+++ b/components/case/summaryTypes/pinswg_wayleaveid.js
@@ -219,11 +219,16 @@ const Pinswg_wayleaveid = (props) => {
{router.locale == "cy"
? jsonpath.query(
transLookup,
- '$..[?(@.value=="' +
+ '$..[?(@.pinswg_lpa=="' +
detailsObj.pinswg_relevantauthorityname +
'")].value_cy'
)
- : detailsObj.pinswg_relevantauthorityname ||
+ : jsonpath.query(
+ transLookup,
+ '$..[?(@.pinswg_lpa=="' +
+ detailsObj.pinswg_relevantauthorityname +
+ '")].value'
+ ) ||
t(
"case:summary-no-date-entered-label"
)}
diff --git a/components/homepage/login.js b/components/homepage/login.js
index ed565c0c..c47d0b0f 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -56,7 +56,13 @@ const RenderTextfield = ({
{error}
)}
-
+
);
@@ -102,6 +108,7 @@ const RenderPasswordfield = ({
className={className}
name={name}
id={id}
+ autoComplete="current-password"
/>
diff --git a/data/lookuptranslations.json b/data/lookuptranslations.json
index 3ef3449c..ac2533b3 100644
--- a/data/lookuptranslations.json
+++ b/data/lookuptranslations.json
@@ -264,149 +264,129 @@
],
"pinswg_lpa": [
{
- "value": "Blaenau Gwent County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Blaenau Gwent",
- "pinswg_lpa": 0
+ "value": "Isle of Anglesey County Council",
+ "value_cy": "Cyngor Sir Ynys Môn",
+ "pinswg_lpa": 846040000
},
{
- "value": "Bridgend CBC",
- "value_cy": "Cyngor Bwrdeistref Sirol Pen-y-bont ar Ogwr",
- "pinswg_lpa": 0
+ "value": "Blaenau Gwent County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Blaenau Gwent",
+ "pinswg_lpa": 846040001
},
{
"value": "Bridgend County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Pen-y-bont ar Ogwr",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040002
},
{
"value": "Caerphilly County Borough Council",
"value_cy": "Cyngor Bwrdeistref Sirol Caerffili",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040003
},
{
"value": "Cardiff County Council",
"value_cy": "Cyngor Caerdydd",
- "pinswg_lpa": 0
- },
- {
- "value": "Cardiff City Council",
- "value_cy": "Cyngor Caerdydd",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040004
},
{
"value": "Carmarthenshire County Council",
"value_cy": "Cyngor Sir Gaerfyrddin",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040005
},
{
"value": "Ceredigion County Council",
"value_cy": "Cyngor Sir Ceredigion",
- "pinswg_lpa": 0
- },
- {
- "value": "Conwy County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Conwy",
- "pinswg_lpa": 0
- },
- {
- "value": "Denbighshire County Council",
- "value_cy": "Cyngor Sir Ddinbych",
- "pinswg_lpa": 0
- },
- {
- "value": "Flintshire County Council",
- "value_cy": "Cyngor Sir y Fflint",
- "pinswg_lpa": 0
- },
- {
- "value": "Gwynedd Council",
- "value_cy": "Cyngor Gwynedd",
- "pinswg_lpa": 0
- },
- {
- "value": "Isle of Anglesey County Council",
- "value_cy": "Cyngor Sir Ynys Môn",
- "pinswg_lpa": 0
- },
- {
- "value": "Merthyr Tydfil County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Merthyr Tudful",
- "pinswg_lpa": 0
- },
- {
- "value": "Monmouthshire County Council",
- "value_cy": "Cyngor Sir Fynwy",
- "pinswg_lpa": 0
- },
- {
- "value": "Neath Port Talbot County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Castell-nedd Port Talbot",
- "pinswg_lpa": 0
- },
- {
- "value": "Newport City Council",
- "value_cy": "Cyngor Dinas Casnewydd",
- "pinswg_lpa": 0
- },
- {
- "value": "Pembrokeshire County Council",
- "value_cy": "Cyngor Sir Penfro",
- "pinswg_lpa": 0
- },
- {
- "value": "Powys County Council",
- "value_cy": "Cyngor Sir Powys",
- "pinswg_lpa": 0
- },
- {
- "value": "Rhondda Cynon Taff County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Rhondda Cynon Taf",
- "pinswg_lpa": 0
- },
- {
- "value": "Swansea Council",
- "value_cy": "Cyngor a Dinas Abertawe",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040006
},
{
"value": "City and County of Swansea Council",
"value_cy": "Dinas a Sir Abertawe",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040007
},
{
- "value": "Torfaen County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Torfaen",
- "pinswg_lpa": 0
+ "value": "Conwy County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Conwy",
+ "pinswg_lpa": 846040008
},
{
- "value": "Vale of Glamorgan Council",
- "value_cy": "Cyngor Bro Morgannwg",
- "pinswg_lpa": 0
+ "value": "Denbighshire County Council",
+ "value_cy": "Cyngor Sir Ddinbych",
+ "pinswg_lpa": 846040009
},
{
- "value": "Vale of Glamorgan Borough Council",
- "value_cy": "Cyngor Bro Morgannwg",
- "pinswg_lpa": 0
+ "value": "Flintshire County Council",
+ "value_cy": "Cyngor Sir y Fflint",
+ "pinswg_lpa": 846040010
},
{
- "value": "Wrexham County Borough Council",
- "value_cy": "Cyngor Bwrdeistref Sirol Wrecsam",
- "pinswg_lpa": 0
+ "value": "Gwynedd Council",
+ "value_cy": "Cyngor Gwynedd",
+ "pinswg_lpa": 846040011
},
{
- "value": "Brecon Beacons National Park Authority",
- "value_cy": "Parc Cenedlaethol Bannau Brycheiniog",
- "pinswg_lpa": 0
+ "value": "Merthyr Tydfil County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Merthyr Tudful",
+ "pinswg_lpa": 846040012
+ },
+ {
+ "value": "Monmouthshire County Council",
+ "value_cy": "Cyngor Sir Fynwy",
+ "pinswg_lpa": 846040013
+ },
+ {
+ "value": "Neath Port Talbot County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Castell-nedd Port Talbot",
+ "pinswg_lpa": 846040014
+ },
+ {
+ "value": "Newport City Council",
+ "value_cy": "Cyngor Dinas Casnewydd",
+ "pinswg_lpa": 846040015
},
{
"value": "Pembrokeshire Coast National Park Authority",
"value_cy": "Parc Cenedlaethol Arfordir Penfro",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040016
+ },
+ {
+ "value": "Pembrokeshire County Council",
+ "value_cy": "Cyngor Sir Penfro",
+ "pinswg_lpa": 846040017
+ },
+ {
+ "value": "Powys County Council",
+ "value_cy": "Cyngor Sir Powys",
+ "pinswg_lpa": 846040018
+ },
+ {
+ "value": "Rhondda Cynon Taff County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Rhondda Cynon Taf",
+ "pinswg_lpa": 846040019
},
{
"value": "Snowdonia National Park Authority",
"value_cy": "Parc Cenedlaethol Eryri",
- "pinswg_lpa": 0
+ "pinswg_lpa": 846040020
+ },
+ {
+ "value": "Torfaen County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Torfaen",
+ "pinswg_lpa": 846040021
+ },
+ {
+ "value": "Vale of Glamorgan Council",
+ "value_cy": "Cyngor Bro Morgannwg",
+ "pinswg_lpa": 846040022
+ },
+ {
+ "value": "Wrexham County Borough Council",
+ "value_cy": "Cyngor Bwrdeistref Sirol Wrecsam",
+ "pinswg_lpa": 846040023
+ },
+ {
+ "value": "Brecon Beacons National Park Authority",
+ "value_cy": "Parc Cenedlaethol Bannau Brycheiniog",
+ "pinswg_lpa": 846040024
}
],
"pinswg_procedure": [
diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js
index cbb032cc..017445bd 100644
--- a/pages/api/endpoint/getbasicdnssearchdetails_api.js
+++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js
@@ -29,7 +29,7 @@ export default async function ApiProxy(req, res) {
var queryUrl =
"pinswg_dnses?$filter=pinswg_name eq '" +
caseReference +
- "'&$count=true";
+ " and statuscode eq 1&$count=true";
queryUrl = queryUrl + getSelectQuery("pinswg_dnses");
diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js
index 8501cbfd..b0b9c0bc 100644
--- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js
+++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js
@@ -29,7 +29,7 @@ export default async function ApiProxy(req, res) {
var queryUrl =
"pinswg_dnses?$filter=pinswg_name eq '" +
caseReference +
- "'&$count=true";
+ " and statuscode eq 1&$count=true";
queryUrl = queryUrl + getSelectQuery("pinswg_dnses");
diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js
index 7ed4f899..8de45336 100644
--- a/pages/api/endpoint/getbasicsearchdetails_api.js
+++ b/pages/api/endpoint/getbasicsearchdetails_api.js
@@ -30,7 +30,7 @@ export default async function ApiProxy(req, res) {
primaryIdAttribute +
"s_value eq " +
incidentID +
- "&$count=true";
+ " and statuscode eq 1&$count=true";
queryUrl = queryUrl + getSelectQuery(appealTypeName);
diff --git a/pages/api/endpoint/getbasicsearchdetailspaged_api.js b/pages/api/endpoint/getbasicsearchdetailspaged_api.js
index 7a37841d..57a1389e 100644
--- a/pages/api/endpoint/getbasicsearchdetailspaged_api.js
+++ b/pages/api/endpoint/getbasicsearchdetailspaged_api.js
@@ -34,7 +34,7 @@ export default async function ApiProxy(req, res) {
primaryIdAttribute +
"s_value eq " +
incidentID +
- "&$count=true";
+ " and statuscode eq 1&$count=true";
queryUrl = queryUrl + getSelectQuery(appealTypeName);