Merged PR 2068: Set portal to readonly

Related work items: #21227
pass showlogin vars to pages and components
2026-01-30 10:24:07 +00:00 · 2026-01-28 13:31:19 +00:00 · 2026-01-28 13:30:27 +00:00 · 2026-01-28 13:30:05 +00:00 · 2026-01-28 13:29:26 +00:00 · 2025-11-18 08:04:38 +00:00
473 changed files with 66736 additions and 21192 deletions
@@ -0,0 +1,119 @@
+ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
+//ESNR Tenant
+//TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
+//WGO Tenant
+TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
+GRANT_TYPE = "client_credentials"
+
+HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
+NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
+
+
+//Dev oauth ESNR
+CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
+//CLIENT_SECRET = 4Vt8Q~olL1hx7n01B0~tXf-N2YL5DyC_Fk6waagX
+CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE
+RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
+RELAYURI = "dev-pedw-ns.servicebus.windows.net"
+RELAYPATH = "dev-pedw-hc"
+
+
+//Test Oauth ESNR
+//CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
+//CLIENT_SECRET = IXI8Q~D5oqsC-nrtayHHc~tUAfjQFzNiKVQ~fc2S
+//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
+//RELAYURI = "test-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "test-pedw-hc"
+
+
+//Preprod Oauth WGO
+//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
+//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
+//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
+//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "pp-pedw-hc"
+
+
+
+//Prod Oauth WGO
+//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
+//CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~
+//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
+//RELAYURI = "prod-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "prod-pedw-hc"
+
+
+GOOGLE_TAG_MANAGER = GTM-T78CBC3
+SHOWLOGIN = "true"
+SHOWREPRESENTATIONS = true 
+SHOWFILEUPLOAD = "false"
+SHOWMAPS = "false"
+//BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2
+
+
+PORT= "3000"
+DEFAULT_DOMAIN = "localhost"
+I18N_DOMAIN = "cymru.local"
+//I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru"
+//I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru"
+//I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru"s
+//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru"
+
+
+//gov gateway 
+GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration"
+GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
+GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS
+//GG_REDIRECT_URI = "http://localhost:3000"
+GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales"
+
+NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
+NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000"
+
+API_ROOT = "http://localhost:3000"
+
+
+GOOGLE_MAP_API_KEY = AIzaSyCzeVrHt544bp_72YCFkw21eDsmI2JEsQo
+
+
+
+//Next Auth vars
+//EMAIL_SERVER_HOST=smtp.sendgrid.net
+//EMAIL_SERVER_PORT=465
+//EMAIL_SERVER_USER=apikey
+//EMAIL_SERVER_PASSWORD=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
+//EMAIL_FROM=rob@rdbsolutions.co.uk
+
+
+EMAIL_SERVER_HOST=rdbdigital.com
+EMAIL_SERVER_PORT=465
+EMAIL_SERVER_USER=rob@rdbdigital.com
+EMAIL_SERVER_PASSWORD=!Sky9fish2020
+EMAIL_FROM=no-reply@rdbdigital.com
+
+NEXTAUTH_URL=http://localhost:3000
+NEXTAUTH_URL_INTERNAL=http://localhost:3000 
+//DATABASE_URL=mysql://nextAuthAdmin:!Sky9fish1972@77.68.17.157:3306/nextauthDB?synchronise=true
+DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
+
+SECRET = SuperSecret
+
+
+//Azure Storage Account
+
+AZURE_CLIENT_ID	= $CLIENT_ID
+AZURE_TENANT_ID	= $TENANT
+AZURE_CLIENT_SECRET = $CLIENT_SECRET
+AZURE_STORAGE_ACCOUNT_NAME= "pedwdev"
+AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg==
+
+
+AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
+AZURE_PEDW_CONTAINER = "pedwapplications"
+AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net
+
+
+
+//gov.notify
+
+NOTIFY_API_KEY = pedwnextauthkey-90f93710-9dae-423e-aea1-11eccd0dc132-0c9469d9-d671-444d-9e9d-3e5a62001043
@@ -1,118 +1,176 @@
 ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
-//ESNR Tenant
-//TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
-//WGO Tenant
 TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
 GRANT_TYPE = "client_credentials"

 HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
-NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c

+# //CNR oauth CNR
+# CLIENT_ID = 3125ac03-91ac-46a7-a166-0086f0ed90b3
+# CLIENT_SECRET = bFq8Q~9VX5Ra3lKnGGIXsB.G6-ZGMx7LqyqXjdr4
+# RELAY_ROOT = https://ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net/ar-hc-lz-pedw-cnr-uks-01/  
+# RELAYURI = "ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net"
+# RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01"
+# CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS"

-//Dev oauth ESNR
+# //New Dev oauth ESNR
 CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
-//CLIENT_SECRET = 4Vt8Q~olL1hx7n01B0~tXf-N2YL5DyC_Fk6waagX
-CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE
-RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
-RELAYURI = "dev-pedw-ns.servicebus.windows.net"
-RELAYPATH = "dev-pedw-hc"
+CLIENT_SECRET = .Jf8Q~tKMObCJjhh_hy3J5AIctFrBalU4FS~tdxk
+RELAY_ROOT = https://ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net/ar-hc-lz-pedw-dev-uks-01/  
+RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net"
+RELAYPATH = "ar-hc-lz-pedw-dev-uks-01"
+CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS"
+
+# //New Test  
+CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
+CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
+RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/  
+RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
+RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
+CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS"
+
+# # //New PreProd  
+# CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
+# CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E
+# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-uks-01/  
+# RELAYURI = "ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net"
+# RELAYPATH = "ar-hc-lz-pedw-ppe-uks-01"
+# # RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-ukw-01/  
+# # RELAYURI = "ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net"
+# # RELAYPATH = "ar-hc-lz-pedw-ppe-ukw-01"
+# CRMURL = "ppcrm2016.llcdt.gov.wales/PPPINSWales"


-//Test Oauth ESNR
-//CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
-//CLIENT_SECRET = IXI8Q~D5oqsC-nrtayHHc~tUAfjQFzNiKVQ~fc2S
-//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
-//RELAYURI = "test-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "test-pedw-hc"
+# //Prod Oauth WGO
+# CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
+# CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR
+# RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
+# RELAYURI = "prod-pedw-ns.servicebus.windows.net"
+# RELAYPATH = "prod-pedw-hc"
+# CRMURL = "crm2016.llc.gov.wales/PEDW"
+
+# //New Prod  
+CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
+CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR
+RELAY_ROOT = https://ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net/ar-hc-lz-pedw-prod-uks-01/  
+RELAYURI = "ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net"
+RELAYPATH = "ar-hc-lz-pedw-prod-uks-01"
+# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-prod-ukw-01/  
+# RELAYURI = "ar-ns-lz-pedw-prod-ukw-01.servicebus.windows.net"
+# RELAYPATH = "ar-hc-lz-pedw-prod-ukw-01"
+CRMURL = "crm2016.llcdt.gov.wales/PEDW"


-//Preprod Oauth WGO
-//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
-//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
-//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
-//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "pp-pedw-hc"
-
-
-
-//Prod Oauth WGO
-//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
-//CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~
-//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
-//RELAYURI = "prod-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "prod-pedw-hc"
-
-
-GOOGLE_TAG_MANAGER = GTM-T78CBC3
-SHOWLOGIN = "true"
-SHOWREPRESENTATIONS = false
+//GOOGLE_TAG_MANAGER = GTM-T78CBC3
+GOOGLE_TAG_MANAGER = G-GTWW3JT03Z
+SHOWLOGIN = true
+SHOWREPRESENTATIONS = true 
 SHOWFILEUPLOAD = "false"
-SHOWMAPS = "true"
-//BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2
-
-
-PORT= "3000"
-DEFAULT_DOMAIN = "localhost"
-I18N_DOMAIN = "cymru.local"
-//I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru"
-//I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru"
-//I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru"s
-//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru"
-
-
-//gov gateway 
-GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration"
-GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
-GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS
-//GG_REDIRECT_URI = "http://localhost:3000"
-GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales"
-
-NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
-NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000"
-
+SHOWMAPS = false
 API_ROOT = "http://localhost:3000"
+CY_API_ROOT = "http://cymru.local:3000"
+I18N_DOMAIN = "cymru.local"
+# DOCAPI_OFFLINE = "12:00:00,14:00:00"
+DOCAPI_OFFLINE = "02:00:00,04:00:00"
+SHOWFILTERDOCS = true


-GOOGLE_MAP_API_KEY = AIzaSyCzeVrHt544bp_72YCFkw21eDsmI2JEsQo
+// Next Auth vars
+NEXTAUTH_URL = $API_ROOT
+NEXTAUTH_URL_INTERNAL = $API_ROOT
+NEXTAUTH_SECRET = SuperSecret
+
+// CNR sql server 
+DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
+
+// dev test sql server 
+# DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
+// DATABASE_URL = sqlserver://sql-srv-plt-pedw-dev-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
+
+//  test sql server 
+ DATABASE_URL = sqlserver://sql-srv-plt-pedw-test-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword


+// Pre prod sql server
+#  DATABASE_URL = sqlserver://sql-srv-plt-pedw-ppe-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustservercertificate=true;hostnameincertificate=*.database.windows.net;logintimeout=30;authentication=SqlPassword

-//Next Auth vars
-//EMAIL_SERVER_HOST=smtp.sendgrid.net
-//EMAIL_SERVER_PORT=465
-//EMAIL_SERVER_USER=apikey
-//EMAIL_SERVER_PASSWORD=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
-//EMAIL_FROM=rob@rdbsolutions.co.uk
+// Prod sql server
+# DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword

+// Prod sql server
+ DATABASE_URL = sqlserver://sql-srv-plt-pedw-prod-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword

-EMAIL_SERVER_HOST=rdbdigital.com
-EMAIL_SERVER_PORT=465
-EMAIL_SERVER_USER=rob@rdbdigital.com
-EMAIL_SERVER_PASSWORD=!Sky9fish2020
-EMAIL_FROM=no-reply@rdbdigital.com
+SECRET = SuperSecret

-NEXTAUTH_URL=http://localhost:3000
-NEXTAUTH_URL_INTERNAL=http://localhost:3000 
-//DATABASE_URL=mysql://nextAuthAdmin:!Sky9fish1972@77.68.17.157:3306/nextauthDB?synchronise=true
-DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
-
-SECRET=SuperSecret


 //Azure Storage Account
-
 AZURE_CLIENT_ID	= $CLIENT_ID
 AZURE_TENANT_ID	= $TENANT
 AZURE_CLIENT_SECRET = $CLIENT_SECRET
-AZURE_STORAGE_ACCOUNT_KEY = JS3ZIXianhYhB1lZrHB+bXbdzaLlON0alCyKrFAb+jVEwr9iqo2dty92EBxwnufNFM+CSN/fKX2R+AStDn0byg==
+
+// CNR key
+AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwcnruks"
+AZURE_STORAGE_ACCOUNT_KEY = hRffHq4IwctpaTKdS/U33Xq6nyTDF1t++WJgIwsw7gzstktZin/rRwbTIAL9KKqesVsK7EHrTTG6+ASt4+7skw==
+AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks.blob.core.windows.net
+
+// new dev key
+AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwdevuks"
+AZURE_STORAGE_ACCOUNT_KEY = MmrsrCjBfop9pI2oImsP/+lJUWU2DrXsAB8nq5bOVROTmPovSGxjCjKw9+TAFr00k8WDUK9r6mVx+AStcMLyAA==
+AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net
+
+// New test key
+AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks"
+AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg==
+AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net
+
+// New preprod key
+# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwppeuks"
+# AZURE_STORAGE_ACCOUNT_KEY = B4GRKr+cA9b9mNM/GHFivzhzflJIZltG8bMmooXlYvGYySPAspTTHistAT30sHipnR+hh6dqUc9q+ASttAjPRQ==
+# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwppeuks.blob.core.windows.net
+
+
+// PROD key
+# AZURE_STORAGE_ACCOUNT_NAME = "pedwprod"
+# AZURE_STORAGE_ACCOUNT_KEY = koZ46STRqapSa2Dod8MLL6aju1eYLhhyJ6DXpCLMTnFLJvbDT6CHUv/jwr5U/Ta8a60MWzwToHQy+AStADO7sg==
+# AZURE_PEDW_STORAGE_ENDPOINT = https://pedwprod.blob.core.windows.net
+
+# // New PROD key
+AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwproduks"
+AZURE_STORAGE_ACCOUNT_KEY = OfV9MFqXcLLPam9GhEdMWadIOwIzhc5hd5TUqzIuQoswFdtV4ybaemjatSv+Kht0Ny1qQKjLplwY+AStUTZJrg==
+AZURE_PEDW_STORAGE_ENDPOINT =  https://sapltpedwproduks.blob.core.windows.net


-AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
 AZURE_PEDW_CONTAINER = "pedwapplications"
 AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windows.net

-
-
 //gov.notify
+//NOTIFY_API_KEY = pedwnextauthkey-90f93710-9dae-423e-aea1-11eccd0dc132-0c9469d9-d671-444d-9e9d-3e5a62001043
+NOTIFY_API_KEY = pedwnextauthlivekey-90f93710-9dae-423e-aea1-11eccd0dc132-5c0ed187-754a-4b04-8c99-978e5710c2c1
 
-NOTIFY_API_KEY = pedwnextauthkey-90f93710-9dae-423e-aea1-11eccd0dc132-0c9469d9-d671-444d-9e9d-3e5a62001043
+SHOW_DEBUG = true
+
+ 
+// DEV Connection string
+//NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=4b7568b3-70bd-4591-9dc2-267c0a6501d1;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=447d38b5-5d40-4238-8fb3-0ef4741b3db1
+ 
+
+APPLICATIONINSIGHTS_CONNECTIONSTRING = InstrumentationKey=7a06e24a-793c-47bc-8987-ce80f180e035;IngestionEndpoint=https://uksouth-1.in.applicationinsights.azure.com/;LiveEndpoint=https://uksouth.livediagnostics.monitor.azure.com/;ApplicationId=9906b6d0-b791-4add-8d53-c827a534e1d4
+
+
+// Test Connection string
+//NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=cc60e8e7-5b30-4c2b-a176-8b96b21b12df;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=2a4094be-6fd1-46ab-a67d-5f241692b129
+ 
+// Preprod Connection string
+//NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=7370f0f9-834d-4c7a-b3c4-9951fcad5ad2;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=04362cb7-6dfc-469e-8274-12243e8be851
+
+NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=a41b91bf-f7dc-4f44-bb66-a67df4eee435;IngestionEndpoint=https://uksouth-1.in.applicationinsights.azure.com/;LiveEndpoint=https://uksouth.livediagnostics.monitor.azure.com/;ApplicationId=473d0632-16f1-4065-8984-d6bac62402c0
+ 
+// Prod Connection string
+//NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=61f358c2-8075-4164-b897-17bc6dd31fee;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=0c297349-396b-4dc6-8b56-85f5c680adc6
+
+
+HIDEERRORLOGS = false
+
+SHOWSIPS = true
+
+ALLOWED_IPS=::1,203.0.113.42,198.51.100.17
@@ -3,7 +3,32 @@
  "rules": {
    "@next/next/no-img-element": "off",
    "react/no-unknown-property": "error"
-  }
+
+  }//,
+      //...your configuration
+  // "overrides": [
+  //   //...your overrides
+  //   {
+  //       // Force the setting of a swagger description on each api endpoint
+  //       "files": ["pages/api/**/*.js"], 
+  //       "plugins": ["jsdoc"],
+  //       "rules": {
+  //           "jsdoc/no-missing-syntax": [
+  //           "error",
+  //           {
+  //               "contexts": [
+  //               {
+  //                   "comment": "JsdocBlock:has(JsdocTag[tag=swagger])",
+  //                   "context": "any",
+  //                   "message": "@swagger documentation is required on each API. Check this out for syntax info: https://github.com/jellydn/next-swagger-doc"
+  //               }
+  //               ]
+  //           }
+  //       ]
+  //   }
+  // }
+  // ]
+
 }


@@ -13,7 +13,38 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.yarn

 #lock files
-yarn.lock
-package-lock.json
+# yarn.lock
+# package-lock.json
+
+tmp
+
+*env*.sample
+docker
+dockerfile*
+.dockerignore
+Makefile
+docker*.yml
+
+# Polling 
+
+pages/api/poll-queue.js
+pages/polling.js
+
+# dev apis to no include
+
+pages/api/endpoint/getaccounts_api.js
+
+# remove swagger api docs
+
+next-swagger-doc.json
+pages/api-doc.js
+public/swagger.json
+certificates/cert-key.pem
+certificates/cert.pem
+gitclean.sh
+pages/admin/logcheck.js
+pages/admin/logchecker.js
+pages/baracuda.html
@@ -5,11 +5,17 @@
    "version": "0.2.0",
    "configurations": [
        { 
+            "name": "Next.js: debug server-side",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "npm run dev"
+        },
+        {"name": "Launch Chrome against localhost",
            "type": "pwa-chrome",
            "request": "launch",
-            "name": "Launch Chrome against localhost",
            "url": "http://localhost:3000",
            "webRoot": "${workspaceFolder}"
        }
+        
    ]
 }
@@ -1,147 +0,0 @@
-import axios from "axios";
-import { hashAPIPath, consoleLogger } from "./";
-
-const configEndpoint = process.env.GG_PROVIDER_CONFIG_ENDPOINT;
-const ggClientID = process.env.GG_CLIENT_ID;
-const ggClientSecret = process.env.GG_CLIENT_SECRET;
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
-
-const azureHeaders = (access_token) => {
-    return {
-        headers: {
-            "OData-MaxVersion": "4.0",
-            "OData-Version": "4.0",
-            "Accept": "application/json;odata.metadata=none",
-            "Prefer": 'odata.include-annotations="*",return=representation',
-            "Content-Type": "application/json",
-            "Authorization": "Bearer " + access_token,
-        },
-    };
-};
-
-export const getProviderConfig = () => {
-    return axios
-        .get(configEndpoint)
-        .then((res) => res.data)
-        .catch((error) => {
-            console.log("error :", error.response);
-            // return error;
-        });
-};
-
-export const getUserInfo = (userInfoURL, authToken) => {
-    const tokenConfig = {
-        headers: {
-            "Authorization": "Bearer " + authToken,
-        },
-    };
-
-    return axios
-        .get(userInfoURL, tokenConfig)
-        .then((res) => res)
-        .catch((error) => {
-            //console.log(`Error: ${err?.response?.data}`);
-            //return error;
-        });
-};
-
-var Base64 = {
-    _keyStr:
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
-    encode: function (e) {
-        var t = "";
-        var n, r, i, s, o, u, a;
-        var f = 0;
-        e = Base64._utf8_encode(e);
-        while (f < e.length) {
-            n = e.charCodeAt(f++);
-            r = e.charCodeAt(f++);
-            i = e.charCodeAt(f++);
-            s = n >> 2;
-            o = ((n & 3) << 4) | (r >> 4);
-            u = ((r & 15) << 2) | (i >> 6);
-            a = i & 63;
-            if (isNaN(r)) {
-                u = a = 64;
-            } else if (isNaN(i)) {
-                a = 64;
-            }
-            t =
-                t +
-                this._keyStr.charAt(s) +
-                this._keyStr.charAt(o) +
-                this._keyStr.charAt(u) +
-                this._keyStr.charAt(a);
-        }
-        return t;
-    },
-    decode: function (e) {
-        var t = "";
-        var n, r, i;
-        var s, o, u, a;
-        var f = 0;
-        //e = e.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-        while (f < e.length) {
-            s = this._keyStr.indexOf(e.charAt(f++));
-            o = this._keyStr.indexOf(e.charAt(f++));
-            u = this._keyStr.indexOf(e.charAt(f++));
-            a = this._keyStr.indexOf(e.charAt(f++));
-            n = (s << 2) | (o >> 4);
-            r = ((o & 15) << 4) | (u >> 2);
-            i = ((u & 3) << 6) | a;
-            t = t + String.fromCharCode(n);
-            if (u != 64) {
-                t = t + String.fromCharCode(r);
-            }
-            if (a != 64) {
-                t = t + String.fromCharCode(i);
-            }
-        }
-        t = Base64._utf8_decode(t);
-        return t;
-    },
-    _utf8_encode: function (e) {
-        e = e.replace(/\r\n/g, "\n");
-        var t = "";
-        for (var n = 0; n < e.length; n++) {
-            var r = e.charCodeAt(n);
-            if (r < 128) {
-                t += String.fromCharCode(r);
-            } else if (r > 127 && r < 2048) {
-                t += String.fromCharCode((r >> 6) | 192);
-                t += String.fromCharCode((r & 63) | 128);
-            } else {
-                t += String.fromCharCode((r >> 12) | 224);
-                t += String.fromCharCode(((r >> 6) & 63) | 128);
-                t += String.fromCharCode((r & 63) | 128);
-            }
-        }
-        return t;
-    },
-    _utf8_decode: function (e) {
-        var t = "";
-        var n = 0;
-        var r = (c1 = c2 = 0);
-        while (n < e.length) {
-            r = e.charCodeAt(n);
-            if (r < 128) {
-                t += String.fromCharCode(r);
-                n++;
-            } else if (r > 191 && r < 224) {
-                c2 = e.charCodeAt(n + 1);
-                t += String.fromCharCode(((r & 31) << 6) | (c2 & 63));
-                n += 2;
-            } else {
-                c2 = e.charCodeAt(n + 1);
-                c3 = e.charCodeAt(n + 2);
-                t += String.fromCharCode(
-                    ((r & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)
-                );
-                n += 3;
-            }
-        }
-        return t;
-    },
-};
@@ -1,63 +1,77 @@
 export const getSelectQuery = (appealTypeName) => {
    switch (appealTypeName) {
        case "pinswg_advertses":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_procedure,pinswg_questionnaireduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=pinswg_speacialistcaseprocess,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_procedure,pinswg_questionnaireduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_startdate,pinswg_otherpartiesstatement,pinswg_finalcommentsduedate,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_speacialistcaseprocess,pinswg_statementduedate";
            break;
        case "pinswg_callinss77s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss,pinswg_startdateofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss,pinswg_startdateofevent,pinswg_typeofevent,pinswg_statementsduedate,pinswg_otherpartiesstatement";
            break;
        case "pinswg_commonlands":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_starttimeoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_starttimeoftheevent,pinswg_typeofevent,pinswg_statementsduedate";
            break;
        case "pinswg_environmentalpermittings":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
            break;
        case "pinswg_hedgeshedgerowstreepreservationreplacems":
+            return "&$select=pinswg_specialistcaseprocess,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate,pinswg_specialistcaseprocess";
+            break;
        case "pinswg_miscellaneouscaseworks":
        case "pinswg_wayleaves":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate";
            break;
        case "pinswg_communityinfrastructurelevys117118119s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_questionnaireduedate,pinswg_statementduedate";
            break;
        case "pinswg_compulsorypurchaseorderses":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate";
            break;
        case "pinswg_dnses":
            return "&$select=pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_choiceofprocedure,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofdecision,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_casestage,_pinswg_dnsids_value,pinswg_startdateofevent,pinswg_typeofevent";
            break;
        case "pinswg_electricityacts":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
            break;
        case "pinswg_householderappealhases":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_otherpartiesstatement,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstmt,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode";
            break;
        case "pinswg_enforcementnoticeappeals174s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
            break;
        case "pinswg_enforcementlistedbuildingconservationaps":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
            break;
        case "pinswg_maintenanceoflands217s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
            break;
        case "pinswg_lawfuldevelopmentcertificates":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
            break;
        case "pinswg_listedbuildingandconservationareaconsens":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_sitepostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_starttimeofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_sitepostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_starttimeofevent,pinswg_typeofevent";
            break;
        case "pinswg_planningappeals78s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dicision,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_typeofevent";
+            //console.log(
+            //     "///////////////\n path:",
+            //     process.env.RELAYPATH == "test-pedw-hc"
+            // );
+            return process.env.RELAYPATH == "dev-pedw-hc"
+                ? "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_localplanningauthority_value,pinswg_casedecisiondate,pinswg_dicision,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_representation_period_end_date,pinswg_extend_representation_date,pinswg_typeofevent"
+                : "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_localplanningauthority_value,pinswg_casedecisiondate,pinswg_dicision,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_typeofevent";
            break;
        case "pinswg_planningconditionss73s79s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
            break;
        case "pinswg_planningobligationappeals106s":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
            break;
        case "pinswg_rows":
-            return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=pinswg_specialistcaseprocess,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate,pinswg_specialistcaseprocess";
+            break;
+        case "pinswg_ldps":
+            return "&$select=modifiedon,pinswg_name";
+            break;
+        case "pinswg_nonvalidations":
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,statuscode";
            break;
        default:
            return "";
@@ -1,8 +1,7 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import AccessibilityEN from "./footerDocs/accessibility_en";
+import { useRouter } from "next/router";
 import AccessibilityCY from "./footerDocs/accessibility_cy";
+import AccessibilityEN from "./footerDocs/accessibility_en";

 const AccessibilityStatement = (props) => {
    let { t } = useTranslation();
@@ -1,15 +1,9 @@
-import Link from "next/link";
-import _ from "lodash";
-import React, { useState, useEffect } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { Field, formValueSelector, reduxForm } from "redux-form";
 import { updatePassword } from "../../actions";

 const RenderTextfield = ({
@@ -133,8 +127,9 @@ const ChangePassword = (props) => {
                                "/myportal?q=" +
                                props.accountDetails.loggedinUserId
                            }
+                            className="govuk-link"
                        >
-                            <a className="govuk-link">Cancel</a>
+                            Cancel
                        </Link>
                    </div>
                </form>
@@ -146,8 +141,9 @@ const ChangePassword = (props) => {
                                "/myportal?q=" +
                                props.accountDetails.loggedinUserId
                            }
+                            className="govuk-link"
                        >
-                            <a className="govuk-link">Go to My Portal</a>
+                            Go to My Portal
                        </Link>
                    </p>
                </>
@@ -1,15 +1,9 @@
-import _ from "lodash";
-import Link from "next/link";
-import React, { useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { Field, formValueSelector, reduxForm } from "redux-form";

 import BuildCheckPersonalDetails from "./personaldetailsCheck";
 import PersonalDetailsComplete from "./personaldetailsComplete";
@@ -57,12 +51,148 @@ const RenderTextfield = ({
                    id={id}
                    type={type}
                    disabled={disabled ? true : false}
+                    maxLength="50"
                />
            </div>
        </>
    );
 };

+const RenderRadioList = ({
+    datafieldname,
+    name,
+    label,
+    id,
+    errorMsg,
+    options,
+    input: { onChange, value },
+    meta: { touched, error },
+    ...custom
+}) => {
+    const required = (value) => (value ? undefined : "Required");
+
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <fieldset
+                    className="govuk-fieldset"
+                    aria-describedby={name + "-hint"}
+                >
+                    <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
+                        <label
+                            className="govuk-fieldset__heading govuk-body-m"
+                            id={id + "_label"}
+                        >
+                            {label}
+                        </label>
+                    </legend>
+                    {touched && error && (
+                        <span
+                            id={id + "-error"}
+                            className="govuk-error-message"
+                        >
+                            <span className="govuk-visually-hidden">
+                                Error:
+                            </span>{" "}
+                            {errorMsg}
+                        </span>
+                    )}
+                    <div className="govuk-radios govuk-radios--small govuk-radios--inline">
+                        {Object.keys(options).map((key, index) => (
+                            <div
+                                className="govuk-radios__item"
+                                data-children-count={key}
+                                key={key}
+                            >
+                                <Field
+                                    id={id + "_" + index}
+                                    name={id}
+                                    component="input"
+                                    type="radio"
+                                    className="govuk-radios__input"
+                                    value={options[key]}
+                                />
+                                <label
+                                    className="govuk-label govuk-radios__label"
+                                    htmlFor={id + "_" + index}
+                                >
+                                    {options[key]}
+                                </label>
+                            </div>
+                        ))}
+                    </div>
+                </fieldset>
+            </div>
+        </>
+    );
+};
+
+const RenderPickList = ({
+    datafieldname,
+    name,
+    label,
+    input,
+    optionsArr,
+    meta: { touched, error },
+    errorMsg,
+}) => {
+    let { t, lang } = useTranslation();
+    optionsArr = [
+        t("account:account-preferred-language-english") + ":846040001",
+        t("account:account-preferred-language-welsh") + ":846040000",
+    ];
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <label className="govuk-label" htmlFor={datafieldname}>
+                    {label}
+                </label>
+                {touched && error && (
+                    <span id={name + "-error"} className="govuk-error-message">
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
+                        {errorMsg}
+                    </span>
+                )}
+
+                <div>
+                    <select
+                        {...input}
+                        className="govuk-select "
+                        id={datafieldname}
+                        name={datafieldname}
+                    >
+                        <option value="" disabled defaultValue>
+                            {t("common:drop-down-select")}
+                        </option>
+                        {Object.keys(optionsArr).map((key, index) => {
+                            return (
+                                <option
+                                    key={key}
+                                    value={optionsArr[key].split(":")[1]}
+                                >
+                                    {optionsArr[key].split(":")[0]}
+                                </option>
+                            );
+                        })}
+                    </select>
+                </div>
+            </div>
+        </>
+    );
+};
+
 let PersonalDetails = (props) => {
    const {
        handleSubmit,
@@ -81,18 +211,31 @@ let PersonalDetails = (props) => {

    let errorsobj = {};

-    const required = (value) => (value ? undefined : "Is required");
+    const required = (value) =>
+        value
+            ? undefined
+            : t("account:register-new-account-postcode-label-errormsg");
    const emailRegex =
        /(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;

    const email = (value) =>
-        value && !emailRegex.test(value) ? "Invalid email address" : undefined;
+        value && !emailRegex.test(value)
+            ? t("account:invalid-phone-number-errormsg")
+            : undefined;
    const phoneNumber = (value) =>
        value &&
        !/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\#)\d{3,4})?$/i.test(
            value
        )
-            ? "Invalid phone number"
+            ? t("account:invalid-phone-number-errormsg")
+            : undefined;
+
+    const postcode = (value) =>
+        value &&
+        !/^([A-Z][A-HJ-Y]?[0-9][A-Z0-9]? ?[0-9][A-Z]{2}|GIR ?0A{2})$/i.test(
+            value
+        )
+            ? t("account:register-new-account-postcode-invalid-label-errormsg")
            : undefined;

    const [hasErrors, setHasErrors] = useState("");
@@ -109,12 +252,12 @@ let PersonalDetails = (props) => {
                        <fieldset className="govuk-fieldset">
                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                                <h2 className="govuk-fieldset__heading">
-                                    About you
+                                    {t("account:account-about-you-label")}
                                </h2>
                            </legend>
                            <div className="govuk-form-group ">
                                <span className="govuk-label ">
-                                    Role:{" "}
+                                    {t("account:account-role-label")}:{" "}
                                    {
                                        props.props.accountDetails
                                            .accountDetails[
@@ -123,6 +266,19 @@ let PersonalDetails = (props) => {
                                    }
                                </span>
                            </div>
+                            <Field
+                                name="pinswg_preferredlanguage"
+                                component={RenderPickList}
+                                datafieldname={"pinswg_preferredlanguage"}
+                                optionsArr={["English", "Welsh"]}
+                                className="govuk-input govuk-input--width-20 govuk-radios--inline"
+                                validate={[required]}
+                                label={t(
+                                    "account:account-preferred-language-label"
+                                )}
+                                errorMsg={t("account:is-required-label")}
+                            />
+
                            <Field
                                name="firstname"
                                id="firstname"
@@ -130,8 +286,8 @@ let PersonalDetails = (props) => {
                                type="text"
                                className="govuk-input govuk-input--width-20"
                                validate={[required]}
-                                label="First name"
-                                errorMsg="Is required"
+                                label={t("account:account-first-name-label")}
+                                errorMsg={t("account:is-required-label")}
                            />
                            <Field
                                name="lastname"
@@ -140,8 +296,8 @@ let PersonalDetails = (props) => {
                                type="text"
                                className="govuk-input govuk-input--width-20"
                                validate={[required]}
-                                label="Last name"
-                                errorMsg="Is required"
+                                label={t("account:account-last-name-label")}
+                                errorMsg={t("account:is-required-label")}
                            />
                            <Field
                                name="emailaddress1"
@@ -150,33 +306,32 @@ let PersonalDetails = (props) => {
                                type="email"
                                className="govuk-input govuk-input--width-20"
                                validate={[required, email]}
-                                label="Email address"
+                                label={t("account:account-email-address-label")}
                                disabled
                            />
                            <Field
                                name="telephone1"
                                id="telephone1"
                                component={RenderTextfield}
-                                type="number"
+                                type="text"
                                className="govuk-input govuk-input--width-20"
                                validate={[required, phoneNumber]}
-                                label="Telephone"
+                                label={t("account:account-telephone-label")}
                            />
-
                            <Field
                                name="company"
                                id="company"
                                component={RenderTextfield}
                                type="text"
                                className="govuk-input govuk-input--width-20"
-                                label="Company/Group"
-                                errorMsg="Is required"
+                                label={t("account:account-company-group-label")}
+                                errorMsg={t("account:is-required-label")}
                            />
                        </fieldset>
                        <fieldset className="govuk-fieldset">
                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                                <h2 className="govuk-fieldset__heading">
-                                    What is your address?
+                                    {t("account:account-your-address-label")}
                                </h2>
                            </legend>

@@ -186,9 +341,11 @@ let PersonalDetails = (props) => {
                                component={RenderTextfield}
                                type="text"
                                className="govuk-input govuk-input--width-20"
-                                label="Address line 1"
+                                label={t(
+                                    "account:account-address-line-1-label"
+                                )}
                                validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t("account:is-required-label")}
                            />
                            <Field
                                name="address1_line2"
@@ -196,8 +353,10 @@ let PersonalDetails = (props) => {
                                component={RenderTextfield}
                                type="text"
                                className="govuk-input govuk-input--width-20"
-                                label="Address line 2"
-                                errorMsg="Is required"
+                                label={t(
+                                    "account:account-address-line-2-label"
+                                )}
+                                errorMsg={t("account:is-required-label")}
                            />
                            <Field
                                name="address1_city"
@@ -205,9 +364,9 @@ let PersonalDetails = (props) => {
                                component={RenderTextfield}
                                type="text"
                                className="govuk-input govuk-input--width-10"
-                                label="Town/City"
+                                label={t("account:account-town-city-label")}
                                validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t("account:is-required-label")}
                            />
                            <Field
                                name="address1_county"
@@ -215,9 +374,9 @@ let PersonalDetails = (props) => {
                                component={RenderTextfield}
                                type="text"
                                className="govuk-input govuk-input--width-10"
-                                label="County"
+                                label={t("account:account-county-label")}
                                validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t("account:is-required-label")}
                            />
                            <Field
                                name="address1_postalcode"
@@ -225,9 +384,8 @@ let PersonalDetails = (props) => {
                                component={RenderTextfield}
                                type="text"
                                className="govuk-input govuk-input--width-5"
-                                label="Postcode"
-                                validate={[required]}
-                                errorMsg="Is required"
+                                label={t("account:account-postcode-label")}
+                                validate={[required, postcode]}
                            />
                        </fieldset>
                        <div className="govuk-button-group">
@@ -236,15 +394,16 @@ let PersonalDetails = (props) => {
                                className="govuk-button"
                                data-module="govuk-button"
                            >
-                                Continue
+                                {t("common:continue-button")}
                            </button>
                            <Link
                                href={
                                    "/myportal?q=" +
                                    props.props.accountDetails.loggedinUserId
                                }
+                                className="govuk-link"
                            >
-                                <a className="govuk-link">Cancel</a>
+                                {t("common:cancel-link")}
                            </Link>
                        </div>
                    </form>
@@ -1,15 +1,8 @@
-import _ from "lodash";
-import Link from "next/link";
-import React, { useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import React from "react";
+import { connect } from "react-redux";

 const BuildCheckPersonalDetails = (props) => {
    const {
@@ -25,12 +18,22 @@ const BuildCheckPersonalDetails = (props) => {
    const router = useRouter();
    const { locale } = router;

+    const getPreferredLanguageLabel = (id) => {
+        return id == 846040001
+            ? t("account:account-preferred-language-english")
+            : t("account:account-preferred-language-welsh");
+    };
+
    return (
        <>
-            <h2 className="govuk-heading-m">About you</h2>
+            <h2 className="govuk-heading-m">
+                {t("account:account-about-you-label")}
+            </h2>
            <dl className="govuk-summary-list  govuk-!-margin-bottom-9">
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">First name</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:account-first-name-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -45,15 +48,18 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
-                                first name
+                                {t("account:account-first-name-label")}{" "}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Last name</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:account-last-name-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -68,16 +74,19 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                last name
+                                {t("account:account-last-name-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Email address</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:account-email-address-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -92,16 +101,18 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                email address
+                                {t("account:account-email-address-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Telephone</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:account-telephone-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -116,15 +127,18 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
-                                telephone
+                                {t("account:account-telephone-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Company/Group</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:account-company-group-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -139,20 +153,50 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                company/group
+                                {t("account:account-company-group-label")}
+                            </span>
+                        </a>
+                    </dd>
+                </div>
+                <div className="govuk-summary-list__row">
+                    <dt className="govuk-summary-list__key">
+                        {t("account:account-preferred-language-label")}
+                    </dt>
+                    <dd className="govuk-summary-list__value">
+                        {getPreferredLanguageLabel(
+                            props.props.props.form.personalDetailsForm.values
+                                .pinswg_preferredlanguage
+                        )}
+                    </dd>
+                    <dd className="govuk-summary-list__actions">
+                        <a
+                            className="govuk-link"
+                            href="#company"
+                            onClick={() => {
+                                setPersonalDetailsComplete(false);
+                            }}
+                        >
+                            {t("common:change-link-label")}
+                            <span className="govuk-visually-hidden">
+                                {" "}
+                                {t("account:account-preferred-language-label")}
                            </span>
                        </a>
                    </dd>
                </div>
            </dl>
+            <h2 className="govuk-heading-m">
+                {" "}
+                {t("account:account-your-address-label")}
+            </h2>
            <dl className="govuk-summary-list  govuk-!-margin-bottom-9">
-                <h2 className="govuk-heading-m">Your address</h2>
-
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Address Line 1</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:account-address-line-1-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -167,16 +211,18 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                address line 1
+                                {t("account:account-address-line-1-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Address line 2</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:account-address-line-2-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -191,16 +237,18 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                address line 2
+                                {t("account:account-address-line-2-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Town/City</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:account-town-city-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -215,16 +263,19 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                town/city
+                                {t("account:account-town-city-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">County</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:account-county-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -239,16 +290,19 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                county
+                                {t("account:account-county-label")}
                            </span>
                        </a>
                    </dd>
                </div>
                <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Postcode</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:account-postcode-label")}
+                    </dt>
                    <dd className="govuk-summary-list__value">
                        {
                            props.props.props.form.personalDetailsForm.values
@@ -263,10 +317,10 @@ const BuildCheckPersonalDetails = (props) => {
                                setPersonalDetailsComplete(false);
                            }}
                        >
-                            Change
+                            {t("common:change-link-label")}
                            <span className="govuk-visually-hidden">
                                {" "}
-                                postcode
+                                {t("account:account-postcode-label")}
                            </span>
                        </a>
                    </dd>
@@ -281,12 +335,13 @@ const BuildCheckPersonalDetails = (props) => {
                        setAccountUpdatedComplete(true);
                    }}
                >
-                    Continue
+                    {t("common:continue-button")}
                </button>
                <Link
                    href={"/myportal?q=" + props.accountDetails.loggedinUserId}
+                    className="govuk-link"
                >
-                    <a className="govuk-link">Cancel</a>
+                    {t("common:back-link")}
                </Link>
            </div>
        </>
@@ -1,22 +1,8 @@
-import _ from "lodash";
-import Link from "next/link";
-import React, { useState, useEffect } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import {
-    useDispatch,
-    useSelector,
-    shallowEqual,
-    connect,
-    setRegisterFormComplete,
-    setAccountCreatedComplete,
-} from "react-redux";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import React, { useEffect } from "react";
+import { connect } from "react-redux";
 import { updateAccount } from "../../actions";

 const PersonalDetailsComplete = (props) => {
@@ -42,19 +28,17 @@ const PersonalDetailsComplete = (props) => {

    return (
        <>
-            <p className="govuk-body">Your details have been updated</p>
+            <p className="govuk-body">{t("account:account-complete-para-1")}</p>

-            <p className="govuk-body">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a
-                metus non quam mollis egestas. Integer ac leo cursus, laoreet
-                nulla sed, tempus tellus. Mauris condimentum erat arcu.
-            </p>
+            {/* <p className="govuk-body">{t("account:account-complete-para-2")}</p> */}

            <p className="govuk-body">
                <Link
                    href={"/myportal?q=" + props.accountDetails.loggedinUserId}
+                    className="govuk-link"
                >
-                    <a className="govuk-link">Return to My Portal</a>
+                    {" "}
+                    {t("account:account-complete-return-to-portal-link")}
                </Link>
            </p>
        </>
@@ -1,14 +1,7 @@
-import _ from "lodash";
-import React, { useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import { useRouter } from "next/router";
+import React from "react";
+import { connect } from "react-redux";
 import { setAccCr } from "../../store/accountDetails/action";

 const RegisterFormCheck = (props) => {
@@ -144,30 +137,6 @@ const RegisterFormCheck = (props) => {
                        </a>
                    </dd>
                </div>
-                {/* <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Company/Group</dt>
-                    <dd className="govuk-summary-list__value">
-                        {
-                            props.props.props.form.accountRegisterForm.values
-                                .companygroup
-                        }
-                    </dd>
-                    <dd className="govuk-summary-list__actions">
-                        <a
-                            className="govuk-link"
-                            href="#"
-                            onClick={() => {
-                                setRegisterFormComplete(false);
-                            }}
-                        >
-                            Change
-                            <span className="govuk-visually-hidden">
-                                {" "}
-                                company/group
-                            </span>
-                        </a>
-                    </dd>
-                </div> */}
            </dl>
            <dl className="govuk-summary-list  govuk-!-margin-bottom-9">
                <h2 className="govuk-heading-m">
@@ -1,28 +1,14 @@
 import _ from "lodash";
-import Link from "next/link";
-import React, { useEffect, useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import React, { useEffect, useState } from "react";

-import jsonpath from "jsonpath";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import {
-    useDispatch,
-    useSelector,
-    shallowEqual,
-    connect,
-    setRegisterFormComplete,
-    setAccountCreatedComplete,
-} from "react-redux";
+import { connect } from "react-redux";

 import { setAccCr, setLogout } from "../../store/accountDetails/action";

-import { getEmailAccountCheck, createAccount } from "../../actions";
+import { createAccount, getEmailAccountCheck } from "../../actions";

 const RegisterComplete = (props) => {
    const {
@@ -45,14 +31,17 @@ const RegisterComplete = (props) => {
        let accountBody = props.props.props.form.accountRegisterForm.values;
        let emailAddress =
            props.props.props.form.accountRegisterForm.values.emailaddress1;
+
+        // was an appellant "pinswg_typeofinvolvement": 846040001,
        Object.assign(accountBody, {
-            "pinswg_typeofinvolvement": 846040001,
+            "pinswg_typeofinvolvement": 846040061,
        });

        accountBody = _.omit(accountBody, ["custom_password_check"]);

        let checkEmailObj = {};

+        console.log("props.accountDetails.accCr :", props.accountDetails.accCr);
        switch (props.accountDetails.accCr) {
            case "created":
            case "exists":
@@ -66,7 +55,6 @@ const RegisterComplete = (props) => {
                        ? setAccCr("exists")
                        : (checkEmailObj = createAccount(accountBody).then(
                              (data) => {
-                                  //console.log(data);
                                  setAccCr("created");
                              }
                          ));
@@ -95,20 +83,12 @@ const RegisterComplete = (props) => {
                    </p>

                    <p className="govuk-body">
-                        <Link href="/">
-                            <a
-                                className="govuk-link"
-                                onClick={() => {
-                                    setLogout(),
-                                        window.localStorage.clear(),
-                                        destroyCookie({}, "pinsUser"),
-                                        signOut({ callbackUrl: "/logout" });
-                                }}
-                            >
-                                {t(
-                                    "account:register-new-account-my-portal-link"
-                                )}
-                            </a>
+                        {t("account:register-new-account-paragraph-thanks")}
+                    </p>
+
+                    <p className="govuk-body">
+                        <Link href="/" className="govuk-link">
+                            {t("account:register-new-account-my-portal-link")}
                        </Link>
                    </p>
                </>
@@ -1,14 +1,8 @@
-import _ from "lodash";
-import React, { useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import { useRouter } from "next/router";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { Field, formValueSelector, reduxForm } from "redux-form";

 import RegisterFormCheck from "./registerCheck";
 import RegisterComplete from "./registerComplete";
@@ -84,7 +78,10 @@ const RegisterForm = (props) => {
    const emailRegex =
        /(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;

-    const required = (value) => (value ? undefined : "Is required");
+    const required = (value) =>
+        value
+            ? undefined
+            : t("account:register-new-account-postcode-label-errormsg");
    const email = (value) =>
        value && !emailRegex.test(value) ? "Invalid email address" : undefined;
    const phoneNumber = (value) =>
@@ -106,14 +103,20 @@ const RegisterForm = (props) => {
            : undefined;
    const minLength5 = minLength(5);

+    const postcode = (value) =>
+        value &&
+        !/^([A-Z][A-HJ-Y]?[0-9][A-Z0-9]? ?[0-9][A-Z]{2}|GIR ?0A{2})$/i.test(
+            value
+        )
+            ? t("account:register-new-account-postcode-invalid-label-errormsg")
+            : undefined;
+
    const [hasErrors, setHasErrors] = useState("");

    const onHandleSubmit = (values) => {
-        //console.log(values);
        setRegisterFormComplete(true);
    };

-    //console.log(pristine);
    return (
        <>
            {!pristine && !valid && (
@@ -187,46 +190,13 @@ const RegisterForm = (props) => {
                                name="telephone1"
                                id="telephone1"
                                component={RenderTextfield}
-                                type="number"
+                                type="text"
                                className="govuk-input govuk-input--width-20"
                                validate={[required, phoneNumber]}
                                label={t(
                                    "account:register-new-account-phone-label"
                                )}
                            />
-
-                            {/* <Field
-                                name="pinswg_custom_password"
-                                id="pinswg_custom_password"
-                                component={RenderTextfield}
-                                type="password"
-                                className="govuk-input govuk-input--width-20"
-                                label={t(
-                                    "account:register-new-account-password-label"
-                                )}
-                                validate={[required, minLength5]}
-                                errorMsg={t(
-                                    "account:register-new-account-password-label-errormsg"
-                                )}
-                            />
-                            <Field
-                                name="custom_password_check"
-                                id="custom_password_check"
-                                component={RenderTextfield}
-                                type="password"
-                                className="govuk-input govuk-input--width-20"
-                                label={t(
-                                    "account:register-new-account-confirm-password-label"
-                                )}
-                                validate={[
-                                    required,
-                                    passwordsMatch,
-                                    minLength5,
-                                ]}
-                                errorMsg={t(
-                                    "account:register-new-account-confirm-password-label-errormsg"
-                                )}
-                            /> */}
                        </fieldset>
                        <fieldset className="govuk-fieldset">
                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
@@ -298,10 +268,7 @@ const RegisterForm = (props) => {
                                label={t(
                                    "account:register-new-account-postcode-label"
                                )}
-                                validate={[required]}
-                                errorMsg={t(
-                                    "account:register-new-account-postcode-label-errormsg"
-                                )}
+                                validate={[required, postcode]}
                            />
                        </fieldset>

@@ -0,0 +1,21 @@
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import AddressSearch from "./search/addresssearch";
+
+export default function Search(props) {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    //console.log("props here:", props.myportal || false);
+
+    return (
+        <main
+            className="govuk-main-wrapper govuk-main-wrapper--auto-spacing"
+            id="main-content"
+            role="main"
+        >
+            <AddressSearch myportal={props.myportal || false} />
+        </main>
+    );
+}
@@ -0,0 +1,78 @@
+import useTranslation from "next-translate/useTranslation";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import CRMError from "./crmError";
+import SearchResults from "./search/addresssearchresults";
+
+export default function Search(props) {
+    const {
+        searchString,
+        searchResultsObj,
+        advancedSearch,
+        myportal,
+        watchedCases,
+        isLinkedCase,
+        showLoginCheck,
+    } = props;
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+
+    var hasError = _.has(searchResultsObj.searchResultsObj, "errorCode")
+        ? true
+        : false;
+
+    //console.log("has an error", hasError);
+
+    return (
+        <main
+            className="govuk-main-wrapper govuk-main-wrapper--auto-spacing"
+            id="main-content"
+            role="main"
+        >
+            {hasError ? (
+                <CRMError props={props} />
+            ) : (
+                <>
+                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-column-full">
+                            <SearchResults
+                                advancedSearch={advancedSearch}
+                                searchString={searchString}
+                                searchResultsObj={
+                                    searchResultsObj.searchResultsObj
+                                }
+                                searchDetailsObj={
+                                    searchResultsObj.searchDetailsObj
+                                }
+                                myportal={myportal}
+                                watchedCases={watchedCases}
+                                isLinkedCase={isLinkedCase}
+                                showLoginCheck={showLoginCheck}
+                            />
+                        </div>
+                    </div>
+                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-column-full">
+                            <div className="govuk-button-group">
+                                <Link
+                                    href="/addresssearch"
+                                    className="govuk-button"
+                                >
+                                    {t("common:breadcrumb-address-search")}
+                                </Link>
+                                {/* <a
+                            onClick={() => router.back()}
+                            className="govuk-button govuk-button--secondary"
+                        >
+                            {t("search:searchresults-new-search-button-label")}
+                        </a> */}
+                            </div>
+                        </div>
+                    </div>
+                </>
+            )}
+        </main>
+    );
+}
@@ -0,0 +1,40 @@
+// components/admin/tabs/AccountsTab.js
+import Link from "next/link";
+
+export default function AccountsTab({ userData }) {
+    return (
+        <div>
+            <h1>User Accounts</h1>
+            <p>Number of accounts created: {userData.length}</p>
+
+            <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
+                <div className="govuk-summary-list__row results-headings">
+                    <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                        Name
+                    </dd>
+                    <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                        Last accessed
+                    </dd>
+                </div>
+
+                {userData.map((user) => (
+                    <div key={user.id} className="govuk-summary-list__row">
+                        <dd className="govuk-summary-list__value govuk-!-font-size-16 ">
+                            <Link
+                                target="_blank"
+                                href={`/auth/signin2?email=${user.email}`}
+                            >
+                                {user.email}
+                            </Link>
+                            <br />
+                            {user.id}
+                        </dd>
+                        <dd className="govuk-summary-list__value govuk-!-font-size-16 ">
+                            Last accessed: {user.created}
+                        </dd>
+                    </div>
+                ))}
+            </dl>
+        </div>
+    );
+}
@@ -0,0 +1,568 @@
+// components/admin/tabs/AppealsTab.js
+import useTranslation from "next-translate/useTranslation";
+import { useCallback, useState, useEffect } from "react";
+import { JSONPath as jsonpath } from "jsonpath-plus";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import PaginationControl from "../../../components/search/pagination";
+import { connect } from "react-redux";
+
+import {
+    setSearchResults,
+    setSearchDetails,
+} from "../../../store/searchOutput/action";
+
+import { getDetailsProxy, getSearchDetailsPaged } from "../../utils";
+import { getAdvancedSearchPaged, getNewAppealsPage } from "../../../actions";
+import {
+    setCurrentPage,
+    setCurrentReference,
+} from "../../../store/currentView/action";
+
+function AppealsTab(props) {
+    const [searchLoaded, setSearchLoaded] = useState(false);
+    const [showSpinnerState, setShowSpinnerState] = useState(false);
+    const [selectedOption, setSelectedOption] = useState(10);
+    const [orderByState, setOrderbyState] = useState("createdon");
+    const [fieldSortState, setfieldSortState] = useState("desc");
+    const [loginToWatch, setLoginToWatch] = useState("true");
+
+    const searchDetailsObj = props.searchResultsObj.searchDetailsObj || {};
+    const resultsArr = props.searchResultsObj.searchResultsObj.value || [];
+    const searchResultsObj = props.searchResultsObj.searchResultsObj;
+
+    const { t } = useTranslation();
+    const router = useRouter();
+    const myportal = false;
+    const advancedSearch = false;
+    const searchString = "";
+
+    const spinnerState = () => {
+        setShowSpinnerState((prev) => !prev);
+    };
+
+    const pagesCount = Math.ceil(searchResultsObj["@odata.count"] / 10);
+
+    let currentPage = 0;
+    try {
+        currentPage = decodeURI(searchResultsObj["@odata.nextLink"]).split(
+            "skiptoken="
+        )[1];
+        currentPage =
+            typeof currentPage !== "undefined"
+                ? parseInt(
+                      decodeURI(currentPage)
+                          .split('pagenumber="')[1]
+                          .slice(
+                              0,
+                              decodeURI(currentPage)
+                                  .split('pagenumber="')[1]
+                                  .indexOf('"')
+                          ) - 1
+                  )
+                : pagesCount;
+    } catch (e) {
+        currentPage = pagesCount;
+    }
+
+    const getSearchPageResults = useCallback(
+        (pageNumber, orderBy, fieldSort) => {
+            getNewAppealsPage(
+                searchString,
+                pageNumber,
+                orderBy,
+                fieldSort,
+                selectedOption
+            ).then((data) => {
+                props.setSearchResults(data); // ✅ use props, not import
+                return getSearchDetailsPaged(data).then((details) => {
+                    props.setSearchDetails(details); // ✅ use props, not import
+                    setShowSpinnerState(false);
+                });
+            });
+        },
+        [
+            advancedSearch,
+            searchString,
+            selectedOption,
+            props.setSearchDetails,
+            props.setSearchResults,
+        ]
+    );
+
+    useEffect(() => {
+        if (searchLoaded) {
+            if (selectedOption) {
+                setShowSpinnerState(true);
+                getSearchPageResults(1, orderByState, fieldSortState);
+            }
+        } else {
+            setSearchLoaded(true);
+        }
+    }, [
+        selectedOption,
+        fieldSortState,
+        orderByState,
+        searchLoaded,
+        getSearchPageResults,
+        router.query,
+    ]);
+
+    const ResultsView = (resultsArr) => {
+        return (
+            <>
+                <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
+                    <div className="govuk-summary-list__row results-headings">
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider  ">
+                            <button
+                                type="button"
+                                onClick={() => sortDataBy("title")}
+                                className={
+                                    orderByState == "title"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
+                                {t("search:searchresults-case-reference-label")}
+                            </button>
+                        </dd>
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                            {t("search:searchresults-site-address-label")}
+                        </dd>
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                            <button
+                                type="button"
+                                onClick={() => sortDataBy("_customerid_value")}
+                                className={
+                                    orderByState == "_customerid_value"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
+                                {t("search:searchresults-applicant-label")}
+                            </button>
+                        </dd>
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                            <button
+                                type="button"
+                                onClick={() =>
+                                    sortDataBy("_pinswg_associatedlpa_value")
+                                }
+                                className={
+                                    orderByState ==
+                                    "_pinswg_associatedlpa_value"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
+                                {t("search:searchresults-authority-label")}
+                            </button>
+                        </dd>
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                            <button
+                                type="button"
+                                onClick={() =>
+                                    sortDataBy("pinswg_appealcasetype")
+                                }
+                                className={
+                                    orderByState == "pinswg_appealcasetype"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
+                                {t("search:searchresults-case-type-label")}
+                            </button>
+                        </dd>
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                            {/* {t("search:searchresults-status-label")} */}
+                            <button
+                                type="button"
+                                onClick={() => sortDataBy("statuscode")}
+                                className={
+                                    orderByState == "statuscode"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
+                                {t("search:searchresults-status-label")}
+                            </button>
+                        </dd>
+
+                        <dd className="govuk-summary-list__key govuk-!-font-size-16 govuk-summary-list__action">
+                            Origin
+                        </dd>
+                    </div>
+                    {showSpinnerState == true ? (
+                        <div className="govuk-summary-list__row">
+                            <div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9 govuk-!-font-weight-bold govuk-!-font-size-20  ">
+                                {t("common:spinner-fetching-data")}
+                                <img
+                                    className="data-loading-icon"
+                                    src="/assets/images/loading.gif"
+                                    alt={
+                                        router.locale == "cy"
+                                            ? "Nôl data"
+                                            : "Fetching data"
+                                    }
+                                />
+                            </div>
+                        </div>
+                    ) : (
+                        resultsArr.map((item, key) => {
+                            let detailsObj = jsonpath({
+                                path:
+                                    '$..[?(@ && @.ticketnumber=="' +
+                                    item.ticketnumber +
+                                    '")]',
+                                json: searchDetailsObj,
+                                eval: true,
+                            });
+
+                            detailsObj = detailsObj[0] || {};
+                            return (
+                                <div
+                                    className="govuk-summary-list__row"
+                                    key={key}
+                                >
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                        <div></div>
+                                        {item.pinswg_publishtoweb == true ? (
+                                            <Link
+                                                target="_blank"
+                                                rel="noreferrer"
+                                                href={
+                                                    (router.locale == "cy"
+                                                        ? myportal == true
+                                                            ? "/fymhorth/achos"
+                                                            : "/achos"
+                                                        : myportal == true
+                                                        ? "/myportal/case"
+                                                        : "/case") +
+                                                    "/" +
+                                                    item.ticketnumber
+                                                }
+                                                className="govuk-link--no-underline"
+                                                onClick={() => {
+                                                    setCurrentReference({
+                                                        "ticketnumber":
+                                                            item.ticketnumber,
+                                                        "currentReference":
+                                                            item.title,
+                                                        "currentType":
+                                                            "searchResultsObj",
+                                                        "incidentid":
+                                                            item.incidentid,
+                                                        "appealType":
+                                                            item.pinswg_appealcasetype,
+                                                        "showLoginCheck":
+                                                            props.showLoginCheck,
+                                                        "specialistProcess":
+                                                            detailsObj.hasOwnProperty(
+                                                                "pinswg_speacialistcaseprocess"
+                                                            )
+                                                                ? detailsObj.pinswg_speacialistcaseprocess
+                                                                : detailsObj.hasOwnProperty(
+                                                                      "pinswg_specialistcaseprocess"
+                                                                  )
+                                                                ? detailsObj.pinswg_specialistcaseprocess
+                                                                : "",
+                                                    });
+                                                }}
+                                            >
+                                                <span className="results-visually-hidden">
+                                                    {t(
+                                                        "search:searchresults-case-reference-label"
+                                                    )}
+                                                    :
+                                                </span>
+                                                {item.title}
+                                            </Link>
+                                        ) : (
+                                            item.title
+                                        )}
+
+                                        <br />
+                                        {new Date(
+                                            item.createdon
+                                        ).toLocaleString()}
+                                    </dd>
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                        <span className="results-visually-hidden">
+                                            {t(
+                                                "search:searchresults-site-address-label"
+                                            )}
+                                            :
+                                        </span>
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_projectlocation"
+                                        )
+                                            ? detailsObj.pinswg_projectlocation !=
+                                              null
+                                                ? detailsObj.pinswg_projectlocation.indexOf(
+                                                      ";"
+                                                  ) < 0
+                                                    ? detailsObj.pinswg_projectlocation
+                                                    : router.locale == "cy"
+                                                    ? detailsObj.pinswg_projectlocation.split(
+                                                          ";"
+                                                      )[1]
+                                                    : detailsObj.pinswg_projectlocation.split(
+                                                          ";"
+                                                      )[0]
+                                                : ""
+                                            : ""}
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddressline1"
+                                        )
+                                            ? detailsObj.pinswg_siteaddressline1
+                                            : ""}
+
+                                        {/* {detailsObj.pinswg_siteaddressline1 !=
+                                        null && <br />} */}
+
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddressline1"
+                                        ) &&
+                                            detailsObj.pinswg_siteaddressline1 !=
+                                                null && <br />}
+
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddressline1"
+                                        )
+                                            ? detailsObj.pinswg_siteaddressline2
+                                            : ""}
+
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddressline2"
+                                        ) &&
+                                            detailsObj.pinswg_siteaddressline2 !=
+                                                null && <br />}
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddresstown"
+                                        )
+                                            ? detailsObj.pinswg_siteaddresstown
+                                            : ""}
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddresstown"
+                                        ) &&
+                                            detailsObj.pinswg_siteaddresstown !=
+                                                null && <br />}
+
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddresscounty"
+                                        )
+                                            ? detailsObj.pinswg_siteaddresscounty
+                                            : ""}
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddresscounty"
+                                        ) &&
+                                            detailsObj.pinswg_siteaddresscounty !=
+                                                null && <br />}
+                                        {_.has(
+                                            detailsObj,
+                                            "pinswg_siteaddresspostcode"
+                                        )
+                                            ? detailsObj.pinswg_siteaddresspostcode
+                                            : ""}
+                                    </dd>
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                        <span className="results-visually-hidden">
+                                            {t(
+                                                "search:searchresults-applicant-label"
+                                            )}
+                                            :
+                                        </span>
+                                        {item.pinswg_appellantagent == 846040001
+                                            ? item.pinswg_appellantfirstname +
+                                              " " +
+                                              item.pinswg_appellantlastname
+                                            : _.has(detailsObj, [
+                                                  "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue",
+                                              ])
+                                            ? detailsObj[
+                                                  "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
+                                              ]
+                                            : ""}
+                                    </dd>
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                        <span className="results-visually-hidden">
+                                            {t(
+                                                "search:searchresults-authority-label"
+                                            )}
+                                            :
+                                        </span>
+                                        {_.has(item, [
+                                            "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue",
+                                        ])
+                                            ? router.locale == "cy"
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
+                                                          item[
+                                                              "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+                                                          ] +
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
+                                                : item[
+                                                      "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+                                                  ] || "N/A"
+                                            : ""}
+                                    </dd>
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                        <span className="results-visually-hidden">
+                                            {t(
+                                                "search:searchresults-case-type-label"
+                                            )}
+                                            :
+                                        </span>
+                                        {router.locale == "cy"
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
+                                                      item[
+                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : item[
+                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
+                                              ] || "N/A"}
+                                    </dd>
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                        <span className="results-visually-hidden">
+                                            {t(
+                                                "search:searchresults-status-label"
+                                            )}
+                                            :
+                                        </span>
+
+                                        {router.locale == "cy"
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
+                                                      item[
+                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : item[
+                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
+                                              ] || "N/A"}
+                                    </dd>
+                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                        {item[
+                                            "caseorigincode@OData.Community.Display.V1.FormattedValue"
+                                        ] || "N/A"}
+                                    </dd>
+                                </div>
+                            );
+                        })
+                    )}
+                </dl>
+                <PaginationControl
+                    showNoOfRecords={selectedOption}
+                    currentPage={currentPage}
+                    searchResultsObj={props.searchResultsObj.searchResultsObj}
+                    orderBy={orderByState}
+                    fieldSort={fieldSortState}
+                    spinnerState={spinnerState}
+                    getSearchPageResults={getSearchPageResults}
+                />
+            </>
+        );
+    };
+
+    return (
+        <div>
+            <h1>Appeals</h1>
+            {searchResultsObj["@odata.count"] > 5 && (
+                <div id="recordCountSelect" className="">
+                    <div className="govuk-form-group">
+                        <label
+                            className="govuk-label-s "
+                            htmlFor="showNumberOfRecords"
+                        >
+                            {t("search:searchresults-show-records-label-a")}
+                            <select
+                                onChange={(e) => {
+                                    setSelectedOption(e.target.value);
+                                    props.setCurrentPage(1);
+                                }}
+                                value={selectedOption}
+                                className="govuk-select"
+                                id="showNumberOfRecords"
+                                name="showNumberOfRecords"
+                            >
+                                <option value="5">5</option>
+                                <option value="10">10</option>
+                                <option value="20">20</option>
+                                <option value="30">30</option>
+                                <option value="50">50</option>
+                            </select>{" "}
+                            {t("search:searchresults-show-records-label-b")}
+                        </label>
+                    </div>
+                </div>
+            )}
+            {resultsArr.length > 0 ? (
+                ResultsView(resultsArr)
+            ) : (
+                <div className="govuk-grid-row">
+                    <div className="govuk-grid-column-two-thirds">
+                        <h3>{t("search:searchresults-no-records-label")}</h3>
+                    </div>
+                </div>
+            )}
+        </div>
+    );
+}
+
+const mapDispatchToProps = (dispatch) => {
+    return {
+        setCurrentReference: (currentReference) => {
+            dispatch(setCurrentReference(currentReference));
+        },
+        setSearchResults: (searchResultsObj) => {
+            dispatch(setSearchResults(searchResultsObj));
+        },
+        setSearchDetails: (searchDetailsObj) => {
+            dispatch(setSearchDetails(searchDetailsObj));
+        },
+        setCurrentPage: (currentPage) => {
+            dispatch(setCurrentPage(currentPage));
+        },
+    };
+};
+
+const mapStateToProps = (state) => {
+    return {
+        searchResultsObj: state.searchResultsObj,
+    };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(AppealsTab);
@@ -0,0 +1,266 @@
+// components/admin/tabs/StorageTab.js
+import { useState } from "react";
+import Link from "next/link";
+import { bytesToSize } from "../../../components/utils";
+import {
+    deleteMyRepresentationsFromBlob,
+    deleteAwaitingSubmissionsFromBlob,
+    sendRepCompleteMessage,
+} from "../../../actions";
+
+import { formatBlobDates } from "../utils/adminHelper";
+
+export default function StorageTab({ data, repCompleteCount }) {
+    const [showRepJson, setShowRepJson] = useState(true);
+    const [showTmpFile, setShowTmpFile] = useState(true);
+    const [listData, setListData] = useState(data);
+
+    const toggleAll = () => {
+        const newState = !(showRepJson || showTmpFile);
+        setShowRepJson(newState);
+        setShowTmpFile(newState);
+    };
+
+    return (
+        <div>
+            <h1>Storage Account Contents</h1>
+            {repCompleteCount > 0 && (
+                <p>Number of Orphaned Reps: {repCompleteCount}</p>
+            )}
+
+            {/* Toggle buttons */}
+            <div style={{ marginBottom: "0.2rem" }}>
+                <button
+                    className="govuk-button govuk-button--secondary"
+                    onClick={() => setShowRepJson(!showRepJson)}
+                >
+                    {showRepJson ? "Hide Reps" : "Show Reps"}
+                </button>
+                <button
+                    className="govuk-button govuk-button--secondary"
+                    onClick={() => setShowTmpFile(!showTmpFile)}
+                    style={{ marginLeft: "0.5rem" }}
+                >
+                    {showTmpFile ? "Hide Temp Appeal" : "Show Temp Appeal"}
+                </button>
+                <button
+                    className="govuk-button govuk-button--secondary"
+                    onClick={toggleAll}
+                    style={{ marginLeft: "0.5rem" }}
+                >
+                    Show/Hide All
+                </button>
+            </div>
+
+            {/* Render users & containers */}
+            {listData.map((user) => (
+                <div key={user.id} className="govuk-grid-row">
+                    {user.containers.map((c) => (
+                        <div key={c.container} className="card">
+                            <div className="card-body">
+                                <h3>
+                                    {c.container} -{" "}
+                                    <Link
+                                        href={`/auth/signin2?email=${user.email}`}
+                                    >
+                                        {user.email}
+                                    </Link>
+                                </h3>
+                                {/* folders */}
+                                {c.folders.map((folder) => (
+                                    <div
+                                        key={folder.folderPath}
+                                        style={
+                                            showRepJson && folder.hasRepJson
+                                                ? { display: "block" }
+                                                : showTmpFile &&
+                                                  folder.hasTmpFile
+                                                ? { display: "block" }
+                                                : { display: "none" }
+                                        }
+                                    >
+                                        <h4>{folder.folderPath || "Root"}</h4>
+
+                                        {/* Buttons for TMP + Rep actions go here (same logic as before) */}
+
+                                        {folder.hasTmpFile && (
+                                            <>
+                                                <button
+                                                    onClick={() => {
+                                                        confirm(
+                                                            "Do you want to remove this unsubmitted appeal " +
+                                                                folder.folderPath +
+                                                                "?\n"
+                                                        ) &&
+                                                            (deleteCaseItem(
+                                                                c.container,
+                                                                folder.folderPath,
+                                                                setData
+                                                            ),
+                                                            alert(
+                                                                "Temp case Deleted!"
+                                                            ));
+                                                    }}
+                                                >
+                                                    Delete this TMP appeal
+                                                </button>
+                                            </>
+                                        )}
+                                        {folder.hasRepJson && (
+                                            <div>
+                                                {" "}
+                                                <button
+                                                    title={
+                                                        "Do you want to delete rep"
+                                                    }
+                                                    className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
+                                                    onClick={() => {
+                                                        confirm(
+                                                            "Do you want tyo delete rep " +
+                                                                folder.repJsonBlob.name.split(
+                                                                    "/"
+                                                                )[0] +
+                                                                "?\n"
+                                                        ) &&
+                                                            (deleteRepItem(
+                                                                c.container,
+                                                                folder.repJsonBlob.name.split(
+                                                                    "/"
+                                                                )[0],
+                                                                folder.repJsonBlob.name.split(
+                                                                    "/"
+                                                                )[1]
+                                                            ),
+                                                            alert(
+                                                                "Rep Deleted!"
+                                                            ),
+                                                            window.location.reload());
+                                                    }}
+                                                >
+                                                    Delete Rep
+                                                </button>
+                                                {folder.repComplete && (
+                                                    <button
+                                                        onClick={async () => {
+                                                            const response =
+                                                                await fetch(
+                                                                    "/api/file/editRepJson",
+                                                                    {
+                                                                        method: "POST",
+                                                                        headers:
+                                                                            {
+                                                                                "Content-Type":
+                                                                                    "application/json",
+                                                                            },
+                                                                        body: JSON.stringify(
+                                                                            {
+                                                                                container:
+                                                                                    c.container,
+                                                                                blobName:
+                                                                                    folder
+                                                                                        .repJsonBlob
+                                                                                        .name,
+                                                                            }
+                                                                        ),
+                                                                    }
+                                                                );
+                                                            const result =
+                                                                await response.json();
+                                                            if (response.ok) {
+                                                                alert(
+                                                                    "repComplete removed!"
+                                                                ),
+                                                                    window.location.reload();
+                                                                // Optionally refresh the page or update UI state here
+                                                            } else {
+                                                                alert(
+                                                                    "Error: " +
+                                                                        result.error
+                                                                );
+                                                            }
+                                                        }}
+                                                    >
+                                                        Remove repComplete
+                                                    </button>
+                                                )}
+                                                {folder.repComplete && (
+                                                    <button
+                                                        onClick={async () => {
+                                                            confirm(
+                                                                "Do you want resend the rep queue message " +
+                                                                    folder.repJsonBlob.name.split(
+                                                                        "/"
+                                                                    )[0] +
+                                                                    " --- " +
+                                                                    folder.repJsonBlob.name.split(
+                                                                        "/"
+                                                                    )[1]
+                                                            ) &&
+                                                                (sendRepCompleteMessage(
+                                                                    c.container,
+                                                                    folder.repJsonBlob.name.split(
+                                                                        "/"
+                                                                    )[0],
+                                                                    folder.repJsonBlob.name.split(
+                                                                        "/"
+                                                                    )[1]
+                                                                ),
+                                                                alert(
+                                                                    "rep queue message sent!"
+                                                                ),
+                                                                window.location.reload());
+                                                        }}
+                                                    >
+                                                        Recreate Queue Message
+                                                    </button>
+                                                )}
+                                            </div>
+                                        )}
+                                        <ul>
+                                            {folder.blobs.map((blob) => (
+                                                <li key={blob.name}>
+                                                    <Link
+                                                        scroll={false}
+                                                        href={`/api/file/downloadblob?container=${
+                                                            c.container
+                                                        }&casefolderID=${
+                                                            folder.folderPath
+                                                        }&blobname=${blob.name.substring(
+                                                            blob.name.lastIndexOf(
+                                                                "/"
+                                                            ) + 1
+                                                        )}&hash=${
+                                                            blob.hashedfilepath
+                                                        }`}
+                                                        className="govuk-body govuk-!-font-size-14 govuk-link"
+                                                    >
+                                                        {blob.name} (
+                                                        {bytesToSize(
+                                                            blob.contentLength ||
+                                                                blob.size
+                                                        )}
+                                                        )
+                                                    </Link>{" "}
+                                                    {blob.lastModified && (
+                                                        <span className="govuk-!-font-size-14">
+                                                            {/* {
+                                                                                blob.displayDate
+                                                                            } */}
+                                                            {formatBlobDates(
+                                                                blob
+                                                            )}
+                                                        </span>
+                                                    )}
+                                                </li>
+                                            ))}
+                                        </ul>
+                                    </div>
+                                ))}
+                            </div>
+                        </div>
+                    ))}
+                </div>
+            ))}
+        </div>
+    );
+}
@@ -0,0 +1,81 @@
+// components/admin/utils/adminStorage.js
+
+/**
+ * Get the folder path up to the last slash.
+ * Used for grouping blobs by "case folder".
+ */
+export function getUpToLastSlash(url) {
+    let lastSlash = url.lastIndexOf("/");
+
+    url = url.substring(0, lastSlash);
+
+    url =
+        url.lastIndexOf("/files") > 0
+            ? url.substring(0, url.lastIndexOf("/files"))
+            : url;
+    return url;
+}
+
+/**
+ * Convert a stream (Azure blob download) to a string.
+ */
+export async function streamToString(readableStream) {
+    return new Promise((resolve, reject) => {
+        const chunks = [];
+        readableStream.on("data", (data) => {
+            chunks.push(data.toString());
+        });
+        readableStream.on("end", () => {
+            resolve(chunks.join(""));
+        });
+        readableStream.on("error", reject);
+    });
+}
+
+/**
+ * Format how long ago a date occurred.
+ */
+export function formatTimeSince(date) {
+    if (!date) return "Unknown date";
+
+    const now = new Date();
+    const diffMs = now - date;
+    const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
+
+    if (diffDays < 7) {
+        return `${diffDays} day${diffDays !== 1 ? "s" : ""} ago`;
+    } else {
+        const diffWeeks = Math.floor(diffDays / 7);
+        return `${diffWeeks} week${diffWeeks !== 1 ? "s" : ""} ago`;
+    }
+}
+
+/**
+ * Format Azure blob created/modified dates into a readable string.
+ */
+export function formatBlobDates(blob) {
+    const created = blob.createdOn ? new Date(blob.createdOn) : null;
+    const modified = blob.lastModified ? new Date(blob.lastModified) : null;
+
+    if (!created && !modified) return "Unknown";
+
+    // If both exist and are the same
+    if (created && modified && created.getTime() === modified.getTime()) {
+        return `${created.toLocaleString("en-GB")} (${formatTimeSince(
+            created
+        )})`;
+    }
+
+    // If modified exists and is newer than created
+    if (created && modified && modified.getTime() > created.getTime()) {
+        return `Created: ${created.toLocaleString("en-GB")} (${formatTimeSince(
+            created
+        )}), Modified: ${modified.toLocaleString("en-GB")} (${formatTimeSince(
+            modified
+        )})`;
+    }
+
+    // Only one date exists
+    const date = modified || created;
+    return `${date.toLocaleString("en-GB")} (${formatTimeSince(date)})`;
+}
@@ -0,0 +1,14 @@
+// lib/prisma.js
+import { PrismaClient } from "@prisma/client";
+
+const globalForPrisma = globalThis;
+
+export const prisma =
+    globalForPrisma.prisma ||
+    new PrismaClient({
+        log: ["query", "error", "warn"],
+    });
+
+if (process.env.NODE_ENV !== "production") {
+    globalForPrisma.prisma = prisma;
+}
@@ -0,0 +1,166 @@
+// components/admin/utils/serverStorage.js
+import { DefaultAzureCredential } from "@azure/identity";
+import { BlobServiceClient } from "@azure/storage-blob";
+import { PrismaClient } from "@prisma/client";
+import CryptoJS from "crypto-js";
+import { getUpToLastSlash, streamToString } from "../utils/adminHelper";
+import { listContainersForUser } from "../../../actions/azurestorage";
+
+const prisma = global.prisma || new PrismaClient();
+
+/**
+ * Generate HMAC hash for blob API link.
+ */
+function hashAPIPath(queryPath, WORDKEY) {
+    let hashlink = CryptoJS.HmacSHA256(
+        queryPath,
+        CryptoJS.enc.Hex.parse(WORDKEY)
+    );
+    return hashlink.toString(CryptoJS.enc.Hex);
+}
+
+/**
+ * Fetch blob structure + users for admin storage page.
+ */
+export async function fetchAdminStorageData() {
+    const accountName = process.env.AZURE_STORAGE_ACCOUNT_NAME;
+    const creds = new DefaultAzureCredential();
+    const blobServiceClient = new BlobServiceClient(
+        `https://${accountName}.blob.core.windows.net`,
+        creds
+    );
+
+    const prisma = global.prisma || new PrismaClient();
+
+    const users = await prisma.user.findMany();
+
+    let data = await Promise.all(
+        users.map(async (user) => {
+            const containers = await listContainersForUser(
+                blobServiceClient,
+                `${user.id}`,
+                user.email
+            );
+
+            const containersWithHashes = await Promise.all(
+                containers.map(async (container) => {
+                    const groupedByFolder = await container.blobs.reduce(
+                        async (accP, blob) => {
+                            const acc = await accP;
+                            const folderPath =
+                                getUpToLastSlash(blob.name.trim()) || "";
+
+                            const hashedfilepath = hashAPIPath(
+                                `/api/file/downloadblob?container=${
+                                    container.container
+                                }&casefolderID=${folderPath}&blobname=${blob.name
+                                    .substring(blob.name.lastIndexOf("/") + 1)
+                                    .trim()}`,
+                                process.env.HASHKEY
+                            );
+
+                            const fileNameOnly = blob.name.substring(
+                                blob.name.lastIndexOf("/") + 1
+                            );
+                            const isTmpFile = fileNameOnly.startsWith("TMP-");
+
+                            const blobWithHash = {
+                                ...blob,
+                                hashedfilepath,
+                                isTmpFile,
+                            };
+
+                            let folderGroup = acc.find(
+                                (f) => f.folderPath === folderPath
+                            );
+                            if (!folderGroup) {
+                                folderGroup = {
+                                    folderPath,
+                                    blobs: [],
+                                    hasRepJson: false,
+                                    repJsonBlob: null,
+                                    repComplete: false,
+                                    hasTmpFile: false,
+                                };
+                                acc.push(folderGroup);
+                            }
+
+                            folderGroup.blobs.push(blobWithHash);
+
+                            if (isTmpFile) {
+                                folderGroup.hasTmpFile = true;
+                            }
+
+                            // rep.json handling
+                            if (blob.name.toLowerCase().endsWith("rep.json")) {
+                                folderGroup.hasRepJson = true;
+                                folderGroup.repJsonBlob = blobWithHash;
+
+                                const containerClient =
+                                    blobServiceClient.getContainerClient(
+                                        container.container
+                                    );
+                                const blockBlobClient =
+                                    containerClient.getBlockBlobClient(
+                                        blob.name
+                                    );
+
+                                try {
+                                    const downloadResponse =
+                                        await blockBlobClient.download(0);
+                                    const downloaded = await streamToString(
+                                        downloadResponse.readableStreamBody
+                                    );
+                                    const json = JSON.parse(downloaded);
+                                    folderGroup.repComplete = Boolean(
+                                        json.repComplete
+                                    );
+                                } catch (err) {
+                                    console.error(
+                                        "Error reading rep.json",
+                                        err
+                                    );
+                                    folderGroup.repComplete = false;
+                                }
+                            }
+
+                            return acc;
+                        },
+                        Promise.resolve([])
+                    );
+
+                    return { ...container, folders: groupedByFolder };
+                })
+            );
+
+            return containersWithHashes.length > 0
+                ? {
+                      id: user.id,
+                      email: user.email,
+                      containers: containersWithHashes,
+                  }
+                : null;
+        })
+    );
+
+    data = data.filter(Boolean);
+
+    let userData = users
+        .filter((user) => user.email && user.email.trim() !== "")
+        .map((user) => ({
+            id: user.id,
+            email: user.email,
+            created: user.emailVerified?.toLocaleString("en-GB") || "",
+        }));
+
+    let repCompleteCount = 0;
+    data.forEach((user) => {
+        user.containers.forEach((container) => {
+            container.folders.forEach((folder) => {
+                if (folder.repComplete === true) repCompleteCount++;
+            });
+        });
+    });
+
+    return { data, userData, repCompleteCount };
+}
@@ -0,0 +1,35 @@
+import React from "react";
+import { ApplicationInsights } from "@microsoft/applicationinsights-web";
+import {
+    ReactPlugin,
+    withAITracking,
+    AppInsightsContext,
+} from "@microsoft/applicationinsights-react-js";
+
+let reactPlugin = new ReactPlugin();
+let appInsights = new ApplicationInsights({
+    config: {
+        connectionString:
+            process.env.APPLICATIONINSIGHTS_CONNECTIONSTRING ||
+            process.env.NEXT_PUBLIC_APP_INSIGHT,
+        enableAutoRouteTracking: true,
+        enableCorsCorrelation: true,
+        enableRequestHeaderTracking: true,
+        enableResponseHeaderTracking: true,
+        enableAjaxPerfTracking: true,
+        isBrowserLinkTrackingEnabled: true,
+        extensions: [reactPlugin],
+    },
+});
+
+appInsights.loadAppInsights();
+
+const AzureAppInsights = ({ children }) => {
+    return (
+        <AppInsightsContext.Provider value={reactPlugin}>
+            {children}
+        </AppInsightsContext.Provider>
+    );
+};
+
+export default withAITracking(reactPlugin, AzureAppInsights);
@@ -1,4 +1,3 @@
-import Link from "next/link";
 import useTranslation from "next-translate/useTranslation";

 export default function Banner() {
@@ -1,10 +1,8 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
-import Summary from "./case/summary";
+import { useRouter } from "next/router";
 import Documents from "./case/documents";
 import RepresentationList from "./case/representationList";
+import Summary from "./case/summary";

 const Case = (props) => {
    const { showRepresentations } = props;
@@ -29,23 +27,23 @@ const Case = (props) => {
                        watchedCasesDetails={props.watchedCasesDetails}
                        awaitingSubmission={props.awaitingSubmission}
                        caseReference={props.caseReference}
+                        ticketnumber={props.ticketnumber}
                        currentType={props.currentType}
                        appealTypeID={props.appealTypeID}
                        searchResultsObj={props.searchResultsObj}
+                        directSearchResultsObj={props.directSearchResultsObj}
                        searchDetailsObj={props.searchDetailsObj}
                        searchString={props.searchString}
                        incidentid={props.incidentid}
-                        showMap={props.showMap}
+                        showMap={props.showMaps}
+                        currentView={props.currentView}
+                        messagesObj={props.messagesObj}
+                        docsOffline={props.props.docsOffline}
+                        documentDetailsObj={props.documentDetailsObj}
+                        showFilteredDocs={props.showFilteredDocs}
                        showLoginCheck={props.showLoginCheck}
                    />
-                    <Documents
-                        incidentid={props.incidentid}
-                        caseReference={props.caseReference}
-                        searchResultsObj={props.searchResultsObj}
-                        searchDetailsObj={props.searchDetailsObj}
-                        documentDetailsObj={props.documentDetailsObj}
-                    />
-                    {showRepresentations == "true" && (
+                    {showRepresentations == true && (
                        <RepresentationList
                            incidentid={props.incidentid}
                            caseReference={props.caseReference}
@@ -0,0 +1,83 @@
+import cookie from "cookie-cutter";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import { useState } from "react";
+import { formatDates } from "../utils";
+export default function CaseNoticeBanner(props) {
+    let { t, lang } = useTranslation();
+
+    const { messagesObj } = props;
+    const router = useRouter();
+
+    const noticeContent = messagesObj.value[0].description;
+    const noticeTitle = messagesObj.value[0].subject.split("Banner ")[1];
+
+    const bannerOpenCookie = typeof cookie.get("pedwNotice") == "undefined";
+    let messagesObjArr = messagesObj.value;
+
+    return (
+        <>
+            {messagesObjArr.map((message, index) => (
+                <div className="govuk-warning-text noticebanner" key={index}>
+                    <strong className="govuk-warning-text__text">
+                        <span className="govuk-visually-hidden">Warning</span>
+                    </strong>
+                    <div>
+                        <div className=" govuk-body-s">
+                            <h2 className="govuk-heading-s">
+                                {(
+                                    message.subject.match(
+                                        new RegExp(">>>", "g")
+                                    ) || []
+                                ).length > 0
+                                    ? router.locale == "cy"
+                                        ? message.subject
+                                              .split("Banner ")[1]
+                                              .split(">>>")[1]
+                                        : message.subject
+                                              .split("Banner ")[1]
+                                              .split(">>>")[0]
+                                    : (
+                                          message.subject.match(
+                                              new RegExp(";", "g")
+                                          ) || []
+                                      ).length > 0
+                                    ? router.locale == "cy"
+                                        ? message.subject
+                                              .split("Banner ")[1]
+                                              .split(";")[1]
+                                        : message.subject
+                                              .split("Banner ")[1]
+                                              .split(";")[0]
+                                    : message.subject.split("Banner ")[1]}
+                            </h2>
+                        </div>
+                        <div className="govuk-body-s">
+                            {(
+                                message.description.match(
+                                    new RegExp(">>>", "g")
+                                ) || []
+                            ).length > 0
+                                ? router.locale == "cy"
+                                    ? message.description.split(">>>")[1]
+                                    : message.description.split(">>>")[0]
+                                : (
+                                      message.description.match(
+                                          new RegExp(";", "g")
+                                      ) || []
+                                  ).length > 0
+                                ? router.locale == "cy"
+                                    ? message.description.split(";")[1]
+                                    : message.description.split(";")[0]
+                                : message.description}
+                        </div>
+                        <div className="govuk-body-xs govuk-!-margin-bottom-0 ">
+                            {t("case:date-raised")}:{" "}
+                            {formatDates(message.createdon)}
+                        </div>
+                    </div>
+                </div>
+            ))}
+        </>
+    );
+}
@@ -1,32 +1,27 @@
+import { JSONPath as jsonpath } from "jsonpath-plus";
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
-import { useState, useEffect, useRef, useCallback } from "react";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { connect } from "react-redux";
 import transLookup from "../../data/lookuptranslations.json";
+import { formatDates } from "../utils";
 import PaginationControl from "./pagination";
-import LoadingOverlay from "react-loading-overlay";
-import CryptoJS from "crypto-js";
+import { sendGAEvent } from "@next/third-parties/google";

-import { setCurrentPage } from "../../store/currentView/action";
 import {
-    getBasicSearch,
-    getBasicSearchDetails,
    getSearchDocumentDetails,
    getSearchDocumentDetailsPaged,
    getSearchDocumentTypes,
 } from "../../actions";
+import { setCurrentPage } from "../../store/currentView/action";

-import {
-    setSearchResults,
-    setSearchDetails,
-    setDocumentDetails,
-    getSearchResultsObj,
-} from "../../store/searchOutput/action";
+import { setDocumentDetails } from "../../store/searchOutput/action";
+import DocumentLink from "../utils/downloads";
+import { useDownloadQueue } from "../utils/downloadmanager";

 const DocumentDetails = (props) => {
-    let { t } = useTranslation();
+    let { t, lang } = useTranslation();
    const firstRender = useRef(false);
    const {
        incidentid,
@@ -36,16 +31,96 @@ const DocumentDetails = (props) => {
        documentDetailsObj,
        setDocumentDetails,
        setCurrentPage,
+        docsOffline,
+        showFilteredDocs,
    } = props;

    const router = useRouter();
    const { locale } = router;

    var documentDetailsArr = documentDetailsObj || [];
-
+    const { startDownload, getStatus } = useDownloadQueue(3);
    const [selectedOption, setSelectedOption] = useState(10);
    const [documentTypes, setDocumentTypes] = useState([{}]);
    const [selectedDocumentType, setSelectedDocumentType] = useState("all");
+    const [selectAll, setSelectAll] = useState(false);
+
+    const [checkedItems, setCheckedItems] = useState(
+        documentTypes.reduce((acc, item) => {
+            acc[item.pinswg_isharedocumentlocations] = false;
+            return acc;
+        }, {})
+    );
+
+    const handleCheckboxChange = (e) => {
+        const { name, checked } = e.target;
+
+        setCheckedItems((prev) => ({
+            ...prev,
+            [name]: checked,
+        }));
+        setSelectAll(false);
+    };
+
+    const handleSelectAllChange = (e) => {
+        const { checked } = e.target;
+        setSelectAll(checked); // Set the 'Select All' state
+        if (checked) {
+            // If 'Select All' is checked, check all the other checkboxes
+
+            setCheckedItems(
+                documentTypes.reduce((acc, item) => {
+                    acc[item.pinswg_isharedocumentlocations] = true;
+                    return acc;
+                }, {})
+            );
+        } else {
+            clearCheckboxes();
+        }
+    };
+
+    const clearCheckboxes = () => {
+        setSelectAll(false);
+        setCheckedItems(
+            documentTypes.reduce((acc, item) => {
+                acc[item.pinswg_isharedocumentlocations] = false;
+                return acc;
+            }, {}),
+            setSelectedDocumentType("all"),
+            setCurrentPage(1)
+        );
+    };
+    let ShowDocLinks = false;
+    let checkShowDocLinks = docsOffline != false ? true : false;
+
+    const getDocLink = (docsOffline) => {
+        var startTime = docsOffline.split(",")[0];
+        var endTime = docsOffline.split(",")[1];
+
+        // console.log(startTime);
+        // console.log(endTime);
+
+        var currentDate = new Date();
+
+        var startDate = new Date(currentDate.getTime());
+        startDate.setHours(startTime.split(":")[0]);
+        startDate.setMinutes(startTime.split(":")[1]);
+        startDate.setSeconds(startTime.split(":")[2]);
+
+        var endDate = new Date(currentDate.getTime());
+        endDate.setHours(endTime.split(":")[0]);
+        endDate.setMinutes(endTime.split(":")[1]);
+        endDate.setSeconds(endTime.split(":")[2]);
+
+        // console.log(startDate);
+        // console.log(endDate);
+        // console.log(currentDate);
+
+        var valid = startDate < currentDate && endDate > currentDate;
+        ShowDocLinks = valid;
+    };
+
+    checkShowDocLinks && getDocLink(docsOffline);

    const DocumentView = (documentDetailsArr) => {
        documentDetailsArr = documentDetailsArr.value;
@@ -67,7 +142,10 @@ const DocumentDetails = (props) => {
                        className="govuk-grid-row govuk-!-margin-left-0"
                    >
                        <div className="govuk-form-group">
-                            <label className="govuk-label-s " htmlFor="sort">
+                            <label
+                                className="govuk-label-s "
+                                htmlFor="showDocumentType"
+                            >
                                {t("case:documents-show-label")}
                                <select
                                    onChange={(e) => {
@@ -79,12 +157,13 @@ const DocumentDetails = (props) => {
                                    id="showDocumentType"
                                    name="showDocumentType"
                                >
-                                    <option value="all">
+                                    <option value="all" key="00">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="All")].value_cy'
-                                              )
+                                            ? jsonpath({
+                                                  path: '$..[?(@ && @.value=="All")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : "All"}
                                    </option>
                                    {documentTypes.map((item, key) => {
@@ -96,12 +175,14 @@ const DocumentDetails = (props) => {
                                                }
                                            >
                                                {router.locale == "cy"
-                                                    ? jsonpath.query(
-                                                          transLookup,
-                                                          '$..[?(@.value=="' +
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
                                                              item.pinswg_isharedocumentlocationsLabel +
-                                                              '")].value_cy'
-                                                      )
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                    : item.pinswg_isharedocumentlocationsLabel ||
                                                      t(
                                                          "case:summary-no-date-entered-label"
@@ -122,7 +203,7 @@ const DocumentDetails = (props) => {
                            <div className="govuk-form-group">
                                <label
                                    className="govuk-label-s "
-                                    htmlFor="sort"
+                                    htmlFor="showNumberOfRecords"
                                >
                                    {t(
                                        "search:searchresults-show-records-label-a"
@@ -151,6 +232,23 @@ const DocumentDetails = (props) => {
                        </div>
                    )}
                </div>
+                {ShowDocLinks && (
+                    <div className="govuk-warning-text ">
+                        <span
+                            className="govuk-warning-text__icon"
+                            aria-hidden="true"
+                        >
+                            !
+                        </span>
+                        <strong className="govuk-warning-text__text govuk-!-margin-top-2">
+                            <span className="govuk-visually-hidden">
+                                Notice
+                            </span>
+
+                            {t("case:documents-not-available-label")}
+                        </strong>
+                    </div>
+                )}
                <dl className="documentList govuk-summary-list govuk-!-margin-bottom-9 results">
                    <div className="govuk-summary-list__row results-headings">
                        <dd className="govuk-summary-list__key govuk-!-font-size-16 ">
@@ -204,8 +302,8 @@ const DocumentDetails = (props) => {
                            </button>
                        </dd>
                        {/* <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                        {t("case:documents-size-label")}
-                    </dd> */}
+                    {t("case:documents-size-label")}
+                </dd> */}
                    </div>
                    {showSpinnerState == true ? (
                        <div className="govuk-summary-list__row">
@@ -224,12 +322,14 @@ const DocumentDetails = (props) => {
                        </div>
                    ) : (
                        documentDetailsArr.map((item, key) => {
-                            let detailsObj = jsonpath.query(
-                                item,
-                                "$..[?(@._pinswg_documentids_value=='" +
+                            let detailsObj = jsonpath({
+                                path:
+                                    "$..[?(@ && @._pinswg_documentids_value=='" +
                                    incidentid +
-                                    "')]"
-                            );
+                                    "')]",
+                                json: item,
+                                sanbox: {},
+                            });
                            detailsObj = item;
                            return (
                                <div
@@ -240,26 +340,37 @@ const DocumentDetails = (props) => {
                                        {showDownloadingState === key && (
                                            <div className="coverLoadingLink downloading">
                                                {/* <img
-                                                                className="data-loading-icon"
-                                                                src="/assets/images/loading.gif"
-                                                                alt={
-                                                                    router.locale ==
-                                                                    "cy"
-                                                                        ? "Nôl data"
-                                                                        : "Fetching data"
-                                                                }
-                                                            /> */}
+                                                            className="data-loading-icon"
+                                                            src="/assets/images/loading.gif"
+                                                            alt={
+                                                                router.locale ==
+                                                                "cy"
+                                                                    ? "Nôl data"
+                                                                    : "Fetching data"
+                                                            }
+                                                        /> */}
                                            </div>
                                        )}

-                                        <Link
-                                            scroll={false}
-                                            href={detailsObj.pinswg_hashlink}
-                                        >
-                                            <a
+                                        {!ShowDocLinks ? (
+                                            <Link
+                                                scroll={false}
+                                                href={
+                                                    detailsObj.pinswg_hashlink
+                                                }
                                                key={key}
                                                onClick={() => {
-                                                    toggleDownLoadLink(key);
+                                                    toggleDownLoadLink(key),
+                                                        sendGAEvent(
+                                                            "event",
+                                                            "DownloadedFile",
+                                                            {
+                                                                caseReference:
+                                                                    props.caseReference,
+                                                                filename:
+                                                                    detailsObj.pinswg_name,
+                                                            }
+                                                        );
                                                }}
                                            >
                                                <span className="results-visually-hidden">
@@ -274,8 +385,23 @@ const DocumentDetails = (props) => {
                                                )
                                                    ? detailsObj.pinswg_name
                                                    : ""}
-                                            </a>
-                                        </Link>
+                                            </Link>
+                                        ) : (
+                                            <>
+                                                <span className="results-visually-hidden">
+                                                    {t(
+                                                        "case:documents-name-label"
+                                                    )}
+                                                    :
+                                                </span>
+                                                {_.has(
+                                                    detailsObj,
+                                                    "pinswg_name"
+                                                )
+                                                    ? detailsObj.pinswg_name
+                                                    : ""}
+                                            </>
+                                        )}
                                    </dd>
                                    <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                        <span className="results-visually-hidden">
@@ -284,14 +410,16 @@ const DocumentDetails = (props) => {
                                        </span>

                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -317,11 +445,11 @@ const DocumentDetails = (props) => {
                                            : ""}
                                    </dd>
                                    {/* <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                                        <span className="results-visually-hidden">
-                                            {t("case:documents-size-label")}:
-                                        </span>
-                                        92
-                                    </dd> */}
+                                    <span className="results-visually-hidden">
+                                        {t("case:documents-size-label")}:
+                                    </span>
+                                    92
+                                </dd> */}
                                </div>
                            );
                        })
@@ -340,48 +468,446 @@ const DocumentDetails = (props) => {
        );
    };

-    useEffect(() => {
-        getDocumentTypes();
-        if (selectedOption) {
-            setShowSpinnerState(true);
-            getDocumentResults(1, orderByState, fieldSortState);
-        }
+    const FilteredDocumentView = (documentDetailsArr) => {
+        documentDetailsArr = documentDetailsArr.value;

-        if (selectedDocumentType) {
-            setShowSpinnerState(true);
-            getDocumentResults(
-                1,
-                orderByState,
-                fieldSortState,
-                selectedDocumentType
-            );
-        }
+        return (
+            <>
+                {ShowDocLinks && (
+                    <div className="govuk-warning-text ">
+                        <span
+                            className="govuk-warning-text__icon"
+                            aria-hidden="true"
+                        >
+                            !
+                        </span>
+                        <strong className="govuk-warning-text__text govuk-!-margin-top-2">
+                            <span className="govuk-visually-hidden">
+                                Notice
+                            </span>

-        const docDetailsObj = async () => {
-            let docObj = await getSearchDocumentDetails(incidentid).then(
-                (data) => {
-                    //console.log(data);
-                    setDocumentDetails(data);
-                    setDocumentSearchState(true);
+                            {t("case:documents-not-available-label")}
+                        </strong>
+                    </div>
+                )}

-                    return data;
-                }
-            );
+                <div className="docFilteringGroup">
+                    <div className="govuk-!-width-one-third">
+                        {" "}
+                        <div className="govuk-form-group filterByGroup">
+                            <p>
+                                {documentDetailsObj["@odata.count"] > 1
+                                    ? t("case:documents-count-label-1")
+                                    : t("case:documents-count-label-1a")}{" "}
+                                {documentDetailsObj["@odata.count"]}{" "}
+                                {documentDetailsObj["@odata.count"] > 1
+                                    ? t("case:documents-count-label-2")
+                                    : t("case:documents-count-label-2a")}
+                            </p>
+                            <div>
+                                <button onClick={clearCheckboxes}>
+                                    {t("search:clear-filter-button-label")}
+                                </button>
+                            </div>
+                            <div className="govuk-checkboxes govuk-checkboxes--small">
+                                {" "}
+                                <>
+                                    <div className="govuk-checkboxes__item">
+                                        <input
+                                            className="govuk-checkboxes__input"
+                                            type="checkbox"
+                                            id={"all_" + "_" + 0}
+                                            key={0}
+                                            name={"all_" + "_" + 0}
+                                            checked={selectAll}
+                                            value={"all"}
+                                            onChange={handleSelectAllChange}
+                                        />
+                                        <label
+                                            className="govuk-label-s govuk-checkboxes__label"
+                                            htmlFor={"all" + "__" + 0}
+                                        >
+                                            {router.locale == "cy"
+                                                ? "Pawb"
+                                                : "All"}{" "}
+                                            - (
+                                            {documentTypes.reduce(
+                                                (accumulator, currentItem) => {
+                                                    return (
+                                                        accumulator +
+                                                        currentItem.count
+                                                    );
+                                                },
+                                                0
+                                            )}
+                                            )
+                                        </label>
+                                    </div>
+                                </>
+                                {documentTypes.map((item, key) => {
+                                    return (
+                                        <div
+                                            className="govuk-checkboxes__item"
+                                            key={key}
+                                        >
+                                            <input
+                                                className="govuk-checkboxes__input"
+                                                type="checkbox"
+                                                id={
+                                                    item.pinswg_isharedocumentlocations
+                                                }
+                                                key={key}
+                                                value={
+                                                    item.pinswg_isharedocumentlocations
+                                                }
+                                                name={
+                                                    item.pinswg_isharedocumentlocations
+                                                }
+                                                checked={
+                                                    checkedItems[
+                                                        item
+                                                            .pinswg_isharedocumentlocations
+                                                    ]
+                                                }
+                                                onChange={handleCheckboxChange}
+                                            />
+                                            <label
+                                                className="govuk-label-s govuk-checkboxes__label"
+                                                htmlFor={
+                                                    item.pinswg_isharedocumentlocations
+                                                }
+                                            >
+                                                {router.locale == "cy"
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
+                                                              item.pinswg_isharedocumentlocationsLabel +
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
+                                                    : item.pinswg_isharedocumentlocationsLabel ||
+                                                      t(
+                                                          "case:summary-no-date-entered-label"
+                                                      )}{" "}
+                                                - ({item.count})
+                                            </label>
+                                        </div>
+                                    );
+                                })}
+                            </div>{" "}
+                            <div>
+                                <button
+                                    className="govuk-button  "
+                                    type="button"
+                                    onClick={(e) => {
+                                        const data = [
+                                            ...document.querySelectorAll(
+                                                ".govuk-checkboxes__input:checked"
+                                            ),
+                                        ].map((e) => e.value);
+                                        setSelectedDocumentType(data);
+                                        setCurrentPage(1);
+                                    }}
+                                >
+                                    {t("search:filter-documents-label")}
+                                </button>
+                            </div>
+                            {documentDetailsObj["@odata.count"] > 5 && (
+                                <div
+                                    id="recordCountSelect"
+                                    className="govuk-grid-row govuk-!-margin-left-0"
+                                >
+                                    <div className="govuk-form-group">
+                                        <label
+                                            className="govuk-label-s "
+                                            htmlFor="showNumberOfRecords"
+                                        >
+                                            {t(
+                                                "search:searchresults-show-records-label-a"
+                                            )}
+                                            <select
+                                                onChange={(e) => {
+                                                    setSelectedOption(
+                                                        e.target.value
+                                                    );
+                                                    setCurrentPage(1);
+                                                }}
+                                                value={selectedOption}
+                                                className="govuk-select"
+                                                id="showNumberOfRecords"
+                                                name="showNumberOfRecords"
+                                            >
+                                                <option value="5">5</option>
+                                                <option value="10">10</option>
+                                                <option value="20">20</option>
+                                                <option value="30">30</option>
+                                                <option value="50">50</option>
+                                            </select>{" "}
+                                            {t(
+                                                "search:searchresults-show-records-label-b"
+                                            )}
+                                        </label>
+                                    </div>
+                                </div>
+                            )}
+                        </div>
+                    </div>
+                    <div className="govuk-!-width-two-thirds docResults">
+                        {" "}
+                        <dl className=" govuk-summary-list govuk-!-margin-bottom-9 results documentList">
+                            <div className="govuk-summary-list__row results-headings">
+                                <dd className="govuk-summary-list__key govuk-!-font-size-16 ">
+                                    <button
+                                        type="button"
+                                        onClick={() =>
+                                            sortDataBy("pinswg_name")
+                                        }
+                                        className={
+                                            orderByState == "pinswg_name"
+                                                ? fieldSortState == "asc"
+                                                    ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                                    : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                                : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                        }
+                                    >
+                                        {t("case:documents-name-label")}
+                                    </button>
+                                </dd>
+                                <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                                    {/* {t("case:documents-doc-type-label")} */}
+                                    <button
+                                        type="button"
+                                        onClick={() =>
+                                            sortDataBy(
+                                                "pinswg_isharedocumentlocations"
+                                            )
+                                        }
+                                        className={
+                                            orderByState ==
+                                            "pinswg_isharedocumentlocations"
+                                                ? fieldSortState == "asc"
+                                                    ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                                    : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                                : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                        }
+                                    >
+                                        {t("case:documents-doc-type-label")}
+                                    </button>
+                                </dd>
+                                <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                                    {/* {t("case:documents-date-published-label")} */}
+                                    <button
+                                        type="button"
+                                        onClick={() => sortDataBy("createdon")}
+                                        className={
+                                            orderByState == "createdon"
+                                                ? fieldSortState == "asc"
+                                                    ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                                    : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                                : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                        }
+                                    >
+                                        {t(
+                                            "case:documents-date-published-label"
+                                        )}
+                                    </button>
+                                </dd>
+                                {/* <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                    {t("case:documents-size-label")}
+                </dd> */}
+                            </div>
+                            {showSpinnerState == true ? (
+                                <div className="govuk-summary-list__row">
+                                    <div className="govuk-!-margin-top-4 govuk-!-margin-bottom-4 govuk-!-font-weight-bold govuk-!-font-size-20  ">
+                                        {t("common:spinner-fetching-data")}
+                                        <img
+                                            className="data-loading-icon"
+                                            src="/assets/images/loading.gif"
+                                            alt={
+                                                router.locale == "cy"
+                                                    ? "Nôl data"
+                                                    : "Fetching data"
+                                            }
+                                        />
+                                    </div>
+                                </div>
+                            ) : (
+                                documentDetailsArr.map((item, key) => {
+                                    let detailsObj = jsonpath({
+                                        path:
+                                            "$..[?(@ && @._pinswg_documentids_value=='" +
+                                            incidentid +
+                                            "')]",
+                                        json: item,
+                                        eval: true,
+                                    });
+                                    detailsObj = item;
+                                    return (
+                                        <div
+                                            className="govuk-summary-list__row"
+                                            key={key}
+                                        >
+                                            <dd className="govuk-summary-list__value govuk-!-font-size-16 ">
+                                                {showDownloadingState ===
+                                                    key && (
+                                                    <div className="coverLoadingLink downloading">
+                                                        {/* <img
+                                                            className="data-loading-icon"
+                                                            src="/assets/images/loading.gif"
+                                                            alt={
+                                                                router.locale ==
+                                                                "cy"
+                                                                    ? "Nôl data"
+                                                                    : "Fetching data"
+                                                            }
+                                                        /> */}
+                                                    </div>
+                                                )}

-            return docObj;
-        };
+                                                {!ShowDocLinks ? (
+                                                    <>
+                                                        <DocumentLink
+                                                            key={
+                                                                detailsObj.pinswg_documentid
+                                                            }
+                                                            id={
+                                                                detailsObj.pinswg_documentid
+                                                            }
+                                                            detailsObj={
+                                                                detailsObj
+                                                            }
+                                                            caseReference={
+                                                                caseReference
+                                                            }
+                                                            startDownload={
+                                                                startDownload
+                                                            }
+                                                            getStatus={
+                                                                getStatus
+                                                            }
+                                                        />
+                                                        {/* <Link
+                                                            scroll={false}
+                                                            href={
+                                                                detailsObj.pinswg_hashlink
+                                                            }
+                                                            key={key}
+                                                            onClick={() => {
+                                                                toggleDownLoadLink(
+                                                                    key
+                                                                ),
+                                                                    sendGAEvent(
+                                                                        "event",
+                                                                        "DownloadedFile",
+                                                                        {
+                                                                            caseReference:
+                                                                                props.caseReference,
+                                                                            filename:
+                                                                                detailsObj.pinswg_name,
+                                                                        }
+                                                                    );
+                                                            }}
+                                                        >
+                                                            <span className="results-visually-hidden">
+                                                                {t(
+                                                                    "case:documents-name-label"
+                                                                )}
+                                                                :
+                                                            </span>
+                                                            {_.has(
+                                                                detailsObj,
+                                                                "pinswg_name"
+                                                            )
+                                                                ? detailsObj.pinswg_name
+                                                                : ""}
+                                                        </Link> */}
+                                                    </>
+                                                ) : (
+                                                    <>
+                                                        <span className="results-visually-hidden">
+                                                            {t(
+                                                                "case:documents-name-label"
+                                                            )}
+                                                            :
+                                                        </span>
+                                                        {_.has(
+                                                            detailsObj,
+                                                            "pinswg_name"
+                                                        )
+                                                            ? detailsObj.pinswg_name
+                                                            : ""}
+                                                    </>
+                                                )}
+                                            </dd>
+                                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                                <span className="results-visually-hidden">
+                                                    {t(
+                                                        "case:documents-doc-type-label"
+                                                    )}
+                                                    :
+                                                </span>

-        const searchDocumentResultsObj = docDetailsObj();
-    }, [
-        incidentid,
-        setDocumentDetails,
-        selectedOption,
-        selectedDocumentType,
-        fieldSortState,
-        orderByState,
-        getDocumentTypes,
-        getDocumentResults,
-    ]);
+                                                {router.locale == "cy"
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
+                                                              detailsObj[
+                                                                  "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
+                                                              ] +
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
+                                                    : detailsObj[
+                                                          "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
+                                                      ] ||
+                                                      t(
+                                                          "case:summary-no-date-entered-label"
+                                                      )}
+                                            </dd>
+                                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                                <span className="results-visually-hidden">
+                                                    {t(
+                                                        "case:documents-date-published-label"
+                                                    )}
+                                                    :
+                                                </span>
+
+                                                {_.has(
+                                                    detailsObj,
+                                                    "pinswg_latestpublisheddate"
+                                                )
+                                                    ? formatDates(
+                                                          detailsObj.pinswg_latestpublisheddate
+                                                      )
+                                                    : ""}
+                                            </dd>
+                                            {/* <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                    <span className="results-visually-hidden">
+                                        {t("case:documents-size-label")}:
+                                    </span>
+                                    92
+                                </dd> */}
+                                        </div>
+                                    );
+                                })
+                            )}
+                        </dl>
+                        <PaginationControl
+                            showNoOfRecords={selectedOption}
+                            currentPage={currentPage}
+                            searchResultsObj={documentDetailsObj}
+                            spinnerState={spinnerState}
+                            orderBy={orderByState}
+                            fieldSort={fieldSortState}
+                            getDocumentResults={getDocumentResults}
+                        />
+                    </div>
+                </div>
+            </>
+        );
+    };

    const getDocumentTypes = useCallback(() => {
        getSearchDocumentTypes(props.incidentid).then((data) => {
@@ -401,7 +927,6 @@ const DocumentDetails = (props) => {
            )
                .then((data) => data)
                .then((data) => {
-                    //console.log("getting details", data);
                    setDocumentDetails(data);
                    setShowSpinnerState(false);
                });
@@ -421,7 +946,6 @@ const DocumentDetails = (props) => {
            orderBy,
            fieldSort
        ).then((data) => {
-            //console.log(data);
            setDocumentDetails(data);
            return data;
        });
@@ -429,15 +953,6 @@ const DocumentDetails = (props) => {
        return docObj;
    };

-    function formatDates(dateObj) {
-        var dateObj = new Date(dateObj);
-        var dd = String(dateObj.getDate()).padStart(2, "0");
-        var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
-        var yyyy = dateObj.getFullYear();
-
-        return dd + "/" + mm + "/" + yyyy;
-    }
-
    const pagesCount = Math.ceil(documentDetailsObj["@odata.count"] / 10);

    let currentPage = 0;
@@ -504,36 +1019,71 @@ const DocumentDetails = (props) => {
        setShowSpinnerState(true);
    };

+    useEffect(() => {
+        getDocumentTypes();
+        if (selectedOption) {
+            setShowSpinnerState(true);
+            getDocumentResults(1, orderByState, fieldSortState);
+        }
+
+        if (selectedDocumentType) {
+            setShowSpinnerState(true);
+            getDocumentResults(
+                1,
+                orderByState,
+                fieldSortState,
+                selectedDocumentType
+            );
+        }
+
+        const docDetailsObj = async () => {
+            let docObj = await getSearchDocumentDetails(incidentid).then(
+                (data) => {
+                    setDocumentDetails(data);
+                    setDocumentSearchState(true);
+
+                    return data;
+                }
+            );
+
+            return docObj;
+        };
+
+        const searchDocumentResultsObj = docDetailsObj();
+    }, [
+        incidentid,
+        setDocumentDetails,
+        selectedOption,
+        selectedDocumentType,
+        fieldSortState,
+        orderByState,
+        getDocumentTypes,
+        getDocumentResults,
+        lang,
+    ]);
    return (
-        <>
-            <div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-grid-column-full">
-                        <h2>{t("case:documents-heading-label")}</h2>
-                        {_.isEmpty(documentDetailsObj.value) ? (
-                            <div className="govuk-grid-row">
-                                <div className="govuk-grid-column-two-thirds">
-                                    <h3>
-                                        {showDocumentSearchState == false
-                                            ? t("case:documents-checking-label")
-                                            : t(
-                                                  "case:documents-non-available-label"
-                                              )}
-                                    </h3>
-                                </div>
-                            </div>
-                        ) : (
-                            DocumentView(documentDetailsArr)
-                        )}
+        <div className="govuk-grid-row">
+            <div className="govuk-grid-column-full">
+                <h2 className="govuk-heading-m ">
+                    {t("case:documents-heading-label")}
+                </h2>
+                {_.isEmpty(documentDetailsObj.value) ? (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-column-two-thirds">
+                            <h3>
+                                {showDocumentSearchState == false
+                                    ? t("case:documents-checking-label")
+                                    : t("case:documents-non-available-label")}
+                            </h3>
+                        </div>
                    </div>
-                </div>
+                ) : showFilteredDocs == "true" ? (
+                    FilteredDocumentView(documentDetailsArr)
+                ) : (
+                    DocumentView(documentDetailsArr)
+                )}
            </div>
-            {/* <LoadingOverlay
-                active={showSpinnerState}
-                spinner
-                text={t("common:spinner-searching")}
-            /> */}
-        </>
+        </div>
    );
 };

@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { useState } from "react";
+import { useRouter } from "next/router";
 import { connect } from "react-redux";
 import { setCurrentPage } from "../../store/currentView/action";

@@ -27,14 +25,12 @@ const PaginationControl = (props) => {
    );

    const getRange = (start, end) => {
-        //console.log(start, end);
        return Array(end - start + 1)
            .fill()
            .map((v, i) => i + start);
    };

    const paginationNumbers = (currentPage, pageCount) => {
-        //console.log(currentPage);
        let delta;

        if (pageCount <= 7) {
@@ -76,7 +72,6 @@ const PaginationControl = (props) => {
            pages = pages.concat(withDots(pageCount, ["...", pageCount]));
        }

-        //console.log(pages);
        return pages;
    };

@@ -1,212 +0,0 @@
-import Link from "next/link";
-import { useState, useEffect } from "react";
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
-import _ from "lodash";
-import { Field, FieldArray, reduxForm, formValueSelector } from "redux-form";
-import { connect } from "react-redux";
-import { useDropzone } from "react-dropzone";
-
-import { setRepresentationCapacity } from "../../../store/currentView/action";
-import RepCapacitySelection from "./representationCapacitySelection";
-import RepDetails from "./representationDetails";
-import RepAppellant from "./representationAppellant";
-import RepAgent from "./representationAgent";
-import RepInterestedPartyPerson from "./representationInterestedPartyPerson";
-import RepLandOwner from "./representationLandowner";
-import {
-    RenderPickList,
-    RenderRadioList,
-    RenderTextfield,
-} from "./representationElements";
-
-let MakeRepresentation = (props) => {
-    let { t } = useTranslation();
-    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
-
-    const [clearRepForm, setClearRepForm] = useState(false);
-
-    const router = useRouter();
-    const { locale } = router;
-    const {
-        caseReference,
-        myCases,
-        myRepresentations,
-        watchedCases,
-        awaitingSubmission,
-        searchResultsObj,
-        currentType,
-        currentView,
-        setRepresentationCapacity,
-    } = props;
-    const formObj = props.props.form;
-    let setCaseQueryObj = props[currentType];
-    var casesObj = {};
-
-    currentType == "searchResultsObj"
-        ? (casesObj = jsonpath.query(
-              setCaseQueryObj,
-              '$..[?(@.title=="' + caseReference + '")]'
-          ))
-        : (casesObj = jsonpath.query(
-              setCaseQueryObj,
-              '$..[?(@.reference=="' + caseReference + '")]'
-          ));
-
-    casesObj = Object.assign({}, ...casesObj);
-
-    const capacityOptionsArr = [
-        "Appellant",
-        "Agent",
-        "Interested Party/Person",
-        "Land Owner",
-    ];
-
-    const appellantApplicantRepresentationArr = [
-        "Other",
-        "Statement",
-        "Statement of common ground",
-        "Written statement of evidence",
-    ];
-
-    const interestedPersonRepresentationArr = [
-        "Interested Party/Person correspondence",
-    ];
-
-    const landOwnerRepresentationArr = [
-        "Other",
-        "Statement",
-        "Written statement of evidence",
-    ];
-
-    const repCapacityType = () => {
-        currentView.representationCapacity == false
-            ? false
-            : _.isEmpty(formObj["representationForm"])
-            ? false
-            : _.isEmpty(formObj["representationForm"].values)
-            ? false
-            : _.isEmpty(
-                  formObj["representationForm"].values.representationCapacity
-              )
-            ? setRepresentationCapacity(false)
-            : setRepresentationCapacity(
-                  formObj["representationForm"].values.representationCapacity
-                      .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
-                      .toLowerCase()
-              );
-
-        return currentView.representationCapacity;
-    };
-
-    const whichControl = () => {
-        repCapacityType();
-        switch (currentView.representationCapacity) {
-            case false:
-                return (
-                    <RepCapacitySelection
-                        formObj={formObj}
-                        capacityOptionsArr={capacityOptionsArr}
-                        currentType={currentType}
-                        casesObj={casesObj}
-                        setRepresentationCapacity={setRepresentationCapacity}
-                    />
-                );
-                break;
-            case "appellant":
-                setRepresentationCapacity("appellant");
-                return (
-                    <RepAppellant
-                        formObj={formObj}
-                        appellantApplicantRepresentationArr={
-                            appellantApplicantRepresentationArr
-                        }
-                        setRepresentationCapacity={setRepresentationCapacity}
-                    />
-                );
-                break;
-            case "agent":
-                setRepresentationCapacity("agent");
-                return (
-                    <RepAgent
-                        formObj={formObj}
-                        appellantApplicantRepresentationArr={
-                            appellantApplicantRepresentationArr
-                        }
-                        setRepresentationCapacity={setRepresentationCapacity}
-                    />
-                );
-                break;
-            case "interestedpartyperson":
-                setRepresentationCapacity("interestedpartyperson");
-                return (
-                    <RepInterestedPartyPerson
-                        formObj={formObj}
-                        interestedPersonRepresentationArr={
-                            interestedPersonRepresentationArr
-                        }
-                        setRepresentationCapacity={setRepresentationCapacity}
-                    />
-                );
-                break;
-            case "landowner":
-                setRepresentationCapacity("landowner");
-                return (
-                    <RepLandOwner
-                        formObj={formObj}
-                        landOwnerRepresentationArr={landOwnerRepresentationArr}
-                        setRepresentationCapacity={setRepresentationCapacity}
-                    />
-                );
-                break;
-            default:
-                return (
-                    <RepCapacitySelection
-                        formObj={formObj}
-                        capacityOptionsArr={capacityOptionsArr}
-                        currentType={currentType}
-                        casesObj={casesObj}
-                        setRepresentationCapacity={setRepresentationCapacity}
-                    />
-                );
-        }
-    };
-
-    return (
-        <div>
-            {whichControl()} - {props.firstValue}
-        </div>
-    );
-};
-
-const mapStateToProps = (state) => {
-    return {
-        search: state.search,
-        searchResultsObj: state.searchResultsObj,
-        formData: state.formData,
-        appealType: state.appealType,
-        currentView: state.currentView,
-        //form: state.form,
-    };
-};
-
-const mapDispatchToProps = (dispatch) => {
-    return {
-        setRepresentationCapacity: (representationCapacity) => {
-            dispatch(setRepresentationCapacity(representationCapacity));
-        },
-    };
-};
-
-const selector = formValueSelector("representationForm");
-
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(
-    reduxForm({
-        form: "representationForm",
-        destroyOnUnmount: false,
-    })(MakeRepresentation)
-);
@@ -1,18 +1,23 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { Field, change, reduxForm } from "redux-form";
+import { useState } from "react";
+
+import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
 import {
+    FileUploadField,
+    RenderCondtionalRadioList,
    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
+    RenderRichMultiline,
 } from "./representationElements";
+
+import { useDropzone } from "react-dropzone";
 import {
    setRepresentationCapacity,
    setRepresentationSubmit,
+    setFilesForRepresentations,
 } from "../../../store/currentView/action";
-import { useDropzone } from "react-dropzone";

 const RepAgent = (props) => {
    let { t } = useTranslation();
@@ -25,109 +30,139 @@ const RepAgent = (props) => {
        setRepresentationCapacity,
        setRepresentationSubmit,
        currentView,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
    } = props;
    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
-    const files = acceptedFiles.map((file) => (
-        <li key={file.path}>
-            {file.path} - {file.size} bytes
-        </li>
-    ));

-    return (
-        <div id="rep-appellant">
-            <div className="govuk-grid-column-full">
-                <div className="govuk-grid-row">
-                    <h2 className="govuk-heading-m ">Representation - agent</h2>
+    if (JSON.stringify(formObj) != "{}") {
+        setRepFileName(formObj.representationForm.values);

-                    <div className="govuk-form-group">
-                        <label
-                            className="govuk-label govuk-body-m"
-                            htmlFor="representationType"
-                        >
-                            What kind of representation are you making?
-                        </label>
-                        <Field
-                            name="representationType"
-                            component={RenderPickList}
-                            datafieldname="representationType"
-                            optionsArr={appellantApplicantRepresentationArr}
-                        />
-                    </div>
-                </div>
+        let filterFilesList = props.currentView.caseReference.hasOwnProperty(
+            "repDetails"
+        )
+            ? props.currentView.caseReference.repDetails.hasOwnProperty(
+                  "filesList"
+              )
+                ? props.currentView.caseReference.repDetails.filesList.filter(
+                      function (el) {
+                          return el != null;
+                      }
+                  )
+                : []
+            : [];
+
+        const files = acceptedFiles.map((file) => (
+            <li key={file.path}>
+                {file.path} - {file.size} bytes
+            </li>
+        ));
+        const required = (value) => (value ? undefined : "Required");
+
+        return (
+            <>
                <div className="govuk-grid-row">
                    <div className="govuk-form-group">
-                        <Field
-                            className="govuk-input govuk-!-width-three-quarters"
-                            id="representationDescription"
-                            name="representationDescription"
-                            value="email"
-                            data-aria-controls="representationDescription"
-                            type="text"
-                            component={RenderTextfield}
-                            label="Description of representation"
-                        />
-                    </div>
-                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-form-group">
-                        <p className="govuk-body">
-                            You can enter your comments in the space provided or
-                            attach a separate document.
-                        </p>
-                        <fieldset
-                            className="govuk-fieldset"
-                            aria-describedby="commentBox-hint"
-                        >
-                            <div id="commentBox-hint" className="govuk-hint">
-                                My comments are set out in:*
-                            </div>
-                            <div
-                                className="govuk-checkboxes"
-                                data-module="govuk-checkboxes"
-                            >
-                                <div className="govuk-checkboxes__item">
-                                    <Field
-                                        className="govuk-checkboxes__input"
-                                        id="commentBox"
-                                        name="commentBox"
-                                        value="email"
-                                        data-aria-controls="commentBox"
-                                        type="checkbox"
-                                        component={RenderTextfield}
-                                    />
-                                    <label
-                                        className="govuk-label govuk-checkboxes__label"
-                                        htmlFor="commentBox"
-                                    >
-                                        the box below{" "}
-                                    </label>
-                                </div>
-                                <div
-                                    className={
-                                        _.isEmpty(formObj["representationForm"])
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values
-                                              )
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden q11 "
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values.commentBox
-                                              )
-                                            ? formObj["representationForm"]
-                                                  .values.commentBox == false
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : "govuk-checkboxes__conditional"
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden wwwaqqqq"
-                                    }
-                                    id="conditional-commentBox"
+                        {typeof formObj.representationForm.values
+                            .representationType == "undefined" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <h2 className="govuk-heading-m ">
+                                    {t(
+                                        "myrepresentations:representation-from-an-agent-heading"
+                                    )}
+                                </h2>
+
+                                <label
+                                    className="govuk-label govuk-body-m"
+                                    htmlFor="representationType"
                                >
+                                    {t("myrepresentations:kind-of-rep-label")}
+                                </label>
+
+                                <Field
+                                    name="representationType"
+                                    component={RenderPickList}
+                                    datafieldname="representationType"
+                                    optionsArr={
+                                        appellantApplicantRepresentationArr
+                                    }
+                                />
+                            </>
+                        ) : (
+                            <label className="govuk-label govuk-body-m">
+                                {t("myrepresentations:representation-type")}:{" "}
+                                {router.locale == "cy"
+                                    ? formObj.representationForm.values
+                                          .representationType == "Questionnaire"
+                                        ? "Holiadur"
+                                        : formObj.representationForm.values
+                                              .representationType == "Statement"
+                                        ? "Datganiad"
+                                        : formObj.representationForm.values
+                                              .representationType ==
+                                          "Final comments"
+                                        ? "Sylwadau terfynol"
+                                        : formObj.representationForm.values
+                                              .representationType
+                                    : formObj.representationForm.values
+                                          .representationType}
+                            </label>
+                        )}
+                    </div>
+                </div>
+                {(typeof props.representationType != "undefined" ||
+                    typeof formObj.representationForm.values
+                        .representationType != "undefined") && (
+                    <>
+                        <div className="govuk-grid-row">
+                            <div className="govuk-form-group">
+                                <Field
+                                    name="representationOnBehalfOf"
+                                    datafieldname="representationOnBehalfOf"
+                                    // label={t("myrepresentations:capacity-select-what-capacity-label")}
+                                    options={["Yes", "No"]}
+                                    id="representationOnBehalfOf"
+                                    className="govuk-radios__input"
+                                    errorMsg={t(
+                                        "myrepresentations:select-an-option-label"
+                                    )}
+                                    component={RenderCondtionalRadioList}
+                                    validate={[required]}
+                                    legend={t("case:representation-onbehalfof")}
+                                    hint={t(
+                                        "myrepresentations:representation-onbehalfof-hint"
+                                    )}
+                                />
+                            </div>
+                        </div>
+
+                        <div className="govuk-grid-row">
+                            <div className="govuk-form-group">
+                                <p className="govuk-body">
+                                    {t("myrepresentations:enter-comment-label")}
+                                </p>
+                                <fieldset
+                                    className="govuk-fieldset"
+                                    aria-describedby="commentBox-hint"
+                                >
+                                    {/* <div
+                                        id="commentBox-hint"
+                                        className="govuk-hint"
+                                    >
+                                        {t(
+                                            "myrepresentations:comments-set-out-label"
+                                        )}
+                                        :
+                                    </div> */}
                                    <div className="govuk-form-group">
                                        <Field
                                            name="representationComments"
                                            id="representationComments"
-                                            component={RenderMultiline}
+                                            component={RenderRichMultiline}
                                            type="text"
                                            rows="5"
                                            className="govuk-textarea govuk-input--width-30"
@@ -135,101 +170,165 @@ const RepAgent = (props) => {
                                                props.name + "-hint"
                                            }
                                        />
-                                    </div>
-                                </div>
-                                <div className="govuk-checkboxes__item">
-                                    <Field
-                                        className="govuk-checkboxes__input"
-                                        id="documentBox"
-                                        name="documentBox"
-                                        value="email"
-                                        data-aria-controls="documentBox"
-                                        type="checkbox"
-                                        component={RenderTextfield}
-                                    />
-                                    <label
-                                        className="govuk-label govuk-checkboxes__label"
-                                        htmlFor="documentBox"
-                                    >
-                                        separate documents
-                                    </label>
-                                </div>
-                                <div
-                                    className={
-                                        _.isEmpty(formObj["representationForm"])
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values
-                                              )
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values.documentBox
-                                              )
-                                            ? formObj["representationForm"]
-                                                  .values.documentBox == false
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : "govuk-checkboxes__conditional"
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
-                                    }
-                                    id="conditional-documentBox"
-                                >
-                                    <div className="govuk-form-group">
-                                        <section className="container">
-                                            <div
-                                                {...getRootProps({
-                                                    className: "dropzone",
-                                                })}
+                                        <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+                                            {t(
+                                                "myrepresentations:publish-policy-label"
+                                            )}{" "}
+                                            <a
+                                                href={t(
+                                                    "myrepresentations:publish-policy-link"
+                                                )}
                                            >
-                                                <input {...getInputProps()} />
-                                                <p>
-                                                    Drag and drop files here or
-                                                    click to select files
-                                                </p>
-                                            </div>
-                                            <aside>
-                                                <h4>Files</h4>
-                                                <ul>{files}</ul>
-                                            </aside>
-                                        </section>
+                                                {t(
+                                                    "myrepresentations:publish-policy-link-label"
+                                                )}
+                                            </a>{" "}
+                                            {t(
+                                                "myrepresentations:publish-policy-label-two"
+                                            )}
+                                        </p>
                                    </div>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </div>{" "}
-                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-button-group">
-                        <button
-                            type="submit"
-                            className="govuk-button"
-                            data-module="govuk-button"
-                        >
-                            Continue
-                        </button>
-                        {/* <a
-                            onClick={() => {
-                                setRepresentationSubmit(false);
-                            }}
-                            className="govuk-button"
-                        >
-                            Continue
-                        </a> */}
+                                    <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                        <FileUploadField
+                                            name={"representationDocuments"}
+                                            id={"representationDocuments"}
+                                            label={t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                            ticketnumber={
+                                                props.currentView.caseReference
+                                                    .ticketnumber
+                                            }
+                                            hint={"sdsd"}
+                                            fileList={
+                                                props.currentView.fileList

-                        <a
-                            onClick={() => {
-                                setRepresentationCapacity();
-                            }}
-                            className="govuk-link"
-                        >
-                            Back
-                        </a>
+                                                // props.currentView.caseReference.hasOwnProperty(
+                                                //     "repDetails"
+                                                // )
+                                                //     ? props.currentView.caseReference.repDetails.hasOwnProperty(
+                                                //           "filesList"
+                                                //       ) &&
+                                                //       props.currentView
+                                                //           .caseReference
+                                                //           .repDetails.filesList
+                                                //           .length > 0
+                                                //         ? props.currentView
+                                                //               .caseReference
+                                                //               .repDetails
+                                                //               .filesList
+                                                //         : []
+                                                //     : []
+                                            }
+                                            setFilesForRepresentations={
+                                                setFilesForRepresentations
+                                            }
+                                            containerID={
+                                                props.props.props.accountDetails
+                                                    .containerID
+                                            }
+                                            filenamePrefix={props.formObj}
+                                            props={props.props.props}
+                                            setCurrentReference={
+                                                props.setCurrentReference
+                                            }
+                                        />
+                                    </div>
+                                </fieldset>
+                            </div>{" "}
+                        </div>
+                    </>
+                )}
+                {typeof formObj.representationForm.values.representationType !=
+                    "undefined" && (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-button-group">
+                            <button
+                                type="submit"
+                                className="govuk-button"
+                                data-module="govuk-button"
+                            >
+                                {t("common:continue-button")}
+                            </button>
+                            {/* {router.query.state != "edit" && (
+                            <a
+                                onClick={() => {
+                                    setRepresentationCapacity();
+                                    props.updateField(
+                                        "representationForm",
+                                        "representationCapacity",
+                                        ""
+                                    );
+                                }}
+                                className="govuk-link"
+                            >
+                                {t("common:back-link")}
+                            </a>
+                        )} */}
+                            {savingStatus ? (
+                                <span className=" progress-save-active">
+                                    {router.locale == "cy"
+                                        ? "Nôl data"
+                                        : "Saving data"}
+                                    <img
+                                        className="data-loading-icon"
+                                        src="/assets/images/loading.gif"
+                                        alt={
+                                            router.locale == "cy"
+                                                ? "Nôl data"
+                                                : "Saving data"
+                                        }
+                                    />
+                                </span>
+                            ) : (
+                                <button
+                                    className="govuk-button progress-save "
+                                    onClick={() => {
+                                        let valuesObj =
+                                            props.props.props.form[props.form]
+                                                .values || {};
+
+                                        //console.log("valuesobj:", valuesObj);
+
+                                        delete valuesObj[
+                                            "_pinswg_appellant_value"
+                                        ];
+
+                                        //console.log("on save:", valuesObj);
+                                        updateRepresentation(
+                                            valuesObj,
+                                            false,
+                                            true
+                                        );
+                                    }}
+                                >
+                                    {t("common:save-exit-button")}
+                                </button>
+                            )}
+                        </div>
                    </div>
-                </div>
-            </div>
-        </div>
-    );
+                )}
+            </>
+        );
+    }
 };

-export default RepAgent;
+const mapDispatchToProps = (dispatch) => ({
+    updateField: (form, field, newValue) =>
+        dispatch(change(form, field, newValue)),
+
+    setFilesForRepresentations: (fileList) => {
+        dispatch(setFilesForRepresentations(fileList));
+    },
+});
+
+export default connect(
+    null,
+    mapDispatchToProps
+)(
+    reduxForm({
+        form: "representationForm",
+        enableReinitialize: true,
+        destroyOnUnmount: false,
+    })(RepAgent)
+);
@@ -1,22 +1,22 @@
-import Link from "next/link";
-import { connect } from "react-redux";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm, reset } from "redux-form";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { Field, change, reduxForm } from "redux-form";
+import { useState } from "react";

+import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
 import {
+    FileUploadField,
    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-    RenderFileUpload,
+    RenderRichMultiline,
 } from "./representationElements";
+
 import { useDropzone } from "react-dropzone";
-// import {
-//     setRepresentationCapacity,
-//     setRepresentationSubmit,
-// } from "../../../store/currentView/action";
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";

 const RepAppellant = (props) => {
    let { t } = useTranslation();
@@ -29,207 +29,300 @@ const RepAppellant = (props) => {
        setRepresentationCapacity,
        setRepresentationSubmit,
        currentView,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
    } = props;
    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();

-    // console.log(props);
+    console.log(JSON.stringify(formObj) == "{}" ? "empty" : "value");

-    return (
-        <div id="rep-appellant">
-            <div className="govuk-grid-column-full">
+    if (JSON.stringify(formObj) != "{}") {
+        setRepFileName(formObj.representationForm.values);
+
+        let filterFilesList = props.currentView.caseReference.hasOwnProperty(
+            "repDetails"
+        )
+            ? props.currentView.caseReference.repDetails.hasOwnProperty(
+                  "filesList"
+              )
+                ? props.currentView.caseReference.repDetails.filesList.filter(
+                      function (el) {
+                          return el != null;
+                      }
+                  )
+                : []
+            : [];
+
+        filterFilesList = filterFilesList.filter(
+            (value, index, self) =>
+                index === self.findIndex((t) => t.name === value.name)
+        );
+
+        return (
+            <>
                <div className="govuk-grid-row">
                    <div className="govuk-form-group">
-                        <label
-                            className="govuk-label govuk-body-m"
-                            htmlFor="representationType"
-                        >
-                            What kind of representation are you making?
-                        </label>
-                        <Field
-                            name="representationType"
-                            component={RenderPickList}
-                            datafieldname="representationType"
-                            optionsArr={appellantApplicantRepresentationArr}
-                        />
+                        {typeof formObj.representationForm.values
+                            .representationType == "undefined" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <h2 className="govuk-heading-m ">
+                                    {t(
+                                        "myrepresentations:representation-from-an-appellant-heading"
+                                    )}
+                                </h2>
+                                <label
+                                    className="govuk-label govuk-body-m"
+                                    htmlFor="representationType"
+                                >
+                                    {t("myrepresentations:kind-of-rep-label")}
+                                </label>
+                                <Field
+                                    name="representationType"
+                                    component={RenderPickList}
+                                    datafieldname="representationType"
+                                    optionsArr={
+                                        appellantApplicantRepresentationArr
+                                    }
+                                />
+                            </>
+                        ) : (
+                            <label className="govuk-label govuk-body-m">
+                                {t("myrepresentations:representation-type")}:{" "}
+                                {router.locale == "cy"
+                                    ? formObj.representationForm.values
+                                          .representationType == "Questionnaire"
+                                        ? "Holiadur"
+                                        : formObj.representationForm.values
+                                              .representationType == "Statement"
+                                        ? "Datganiad"
+                                        : formObj.representationForm.values
+                                              .representationType ==
+                                          "Final comments"
+                                        ? "Sylwadau terfynol"
+                                        : formObj.representationForm.values
+                                              .representationType
+                                    : formObj.representationForm.values
+                                          .representationType}
+                            </label>
+                        )}
                    </div>
                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-form-group">
-                        <Field
-                            className="govuk-input govuk-!-width-three-quarters"
-                            id="representationDescription"
-                            name="representationDescription"
-                            value="email"
-                            data-aria-controls="representationDescription"
-                            type="text"
-                            component={RenderTextfield}
-                            label="Description of representation"
-                        />
-                    </div>
-                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-form-group">
-                        <p className="govuk-body">
-                            You can enter your comments in the space provided or
-                            attach a separate document.
-                        </p>
-                        <fieldset
-                            className="govuk-fieldset"
-                            aria-describedby="commentBox-hint"
-                        >
-                            <div id="commentBox-hint" className="govuk-hint">
-                                My comments are set out in:*
-                            </div>
-                            <div
-                                className="govuk-checkboxes"
-                                data-module="govuk-checkboxes"
+                {(typeof props.representationType != "undefined" ||
+                    typeof formObj.representationForm.values
+                        .representationType != "undefined") && (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-form-group">
+                            <p className="govuk-body">
+                                {t("myrepresentations:enter-comment-label")}
+                            </p>
+                            <fieldset
+                                className="govuk-fieldset"
+                                aria-describedby="commentBox-hint"
                            >
-                                <div className="govuk-checkboxes__item">
-                                    <Field
-                                        className="govuk-checkboxes__input"
-                                        id="commentBox"
-                                        name="commentBox"
-                                        value="email"
-                                        data-aria-controls="commentBox"
-                                        type="checkbox"
-                                        component={RenderTextfield}
-                                    />
-                                    <label
-                                        className="govuk-label govuk-checkboxes__label"
-                                        htmlFor="commentBox"
-                                    >
-                                        the box below{" "}
-                                    </label>
-                                </div>
-                                <div
-                                    className={
-                                        _.isEmpty(formObj["representationForm"])
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values
-                                              )
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden q11 "
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values.commentBox
-                                              )
-                                            ? formObj["representationForm"]
-                                                  .values.commentBox == false
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : "govuk-checkboxes__conditional"
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden wwwaqqqq"
-                                    }
-                                    id="conditional-commentBox"
+                                {/* <div
+                                    id="commentBox-hint"
+                                    className="govuk-hint"
                                >
-                                    <div className="govuk-form-group">
-                                        <Field
-                                            name="representationComments"
-                                            id="representationComments"
-                                            component={RenderMultiline}
-                                            type="text"
-                                            rows="5"
-                                            className="govuk-textarea govuk-input--width-30"
-                                            aria-describedby={
-                                                props.name + "-hint"
-                                            }
-                                        />
-                                    </div>
-                                </div>
-                                <div className="govuk-checkboxes__item">
+                                    {t(
+                                        "myrepresentations:comments-set-out-label"
+                                    )}
+                                    :
+                                </div> */}
+                                <div className="govuk-form-group">
                                    <Field
-                                        className="govuk-checkboxes__input"
-                                        id="documentBox"
-                                        name="documentBox"
-                                        data-aria-controls="documentBox"
-                                        type="checkbox"
-                                        component={RenderTextfield}
+                                        name="representationComments"
+                                        id="representationComments"
+                                        component={RenderRichMultiline}
+                                        type="text"
+                                        rows="5"
+                                        className="govuk-textarea govuk-input--width-30"
+                                        aria-describedby={props.name + "-hint"}
                                    />
-                                    <label
-                                        className="govuk-label govuk-checkboxes__label"
-                                        htmlFor="documentBox"
-                                    >
-                                        separate documents
-                                    </label>
+                                    {formObj.representationForm.values
+                                        .appealType == "846040004" ? (
+                                        <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+                                            {t(
+                                                "myrepresentations:publish-policy-label"
+                                            )}{" "}
+                                            <a
+                                                href={t(
+                                                    "myrepresentations:publish-policy-link"
+                                                )}
+                                            >
+                                                {t(
+                                                    "myrepresentations:publish-policy-link-label"
+                                                )}
+                                            </a>{" "}
+                                            {t(
+                                                "myrepresentations:publish-policy-label-two"
+                                            )}
+                                        </p>
+                                    ) : (
+                                        <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+                                            {t(
+                                                "myrepresentations:publish-policy-label"
+                                            )}{" "}
+                                            <a
+                                                href={t(
+                                                    "myrepresentations:publish-policy-link"
+                                                )}
+                                            >
+                                                {t(
+                                                    "myrepresentations:publish-policy-link-label"
+                                                )}
+                                            </a>{" "}
+                                            {t(
+                                                "myrepresentations:publish-policy-label-two"
+                                            )}
+                                        </p>
+                                    )}
                                </div>
-                                <div
-                                    className={
-                                        _.isEmpty(formObj["representationForm"])
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values
-                                              )
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values.documentBox
-                                              )
-                                            ? formObj["representationForm"]
-                                                  .values.documentBox == false
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : "govuk-checkboxes__conditional"
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
-                                    }
-                                    id="conditional-documentBox"
-                                >
-                                    <h2 className="govuk-heading-s">
-                                        {props.label}{" "}
-                                    </h2>
-                                    <Field
-                                        name="repsFiles"
-                                        id="repsFiles"
-                                        component={RenderFileUpload}
-                                        className="govuk-input govuk-input--width-20"
-                                        //validate={[required]}
-                                        label={props.label}
-                                        errorMsg="Is required"
-                                        ticketnumber={props.caseReference}
-                                        documentTypeCode={
-                                            props.documentTypeCode
+                                <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                    <FileUploadField
+                                        name={"representationDocuments"}
+                                        id={"representationDocuments"}
+                                        label={t(
+                                            "myrepresentations:add-files-label"
+                                        )}
+                                        ticketnumber={
+                                            props.currentView.caseReference
+                                                .ticketnumber
                                        }
-                                        hint={props.hint}
-                                        fileList={props.fileList}
-                                        setFilesForAppeal={
-                                            props.setFilesForAppeal
+                                        hint={"sdsd"}
+                                        fileList={
+                                            props.currentView.fileList
+                                            // props.currentView.caseReference.hasOwnProperty(
+                                            //     "repDetails"
+                                            // )
+                                            //     ? props.currentView.caseReference.repDetails.hasOwnProperty(
+                                            //           "filesList"
+                                            //       ) &&
+                                            //       props.currentView
+                                            //           .caseReference.repDetails
+                                            //           .filesList.length > 0
+                                            //         ? props.currentView
+                                            //               .caseReference
+                                            //               .repDetails.filesList
+                                            //         : []
+                                            //     : []
+                                        }
+                                        setFilesForRepresentations={
+                                            setFilesForRepresentations
+                                        }
+                                        containerID={
+                                            props.props.props.accountDetails
+                                                .containerID
+                                        }
+                                        filenamePrefix={props.formObj}
+                                        props={props.props.props}
+                                        setCurrentReference={
+                                            props.setCurrentReference
                                        }
-                                        containerID={props.containerID}
                                    />
                                </div>
-                            </div>
-                        </fieldset>
-                    </div>{" "}
-                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-button-group">
-                        <button
-                            type="submit"
-                            className="govuk-button"
-                            data-module="govuk-button"
-                        >
-                            Continue
-                        </button>
-                        {/* <a
-                            onClick={() => {
-                                setRepresentationSubmit(true);
-                            }}
-                            className="govuk-button"
-                        >
-                            Continue ww
-                        </a> */}
-                        <a
-                            onClick={() => {
-                                setRepresentationCapacity();
-                            }}
-                            className="govuk-link"
-                        >
-                            Back
-                        </a>
+                            </fieldset>
+                        </div>{" "}
                    </div>
-                </div>
-            </div>
-        </div>
-    );
+                )}
+                {typeof formObj.representationForm.values.representationType !=
+                    "undefined" && (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-button-group">
+                            <button
+                                type="submit"
+                                className="govuk-button"
+                                data-module="govuk-button"
+                            >
+                                {t("common:continue-button")}
+                            </button>
+                            {/* {router.query.state != "edit" && (
+                            <a
+                                onClick={() => {
+                                    setRepresentationCapacity();
+                                    props.updateField(
+                                        "representationForm",
+                                        "representationType",
+                                        ""
+                                    );
+                                }}
+                                className="govuk-link"
+                            >
+                                {t("common:back-link")}
+                            </a>
+                        )} */}
+
+                            {savingStatus ? (
+                                <span className=" progress-save-active">
+                                    {router.locale == "cy"
+                                        ? "Nôl data"
+                                        : "Saving data"}
+                                    <img
+                                        className="data-loading-icon"
+                                        src="/assets/images/loading.gif"
+                                        alt={
+                                            router.locale == "cy"
+                                                ? "Nôl data"
+                                                : "Saving data"
+                                        }
+                                    />
+                                </span>
+                            ) : (
+                                <button
+                                    className="govuk-button progress-save "
+                                    onClick={() => {
+                                        let valuesObj =
+                                            props.props.props.form[props.form]
+                                                .values || {};
+
+                                        //console.log("valuesobj:", valuesObj);
+
+                                        delete valuesObj[
+                                            "_pinswg_appellant_value"
+                                        ];
+
+                                        //console.log("on save:", valuesObj);
+                                        updateRepresentation(
+                                            valuesObj,
+                                            false,
+                                            true
+                                        );
+                                    }}
+                                >
+                                    {t("common:save-exit-button")}
+                                </button>
+                            )}
+                        </div>
+                    </div>
+                )}
+            </>
+        );
+    }
 };

-export default RepAppellant;
+//const mapStateToProps = (state, props) => {};
+
+const mapDispatchToProps = (dispatch) => {
+    return {
+        updateField: (form, field, newValue) =>
+            dispatch(change(form, field, newValue)),
+
+        setFilesForRepresentations: (fileList) => {
+            dispatch(setFilesForRepresentations(fileList));
+        },
+    };
+};
+
+export default connect(
+    null,
+    mapDispatchToProps
+)(
+    reduxForm({
+        form: "representationForm",
+        enableReinitialize: true,
+        destroyOnUnmount: false,
+    })(RepAppellant)
+);
@@ -1,23 +1,9 @@
-import Link from "next/link";
-import { connect } from "react-redux";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    handleSubmit,
-    reset,
-} from "redux-form";
-import {
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
+import { useRouter } from "next/router";
 import { useDropzone } from "react-dropzone";
+import { Field } from "redux-form";
 import RepDetails from "./representationDetails";
-import { setRepresentationCapacity } from "../../../store/currentView/action";
+import { RenderRadioListWithText } from "./representationElements";

 let RepCapacitySelection = (props) => {
    let { t } = useTranslation();
@@ -31,6 +17,7 @@ let RepCapacitySelection = (props) => {
        casesObj,
        validate,
        handleSubmit,
+        setCurrentReference,
    } = props;
    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
    const files = acceptedFiles.map((file) => (
@@ -47,22 +34,37 @@ let RepCapacitySelection = (props) => {
                formObj={formObj}
                currentType={currentType}
                casesObj={casesObj}
+                caseReference={props.props.caseReference}
+                ticketnumber={
+                    props.props.currentView.caseReference.ticketnumber
+                }
+                searchResultsObj={props.props.searchResultsObj}
+                myRepresentations={props.props.myRepresentations}
+                props={props}
+                setCurrentReference={setCurrentReference}
            />{" "}
-            <div id="rep-details" className="vo_hiddens">
+            <div id="rep-details" className="">
                <div className="govuk-grid-column-full">
                    <div className="govuk-grid-row">
                        <h2 className="govuk-heading-m ">
-                            Your details - {props.firstValue}
+                            {t(
+                                "myrepresentations:capacity-select-your-details"
+                            )}{" "}
+                            - {props.firstValue}
                        </h2>
                        <Field
                            name="representationCapacity"
                            datafieldname="representationCapacity"
-                            label="In what capacity do you wish to make representations on this case?"
+                            label={t(
+                                "myrepresentations:capacity-select-what-capacity-label"
+                            )}
                            options={capacityOptionsArr}
                            id="representationCapacity"
                            className="govuk-radios__input"
-                            errorMsg={t("newappeal:select-an-option-label")}
-                            component={RenderRadioList}
+                            errorMsg={t(
+                                "myrepresentations:select-an-option-label"
+                            )}
+                            component={RenderRadioListWithText}
                            validate={[required]}
                        />
                    </div>
@@ -75,7 +77,7 @@ let RepCapacitySelection = (props) => {
                                className="govuk-button"
                                data-module="govuk-button"
                            >
-                                Continue
+                                {t("common:continue-button")}
                            </button>
                        </div>
                    </div>
@@ -1,19 +1,17 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
-import {
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
-import {
-    setRepresentationCapacity,
-    setRepresentationSubmit,
-    setSubmitBack,
-} from "../../../store/currentView/action";
+import { useEffect } from "react";
+import { connect } from "react-redux";
+
 import { useDropzone } from "react-dropzone";
+import {
+    createWatchedCases,
+    sendEmail,
+    sendRepCompleteMessage,
+    setRepInvolvment,
+} from "../../../actions";
+import { setRepresentationReset } from "../../../store/currentView/action";

 const RepComplete = (props) => {
    let { t } = useTranslation();
@@ -28,6 +26,8 @@ const RepComplete = (props) => {
        currentView,
        setSubmitBack,
        setRepresentationSubmitConfirmation,
+        setRepresentationMessageSent,
+        repFormData,
    } = props;
    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
    const files = acceptedFiles.map((file) => (
@@ -36,35 +36,83 @@ const RepComplete = (props) => {
        </li>
    ));

+    const isSIPS =
+        props.props.currentView.caseReference.appealType === 846040002;
+
+    useEffect(() => {
+        const reference = isSIPS
+            ? "PEDW-CONSULTATION-COMPLETE"
+            : "PEDW-REPRESENTATION-COMPLETE";
+        const templateId = isSIPS
+            ? "c3f373ca-df9d-4967-bea0-3ad3a57f8dcc"
+            : "c49785e7-3217-40b6-b33f-dffc4e58d5c1";
+
+        const emailAddress =
+            props.props.props.props.accountDetails.accountDetails.emailaddress1;
+        const personalisation = {
+            "caseReference":
+                props.props.currentView.caseReference.currentReference,
+            "emailAddress":
+                props.props.props.props.accountDetails.accountDetails
+                    .emailaddress1,
+            "linkExpiry": 10 * 60,
+        };
+
+        props.props.currentView.representationMessageSent != true &&
+            (setRepInvolvment(
+                props.props.currentView.caseReference.incidentid,
+                props.props.props.props.accountDetails.accountDetails.contactid
+            ),
+            sendRepCompleteMessage(
+                props.props.props.props.accountDetails.containerID,
+                props.props.currentView.caseReference.ticketnumber,
+                props.repFormData.repfile_name
+            ),
+            sendEmail(templateId, emailAddress, personalisation, reference),
+            createWatchedCases({
+                "pinswg_WatchedCase@odata.bind":
+                    "/incidents(" +
+                    props.props.currentView.caseReference.incidentid +
+                    ")",
+                "pinswg_Contact@odata.bind":
+                    "/contacts(" +
+                    props.props.props.props.accountDetails.accountDetails
+                        .contactid +
+                    ")",
+                "pinswg_appealcasetype":
+                    props.props.currentView.caseReference.appealType,
+                "pinswg_representationsubmitted": new Date(Date.now()),
+                "pinswg_representationtype":
+                    props.props.currentView.caseReference.hasOwnProperty(
+                        "repDetails"
+                    )
+                        ? props.props.currentView.caseReference.repDetails
+                              .representationType
+                        : props.props.currentView.caseReference
+                              .representationType,
+            }),
+            setRepresentationMessageSent(true)),
+            window.scrollTo({ top: 0, behavior: "smooth" });
+    });
    return (
        <div id="rep-appellant">
            <div className="govuk-grid-column-full">
                <div className="govuk-grid-row govuk-body">
                    <h1 className="govuk-heading-m ">
-                        Submission of Representation
+                        {t("myrepresentations:rep-complete-heading")}
                    </h1>
-                    <p>
-                        Thank you for submitting your representation(s) using
-                        the Appeals Casework Portal.
-                    </p>
-
-                    <p>
-                        Please remember that any supporting documentation needs
-                        to be received by us within the appropriate deadline for
-                        the case. Anything you send to us must be clearly marked
-                        with the case reference number and the site address
-                        (including the postcode, where known).
-                    </p>
-
-                    <p>
-                        You will shortly receive confirmation to the email
-                        address you have provided.
-                    </p>
+                    <p>{t("myrepresentations:rep-complete-para-one")}</p>
+                    <p>{t("myrepresentations:rep-complete-para-two")}</p>
+                    <p> {t("myrepresentations:rep-complete-para-three")}</p>
                </div>
                <div className="govuk-grid-row">
                    <div className="govuk-button-group">
-                        <Link href="/myportal">
-                            <a className="govuk-button">Continue</a>
+                        <Link
+                            href="/"
+                            onClick={() => setRepresentationReset()}
+                            className="govuk-button"
+                        >
+                            {t("common:continue-button")}
                        </Link>
                    </div>
                </div>
@@ -73,4 +121,22 @@ const RepComplete = (props) => {
    );
 };

-export default RepComplete;
+const mapStateToProps = (state) => {
+    return {
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        currentView: state.currentView,
+        myRepresentations: state.myRepresentations,
+        initialValues: state.currentView.caseReference.repDetails,
+        accountDetails: state.accountDetails,
+        //form: state.form,
+    };
+};
+
+const mapDispatchToProps = (dispatch) => {
+    return {};
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(RepComplete);
@@ -1,24 +1,28 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
+import _ from "lodash";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
-import {
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
-import {
-    setRepresentationCapacity,
-    setRepresentationSubmit,
-    setSubmitBack,
-    setRepresentationSubmitConfirmation,
-} from "../../../store/currentView/action";
+import { useRouter } from "next/router";
+import { useState } from "react";
 import { useDropzone } from "react-dropzone";
+import { connect } from "react-redux";
 import RepComplete from "./representationComplete";
+import RepLPAQuestionnaireCheck_enforcement from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement";
+import RepLPAQuestionnaireCheck_s78 from "./representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78";
+import Link from "next/link";
+import {
+    bytesToSize,
+    getThumbnailIconByExtension,
+    formatDates,
+    updateLinks,
+} from "../../utils";
+
+import {
+    setCurrentReference,
+    setCurrentView,
+} from "../../../store/currentView/action";

 const RepCompleteSubmit = (props) => {
    let { t } = useTranslation();
+    const [confirmSections, setConfirmSections] = useState(false);

    const router = useRouter();
    const { locale } = router;
@@ -30,6 +34,13 @@ const RepCompleteSubmit = (props) => {
        currentView,
        setSubmitBack,
        setRepresentationSubmitConfirmation,
+        setRepresentationMessageSent,
+        setRepresentationReset,
+        setShowQuestionnaireSection,
+        showQuestionnaireSection,
+        questionnaireCount,
+        finaliseAppealProcess,
+        setCurrentReference,
    } = props;
    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
    const files = acceptedFiles.map((file) => (
@@ -38,79 +49,644 @@ const RepCompleteSubmit = (props) => {
        </li>
    ));

+    let repFormData = formObj.representationForm.values;
+
+    repFormData = updateLinks(repFormData);
+
+    //const repDate = new Date();
+
+    // let day = repDate.getDate();
+    // let month = repDate.getMonth() + 1;
+    // let year = repDate.getFullYear();
+
+    // let repType = "";
+    // switch (repFormData.representationCapacity) {
+    //     case t("myrepresentations:capacity-options-arr-appellant"):
+    //         repType = "APP";
+    //         break;
+    //     case t("myrepresentations:capacity-options-arr-agent"):
+    //         repType = "AGENT";
+    //         break;
+    //     case t("myrepresentations:capacity-options-arr-interested"):
+    //         repType = "IP";
+    //         break;
+    //     case "Land Owner":
+    //         repType = "LO";
+    //         break;
+    //     case "lpa":
+    //         repType = "LPA";
+    //         break;
+
+    //     default:
+    //     // code block
+    // }
+
+    // Object.assign(repFormData, {
+    //     "repfile_name": repFormData.hasOwnProperty("repfile_name")
+    //         ? repFormData.repfile_name
+    //         : year +
+    //           "-" +
+    //           month +
+    //           "-" +
+    //           day +
+    //           "-" +
+    //           repDate.getHours() +
+    //           repDate.getMinutes() +
+    //           repDate.getSeconds() +
+    //           "_" +
+    //           repType +
+    //           "_" +
+    //           props.props.props.accountDetails.accountDetails.lastname +
+    //           "_" +
+    //           props.props.props.accountDetails.accountDetails.firstname,
+    //     "pinswg_name": props.props.currentView.caseReference.currentReference,
+    //     "containerID": props.props.props.accountDetails.containerID,
+    //     "appealType": props.props.currentView.caseReference.appealType,
+    //     "incidentID": props.props.currentView.caseReference.incidentid,
+    //     "caseRef": props.props.currentView.caseReference.currentReference,
+    // });
+
+    //console.log("///////// repFormData:", repFormData);
+
+    const whichQuestionnaireCheck = () => {
+        {
+            switch (currentView.caseReference.appealType) {
+                case 846040000:
+                case 846040001:
+                case 846040025:
+                case 846040004:
+                case 846040018:
+                case 846040003:
+                case 846040009:
+                case 846040008:
+                case 846040017:
+                    return (
+                        <RepLPAQuestionnaireCheck_s78
+                            props={props}
+                            formObj={formObj}
+                            setSubmitBack={setSubmitBack}
+                            setShowQuestionnaireSection={
+                                setShowQuestionnaireSection
+                            }
+                            setRepresentationSubmit={setRepresentationSubmit}
+                        />
+                    );
+                    break;
+                case 846040005:
+                case 846040006:
+                case 846040007:
+                    return (
+                        <RepLPAQuestionnaireCheck_enforcement
+                            props={props}
+                            formObj={formObj}
+                            setSubmitBack={setSubmitBack}
+                            setShowQuestionnaireSection={
+                                setShowQuestionnaireSection
+                            }
+                            setRepresentationSubmit={setRepresentationSubmit}
+                        />
+                    );
+                    break;
+                default:
+                    return <></>;
+                    break;
+            }
+        }
+    };
+
+    let buildAppealFilesArray = [];
+
+    let filesUploadObj = props.currentView.fileList;
+
+    // formObj.representationForm.values.representationDocuments;
+
+    for (let key in filesUploadObj) {
+        typeof filesUploadObj[key].name != "undefined" &&
+            buildAppealFilesArray.push({
+                "name": filesUploadObj[key].name,
+                "size": filesUploadObj[key].contentLength,
+            });
+    }
+
+    // console.log(
+    //     buildAppealFilesArray,
+    //     formObj.representationForm.values.filesList
+    // );
+
+    // buildAppealFilesArray = formObj.representationForm.values.hasOwnProperty(
+    //     "filesList"
+    // )
+    //     ? formObj.representationForm.values.filesList
+    //     : [];
+
+    let arrUniq = [
+        ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
+    ];
+
+    buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
+        return el != null;
+    });
+
+    // const arrUniq = buildAppealFilesArray.filter(
+    //     (obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
+    // );
+
+    //arrUniq = arrUniq.concat(filesUploadObj);
+
+    function removeNullObjects(arr) {
+        if (arr.length === 0) {
+            return arr;
+        }
+        return arr.filter((obj) => obj !== null);
+    }
+    function removeEmptyObjects(arr) {
+        if (arr.length === 0) {
+            return arr;
+        }
+        return arr.filter(
+            (obj) =>
+                obj && typeof obj === "object" && Object.keys(obj).length > 0
+        );
+    }
+    arrUniq = removeNullObjects(arrUniq);
+    arrUniq = removeEmptyObjects(arrUniq);
+
+    Object.assign(formObj.representationForm.values, {
+        "filesList": arrUniq,
+    });
+
+    let filterFiles = [];
+
+    function showRepsEnded(endDate) {
+        let date = new Date();
+        date = new Date(date.toDateString());
+        let end = new Date(endDate);
+        end.setUTCHours(23);
+        end.setUTCMinutes(59);
+        end.setUTCSeconds(59);
+        end.toISOString();
+
+        return end > date ? false : true;
+    }
+
+    const checkRepDatePassed = () => {
+        if (repFormData.representationType == "Questionnaire") {
+            return false;
+        } else {
+            if (repFormData.representationType == "Final comments") {
+                return repFormData.hasOwnProperty(
+                    "pinswg_finalcommentsduedate"
+                ) && showRepsEnded(repFormData.pinswg_finalcommentsduedate)
+                    ? true
+                    : false;
+            }
+            if (repFormData.representationType == "Statement") {
+                return repFormData.hasOwnProperty("pinswg_statementduedate") &&
+                    showRepsEnded(repFormData.pinswg_statementduedate)
+                    ? true
+                    : false;
+            }
+        }
+    };
+
    return (
        <>
            {currentView.representationSubmitConfirmation == true ? (
-                <RepComplete />
+                <RepComplete
+                    repFormData={repFormData}
+                    props={props}
+                    setRepresentationMessageSent={setRepresentationMessageSent}
+                    setRepresentationReset={setRepresentationReset}
+                />
            ) : (
                <div id="rep-appellant">
                    <div className="govuk-grid-column-full">
                        <div className="govuk-grid-row govuk-body">
-                            <h1 className="govuk-heading-m ">Submit</h1>
+                            <h1 className="govuk-heading-m ">
+                                {" "}
+                                {t(
+                                    "myrepresentations:rep-check-submit-heading"
+                                )}
+                            </h1>
+                            <dl className="govuk-summary-list ">
+                                <h2 className="govuk-heading-m govuk-!-margin-top-9">
+                                    {t(
+                                        "myrepresentations:rep-check-your-rep-heading"
+                                    )}
+                                </h2>
+                                <div className="govuk-summary-list__row">
+                                    <dt className="govuk-summary-list__key">
+                                        {t(
+                                            "case:representation-representation-type"
+                                        )}
+                                    </dt>
+
+                                    <dd className="govuk-summary-list__value">
+                                        {router.locale == "cy"
+                                            ? repFormData.representationType ==
+                                              "Questionnaire"
+                                                ? "Holiadur"
+                                                : repFormData.representationType ==
+                                                  "Statement"
+                                                ? "Datganiad"
+                                                : repFormData.representationType ==
+                                                  "Final comments"
+                                                ? "Sylwadau terfynol"
+                                                : repFormData.representationType
+                                            : repFormData.representationType}
+                                    </dd>
+
+                                    <dd className="govuk-summary-list__actions">
+                                        {/* <a
+                                            className="govuk-link"
+                                            href="#"
+                                            onClick={() => {
+                                                setSubmitBack();
+                                            }}
+                                        >
+                                            {t("common:change-link-label")}
+                                            <span className="govuk-visually-hidden">
+                                                {" "}
+                                                {FieldsTranslations(
+                                                        rows[0].value
+                                                    )}
+                                            </span>
+                                        </a> */}
+                                    </dd>
+                                </div>
+                                {_.has(
+                                    repFormData,
+                                    "representationOnBehalfOf"
+                                ) && (
+                                    <>
+                                        <div className="govuk-summary-list__row">
+                                            <dt className="govuk-summary-list__key">
+                                                {t(
+                                                    "case:representation-onbehalfof"
+                                                )}
+                                            </dt>
+
+                                            <dd className="govuk-summary-list__value">
+                                                {
+                                                    repFormData.representationOnBehalfOf
+                                                }
+                                            </dd>
+
+                                            <dd className="govuk-summary-list__actions">
+                                                <a
+                                                    className="govuk-link"
+                                                    href="#"
+                                                    onClick={() => {
+                                                        // setSubmitBack();
+                                                        setCurrentReference({
+                                                            "ticketnumber":
+                                                                repFormData.ticketnumber,
+                                                            "currentReference":
+                                                                repFormData.caseRef,
+                                                            "currentType":
+                                                                "myRepresentations",
+                                                            "incidentid":
+                                                                repFormData.incidentID,
+                                                            "appealType":
+                                                                repFormData.appealType,
+                                                            "repDetails":
+                                                                repFormData,
+                                                        });
+                                                        setRepresentationSubmit(
+                                                            false
+                                                        );
+                                                    }}
+                                                >
+                                                    {t(
+                                                        "common:change-link-label"
+                                                    )}
+                                                    <span className="govuk-visually-hidden">
+                                                        {" "}
+                                                        {/* {FieldsTranslations(
+                                                        rows[0].value
+                                                    )} */}
+                                                    </span>
+                                                </a>
+                                            </dd>
+                                        </div>
+                                        {repFormData.representationOnBehalfOf ==
+                                            "Yes" && (
+                                            <div className="govuk-summary-list__row">
+                                                <dt className="govuk-summary-list__key">
+                                                    {t(
+                                                        "case:representation-onbehalfof-details"
+                                                    )}
+                                                </dt>
+
+                                                <dd className="govuk-summary-list__value">
+                                                    {
+                                                        repFormData.representationOnBehalfOf_details
+                                                    }
+                                                </dd>
+
+                                                <dd className="govuk-summary-list__actions">
+                                                    <a
+                                                        className="govuk-link"
+                                                        href="#"
+                                                        onClick={() => {
+                                                            // setSubmitBack();
+                                                            setCurrentReference(
+                                                                {
+                                                                    "ticketnumber":
+                                                                        repFormData.ticketnumber,
+                                                                    "currentReference":
+                                                                        repFormData.caseRef,
+                                                                    "currentType":
+                                                                        "myRepresentations",
+                                                                    "incidentid":
+                                                                        repFormData.incidentID,
+                                                                    "appealType":
+                                                                        repFormData.appealType,
+                                                                    "repDetails":
+                                                                        repFormData,
+                                                                }
+                                                            );
+                                                            setRepresentationSubmit(
+                                                                false
+                                                            );
+                                                        }}
+                                                    >
+                                                        {t(
+                                                            "common:change-link-label"
+                                                        )}
+                                                        <span className="govuk-visually-hidden">
+                                                            {" "}
+                                                            {/* {FieldsTranslations(
+                                                        rows[0].value
+                                                    )} */}
+                                                        </span>
+                                                    </a>
+                                                </dd>
+                                            </div>
+                                        )}
+                                    </>
+                                )}
+                                {repFormData.representationType !=
+                                    "Questionnaire" && (
+                                    <div className="govuk-summary-list__row">
+                                        <dt className="govuk-summary-list__key">
+                                            {t("case:representation-comments")}
+                                        </dt>
+
+                                        <dd className="govuk-summary-list__value">
+                                            <span
+                                                className="multiline-elipsis"
+                                                dangerouslySetInnerHTML={{
+                                                    __html: repFormData.representationComments,
+                                                }}
+                                            />
+                                        </dd>
+
+                                        <dd className="govuk-summary-list__actions">
+                                            <a
+                                                className="govuk-link"
+                                                href="#"
+                                                onClick={() => {
+                                                    // setSubmitBack();
+
+                                                    setCurrentReference({
+                                                        "ticketnumber":
+                                                            repFormData.ticketnumber,
+                                                        "currentReference":
+                                                            repFormData.caseRef,
+                                                        "currentType":
+                                                            "myRepresentations",
+                                                        "incidentid":
+                                                            repFormData.incidentID,
+                                                        "appealType":
+                                                            repFormData.appealType,
+                                                        "repDetails":
+                                                            repFormData,
+                                                    });
+                                                    setRepresentationSubmit(
+                                                        false
+                                                    );
+                                                }}
+                                            >
+                                                {t("common:change-link-label")}
+                                                <span className="govuk-visually-hidden">
+                                                    {" "}
+                                                    {/* {FieldsTranslations(
+                                                        rows[0].value
+                                                    )} */}
+                                                </span>
+                                            </a>
+                                        </dd>
+                                    </div>
+                                )}
+                                <div className="govuk-summary-list__row">
+                                    <dt className="govuk-summary-list__key">
+                                        {t("case:representation-files")}
+                                    </dt>
+
+                                    <dd className="govuk-summary-list__value">
+                                        {arrUniq.length > 0
+                                            ? arrUniq.map((blob, i) => (
+                                                  <div
+                                                      key={blob.name + "_" + i}
+                                                      className="govuk-!-margin-bottom-5 fileThumb "
+                                                  >
+                                                      <img
+                                                          src={getThumbnailIconByExtension(
+                                                              blob.name
+                                                          )}
+                                                          alt={blob.name}
+                                                          width="50"
+                                                      />
+
+                                                      <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
+                                                          {blob.name} (
+                                                          {bytesToSize(
+                                                              blob.size
+                                                          )}
+                                                          )
+                                                      </span>
+                                                  </div>
+                                              ))
+                                            : ""}
+                                    </dd>
+
+                                    <dd className="govuk-summary-list__actions">
+                                        <a
+                                            className="govuk-link"
+                                            href="#"
+                                            onClick={() => {
+                                                repFormData.representationType ==
+                                                "Questionnaire"
+                                                    ? (setShowQuestionnaireSection(
+                                                          questionnaireCount ==
+                                                              7
+                                                              ? 6
+                                                              : 8
+                                                      ),
+                                                      setRepresentationSubmit(
+                                                          false
+                                                      ))
+                                                    : (setCurrentReference({
+                                                          "ticketnumber":
+                                                              repFormData.ticketnumber,
+                                                          "currentReference":
+                                                              repFormData.caseRef,
+                                                          "currentType":
+                                                              "myRepresentations",
+                                                          "incidentid":
+                                                              repFormData.incidentID,
+                                                          "appealType":
+                                                              repFormData.appealType,
+                                                          "repDetails":
+                                                              repFormData,
+                                                      }),
+                                                      setRepresentationSubmit(
+                                                          false
+                                                      ));
+                                            }}
+                                        >
+                                            {t("common:change-link-label")}
+
+                                            <span className="govuk-visually-hidden">
+                                                {" "}
+                                                {/* {FieldsTranslations(
+                                                        rows[0].value
+                                                    )} */}
+                                            </span>
+                                        </a>
+                                    </dd>
+                                </div>
+                                {repFormData.representationType ==
+                                "Questionnaire"
+                                    ? whichQuestionnaireCheck()
+                                    : ""}
+                            </dl>
                            <p>
-                                The gathering and subsequent processing of the
-                                personal data supplied by you in this form, is
-                                in accordance with the terms of our registration
-                                under the Data Protection Act 2018.
+                                {t(
+                                    "myrepresentations:rep-check-tandc-para-one"
+                                )}
                            </p>
-
                            <p>
-                                The Planning Inspectorate takes its data
-                                protection responsibilities for the information
-                                you provide us with very seriously. To find out
-                                more about how we use and manage your personal
-                                data, please go to our privacy notice.
+                                {t(
+                                    "myrepresentations:rep-check-tandc-para-two"
+                                )}{" "}
+                                <Link
+                                    href={t("common:footer-privacy-link")}
+                                    target="_blank"
+                                >
+                                    {t(
+                                        "common:footer-privacy-notice-link-label"
+                                    )}
+                                </Link>
+                                .
                            </p>
-
                            <p>
-                                I confirm that all sections of this form have
-                                been fully completed and that the details are
-                                correct to the best of my knowledge.
+                                {t(
+                                    "myrepresentations:rep-check-tandc-para-three"
+                                )}
                            </p>
+                            {checkRepDatePassed() ? (
+                                <div className="govuk-warning-text noticebanner">
+                                    <strong className="govuk-warning-text__text">
+                                        <span className="govuk-visually-hidden">
+                                            Warning
+                                        </span>
+                                    </strong>
+                                    <div>
+                                        <div className=" govuk-body-s">
+                                            <h2 className="govuk-heading-s">
+                                                {t(
+                                                    "myrepresentations:rep-period-passed-heading"
+                                                )}
+                                            </h2>
+                                            <p className="govuk-body-s">
+                                                {t(
+                                                    "myrepresentations:rep-period-notice-label"
+                                                )}
+                                            </p>
+                                        </div>
+                                    </div>
+                                </div>
+                            ) : finaliseAppealProcess ? (
+                                <div className="">
+                                    <h3 className="govuk-heading-m govuk-!-margin-top-9">
+                                        {t(
+                                            "myrepresentations:rep-finalising-heading"
+                                        )}
+                                    </h3>
+                                    <p className="govuk-body">
+                                        {t(
+                                            "myrepresentations:rep-finalising-label"
+                                        )}
+                                    </p>
+                                    <p className="govuk-body textloading">
+                                        {t("myrepresentations:rep-wait-label")}
+                                    </p>
+                                </div>
+                            ) : (
+                                <>
+                                    <div className="govuk-form-group">
+                                        <div className="govuk-checkboxes govuk-checkboxes--small">
+                                            <div className="govuk-checkboxes__item">
+                                                <input
+                                                    name="pinswg_checkconfirmation"
+                                                    id="pinswg_checkconfirmation"
+                                                    type="checkbox"
+                                                    className="govuk-checkboxes__input"
+                                                    value=""
+                                                    onChange={(e) => {
+                                                        setConfirmSections(
+                                                            !confirmSections
+                                                        );
+                                                    }}
+                                                />
+                                                <label
+                                                    className="govuk-label govuk-checkboxes__label"
+                                                    htmlFor="pinswg_checkconfirmation"
+                                                >
+                                                    {t(
+                                                        "myrepresentations:rep-check-tandc-para-four"
+                                                    )}
+                                                </label>
+                                            </div>
+                                        </div>
+                                    </div>

-                            <div className="govuk-form-group">
-                                <label
-                                    className="govuk-label govuk-body-m"
-                                    htmlFor="representationType"
-                                >
-                                    I confirm I have read the above.
-                                </label>
-                                {/* <Field
-                        name="representationType"
-                        component={RenderPickList}
-                        datafieldname="representationType"
-                        optionsArr={appellantApplicantRepresentationArr}
-                    /> */}
-                            </div>
-                        </div>
-                        <div className="govuk-grid-row">
-                            <div className="govuk-button-group">
-                                <button
-                                    type="submit"
-                                    className="govuk-button"
-                                    data-module="govuk-button"
-                                    onClick={() =>
-                                        setRepresentationSubmitConfirmation()
-                                    }
-                                >
-                                    Continue
-                                </button>
-                                {/* <a
-                        onClick={() => {
-                            setRepresentationSubmit(false);
-                        }}
-                        className="govuk-button"
-                    >
-                        Continue
-                    </a> */}
-
-                                <a
-                                    onClick={() => setSubmitBack()}
-                                    className="govuk-link"
-                                >
-                                    Back
-                                </a>
-                            </div>
+                                    <div className="govuk-grid-row">
+                                        <div className="govuk-button-group">
+                                            <button
+                                                disabled={
+                                                    confirmSections
+                                                        ? false
+                                                        : true
+                                                }
+                                                type="submit"
+                                                className="govuk-button"
+                                                data-module="govuk-button"
+                                                onClick={() => {
+                                                    // setRepresentationSubmitConfirmation(
+                                                    //     true
+                                                    // );
+                                                    setRepresentationSubmit(
+                                                        true
+                                                    );
+                                                }}
+                                            >
+                                                {t("common:continue-button")}
+                                            </button>
+                                            <a
+                                                onClick={() => setSubmitBack()}
+                                                className="govuk-link"
+                                            >
+                                                {t(
+                                                    "case:summary-back-button-label"
+                                                )}
+                                            </a>
+                                        </div>
+                                    </div>
+                                </>
+                            )}
                        </div>
                    </div>
                </div>
@@ -119,4 +695,26 @@ const RepCompleteSubmit = (props) => {
    );
 };

-export default RepCompleteSubmit;
+const mapStateToProps = (state) => {
+    return {
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        currentView: state.currentView,
+        myRepresentations: state.myRepresentations,
+        initialValues: state.currentView.caseReference.repDetails,
+        accountDetails: state.accountDetails,
+        //form: state.form,
+    };
+};
+
+const mapDispatchToProps = (dispatch) => {
+    return {
+        setCurrentReference: (currentReference) => {
+            dispatch(setCurrentReference(currentReference));
+        },
+    };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(RepCompleteSubmit);
@@ -1,8 +1,6 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
-import { RenderPickList, RenderTextfield } from "./representationElements";
+import { useRouter } from "next/router";

 const RepDetails = (props) => {
    let { t } = useTranslation();
@@ -12,6 +10,32 @@ const RepDetails = (props) => {

    const { currentType, casesObj } = props;

+    let { caseReference, ticketnumber } = props;
+
+    let setCaseDetailsObj = router.query.hasOwnProperty("state")
+        ? router.query.state == "edit"
+            ? props.myRepresentations.myRepresentations
+            : props.searchResultsObj.searchDetailsObj
+        : props.currentType == "watchedCases"
+        ? props.props.props.props.watchedCases.watchedCasesDetails
+        : props.props.props.searchResultsObj.searchDetailsObj;
+
+    var detailsObj = {};
+
+    caseReference = router.query.hasOwnProperty("state")
+        ? router.query.state == "edit"
+            ? router.query.case
+            : caseReference
+        : caseReference;
+
+    detailsObj = jsonpath({
+        path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
+        json: setCaseDetailsObj,
+        eval: true,
+    });
+
+    detailsObj = detailsObj[0];
+
    return (
        <>
            {" "}
@@ -24,41 +48,59 @@ const RepDetails = (props) => {
                            </dt>
                            <dd className="govuk-summary-list__value">
                                {casesObj.appellantApplicant || ""}
+                                {
+                                    detailsObj[
+                                        "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
+                                    ]
+                                }
                            </dd>
                        </div>
-                        {/* <div className="govuk-summary-list__row">
-                            <dt className="govuk-summary-list__key">
-                                {t("case:summary-agent-label")}
-                            </dt>
-                            <dd className="govuk-summary-list__value">
-                                Mr A Agent
-                            </dd>
-                        </div> */}
+
                        <div className="govuk-summary-list__row">
                            <dt className="govuk-summary-list__key">
                                {t("case:summary-site-address-label")}
                            </dt>
                            <dd className="govuk-summary-list__value">
-                                {casesObj.address1 || ""}
-                                <br />
-                                {casesObj.town || ""}
-
-                                <br />
-                                {casesObj.postcode || ""}
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
+                                    ? detailsObj.pinswg_siteaddressline1
+                                    : ""}
+                                {_.has(detailsObj, "pinswg_siteaddressline1") &&
+                                    detailsObj.pinswg_siteaddressline1 !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddressline2")
+                                    ? detailsObj.pinswg_siteaddressline2
+                                    : ""}
+                                {_.has(detailsObj, "pinswg_siteaddressline2") &&
+                                    detailsObj.pinswg_siteaddressline2 !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddresstown")
+                                    ? detailsObj.pinswg_siteaddresstown
+                                    : ""}
+                                {_.has(detailsObj, "pinswg_siteaddresstown") &&
+                                    detailsObj.pinswg_siteaddresstown !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddresscounty")
+                                    ? detailsObj.pinswg_siteaddresscounty
+                                    : ""}
+                                {_.has(
+                                    detailsObj,
+                                    "pinswg_siteaddresscounty"
+                                ) &&
+                                    detailsObj.pinswg_siteaddresscounty !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddresspostcode")
+                                    ? detailsObj.pinswg_siteaddresspostcode
+                                    : ""}
                            </dd>
                        </div>
                    </dl>
                </div>
                <div className="govuk-grid-row">
                    <p className="govuk-body">
-                        This form enables you to submit comments on a case to
-                        Planning and Environment Decisions Wales.{" "}
+                        {t("myrepresentations:capacity-para-one")}
                    </p>
                    <p className="govuk-body">
-                        Please note that comments from interested parties need
-                        to be made within the timetable. This can be found on
-                        the previous &lsquo;Case Summary&lsquo; page. Comments
-                        submitted after this date may be considered invalid.
+                        {t("myrepresentations:capacity-para-two")}
                    </p>
                </div>
            </div>
@@ -1,14 +1,23 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
+import { useRouter } from "next/router";
+import { connect } from "react-redux";
+import { Field, change, reduxForm } from "redux-form";
+import { useState } from "react";
+
+import { bytesToSize, getThumbnailIconByExtension } from "../../utils";
 import {
+    FileUploadField,
+    RenderCondtionalRadioList,
    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
+    RenderRichMultiline,
 } from "./representationElements";
+
 import { useDropzone } from "react-dropzone";
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";

 const RepInterestedPartyPerson = (props) => {
    let { t } = useTranslation();
@@ -20,278 +29,210 @@ const RepInterestedPartyPerson = (props) => {
        interestedPersonRepresentationArr,
        setRepresentationCapacity,
        setRepresentationSubmit,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
    } = props;
-    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
-    const files = acceptedFiles.map((file) => (
-        <li key={file.path}>
-            {file.path} - {file.size} bytes
-        </li>
-    ));
-    return (
-        <div id="rep-interested">
-            <div className="govuk-grid-column-full">
-                <div className="govuk-grid-row">
-                    <h2 className="govuk-heading-m ">
-                        Representation - interested
-                    </h2>
+    const required = (value) => (value ? undefined : "Required");

+    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
+
+    if (JSON.stringify(formObj) != "{}") {
+        setRepFileName(formObj.representationForm.values);
+
+        let filterFilesList = props.currentView.caseReference.hasOwnProperty(
+            "repDetails"
+        )
+            ? props.currentView.caseReference.repDetails.hasOwnProperty(
+                  "filesList"
+              )
+                ? props.currentView.caseReference.repDetails.filesList.filter(
+                      function (el) {
+                          return el != null;
+                      }
+                  )
+                : []
+            : [];
+
+        const files = acceptedFiles.map((file) => (
+            <li key={file.path}>
+                {file.path} - {file.size} bytes
+            </li>
+        ));
+        return (
+            <>
+                <div className="govuk-grid-row">
                    <div className="govuk-form-group">
-                        <label
-                            className="govuk-label govuk-body-m"
-                            htmlFor="representationType"
-                        >
-                            What kind of representation are you making?
-                        </label>
-                        <Field
-                            name="representationType"
-                            component={RenderPickList}
-                            datafieldname="representationType"
-                            optionsArr={interestedPersonRepresentationArr}
-                        />
+                        {typeof formObj.representationForm.values
+                            .representationType == "undefined" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <h2 className="govuk-heading-m ">
+                                    {t(
+                                        "myrepresentations:representation-from-an-interested-person-heading"
+                                    )}
+                                </h2>
+
+                                <label
+                                    className="govuk-label govuk-body-m"
+                                    htmlFor="representationType"
+                                >
+                                    {t("myrepresentations:kind-of-rep-label")}
+                                </label>
+
+                                <Field
+                                    name="representationType"
+                                    component={RenderPickList}
+                                    datafieldname="representationType"
+                                    validate={[required]}
+                                    optionsArr={
+                                        interestedPersonRepresentationArr
+                                    }
+                                    errorMsg={t(
+                                        "myrepresentations:select-an-option-label"
+                                    )}
+                                />
+                            </>
+                        ) : (
+                            <label className="govuk-label govuk-body-m">
+                                {t("myrepresentations:representation-type")}:{" "}
+                                {router.locale == "cy"
+                                    ? formObj.representationForm.values
+                                          .representationType == "Questionnaire"
+                                        ? "Holiadur"
+                                        : formObj.representationForm.values
+                                              .representationType == "Statement"
+                                        ? "Datganiad"
+                                        : formObj.representationForm.values
+                                              .representationType ==
+                                          "Final comments"
+                                        ? "Sylwadau terfynol"
+                                        : formObj.representationForm.values
+                                              .representationType
+                                    : formObj.representationForm.values
+                                          .representationType}
+                            </label>
+                        )}
                    </div>
                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-form-group">
-                        <Field
-                            className="govuk-input govuk-!-width-three-quarters"
-                            id="representationDescription"
-                            name="representationDescription"
-                            value="email"
-                            data-aria-controls="representationDescription"
-                            type="text"
-                            component={RenderTextfield}
-                            label="Description of representation"
-                        />
-                    </div>
-                    <div className="govuk-grid-row">
-                        <div className="govuk-form-group">
-                            <fieldset
-                                className="govuk-fieldset"
-                                aria-describedby="contact-hint"
-                            >
-                                <legend className="govuk-fieldset__legend govuk-fieldset__legend--l">
-                                    <label
-                                        className="govuk-fieldset__heading govuk-body-m"
-                                        id="representationCapacity_label"
-                                    >
-                                        Are you acting on behalf of a company,
-                                        group or organisation?
-                                    </label>
-                                </legend>
-                                <div id="contact-hint" className="govuk-hint">
-                                    e.g. &lsquo;Owners of Numbers 1-5 High
-                                    Street&lsquo;, or &lsquo;Mr and Mrs
-                                    Smith&lsquo; or &lsquo;The executors of Mr
-                                    Evans&lsquo; estate&lsquo;
-                                </div>
-                                <div
-                                    className="govuk-radios govuk-radios--conditional"
-                                    data-module="govuk-radios"
-                                >
-                                    <div className="govuk-radios__item">
-                                        <input
-                                            className="govuk-radios__input"
-                                            id="contact"
-                                            name="contact"
-                                            type="radio"
-                                            value="email"
-                                            data-aria-controls="conditional-contact"
-                                        />
-                                        <label
-                                            className="govuk-label govuk-radios__label"
-                                            htmlFor="contact"
-                                        >
-                                            Yes
-                                        </label>
-                                    </div>
-                                    <div
-                                        className="govuk-radios__conditional govuk-radios__conditional--hidden"
-                                        id="conditional-contact"
-                                    >
-                                        <div className="govuk-form-group">
-                                            <label
-                                                className="govuk-label"
-                                                htmlFor="contact-by-email"
-                                            >
-                                                Enter the name of the
-                                                company/group/organisation *
-                                            </label>
-                                            <input
-                                                className="govuk-input govuk-!-width-one-third"
-                                                id="contact-by-email"
-                                                name="contact-by-email"
-                                                type="email"
-                                                spellCheck="false"
-                                                autoComplete="email"
-                                            />
-                                        </div>
-                                    </div>
-                                    <div className="govuk-radios__item">
-                                        <input
-                                            className="govuk-radios__input"
-                                            id="contact-2"
-                                            name="contact"
-                                            type="radio"
-                                            value="phone"
-                                            data-aria-controls="conditional-contact-2"
-                                        />
-                                        <label
-                                            className="govuk-label govuk-radios__label"
-                                            htmlFor="contact-2"
-                                        >
-                                            No
-                                        </label>
-                                    </div>
-                                </div>
-                            </fieldset>
+                {(typeof props.representationType != "undefined" ||
+                    typeof formObj.representationForm.values
+                        .representationType != "undefined") && (
+                    <>
+                        <div className="govuk-grid-row">
+                            <div className="govuk-form-group">
+                                <Field
+                                    name="representationOnBehalfOf"
+                                    datafieldname="representationOnBehalfOf"
+                                    // label="In what capacity do you wish to make representations on this case?"
+                                    options={[
+                                        t(
+                                            "myrepresentations:questionnaire-yes"
+                                        ),
+                                        t("myrepresentations:questionnaire-no"),
+                                    ]}
+                                    id="representationOnBehalfOf"
+                                    className="govuk-radios__input"
+                                    errorMsg={t(
+                                        "myrepresentations:select-an-option-label"
+                                    )}
+                                    component={RenderCondtionalRadioList}
+                                    validate={[required]}
+                                    legend={t("case:representation-onbehalfof")}
+                                    hint={t(
+                                        "myrepresentations:representation-onbehalfof-hint"
+                                    )}
+                                />
+                            </div>
                        </div>
-                    </div>
-                    <div className="govuk-grid-row">
-                        <div className="govuk-form-group">
-                            <p className="govuk-body">
-                                You can enter your comments in the space
-                                provided or attach a separate document.
-                            </p>
-                            <fieldset
-                                className="govuk-fieldset"
-                                aria-describedby="commentBox-hint"
-                            >
-                                <div
-                                    id="commentBox-hint"
-                                    className="govuk-hint"
+
+                        <div className="govuk-grid-row">
+                            <div className="govuk-form-group">
+                                <p className="govuk-body">
+                                    {t("myrepresentations:enter-comment-label")}
+                                </p>
+                                <fieldset
+                                    className="govuk-fieldset"
+                                    aria-describedby="commentBox-hint"
                                >
-                                    My comments are set out in:*
-                                </div>
-                                <div
-                                    className="govuk-checkboxes"
-                                    data-module="govuk-checkboxes"
-                                >
-                                    <div className="govuk-checkboxes__item">
-                                        <Field
-                                            className="govuk-checkboxes__input"
-                                            id="commentBox"
-                                            name="commentBox"
-                                            value="email"
-                                            data-aria-controls="commentBox"
-                                            type="checkbox"
-                                            component={RenderTextfield}
-                                        />
-                                        <label
-                                            className="govuk-label govuk-checkboxes__label"
-                                            htmlFor="commentBox"
-                                        >
-                                            the box below{" "}
-                                        </label>
-                                    </div>
-                                    <div
-                                        className={
-                                            _.isEmpty(
-                                                formObj["representationForm"]
-                                            )
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                                : _.isEmpty(
-                                                      formObj[
-                                                          "representationForm"
-                                                      ].values
-                                                  )
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden q11 "
-                                                : _.isEmpty(
-                                                      formObj[
-                                                          "representationForm"
-                                                      ].values.commentBox
-                                                  )
-                                                ? formObj["representationForm"]
-                                                      .values.commentBox ==
-                                                  false
-                                                    ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                    : "govuk-checkboxes__conditional"
-                                                : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden wwwaqqqq"
-                                        }
-                                        id="conditional-commentBox"
+                                    {/* <div
+                                        id="commentBox-hint"
+                                        className="govuk-hint"
                                    >
-                                        <div className="govuk-form-group">
-                                            <Field
-                                                name="representationComments"
-                                                id="representationComments"
-                                                component={RenderMultiline}
-                                                type="text"
-                                                rows="5"
-                                                className="govuk-textarea govuk-input--width-30"
-                                                aria-describedby={
-                                                    props.name + "-hint"
-                                                }
-                                            />
-                                        </div>
-                                    </div>
-                                    <div className="govuk-checkboxes__item">
+                                        {t(
+                                            "myrepresentations:comments-set-out-label"
+                                        )}
+                                        :
+                                    </div> */}
+                                    <div className="govuk-form-group">
                                        <Field
-                                            className="govuk-checkboxes__input"
-                                            id="documentBox"
-                                            name="documentBox"
-                                            value="email"
-                                            data-aria-controls="documentBox"
-                                            type="checkbox"
-                                            component={RenderTextfield}
+                                            name="representationComments"
+                                            id="representationComments"
+                                            component={RenderRichMultiline}
+                                            type="text"
+                                            rows="5"
+                                            className="govuk-textarea govuk-input--width-30"
+                                            aria-describedby={
+                                                props.name + "-hint"
+                                            }
                                        />
-                                        <label
-                                            className="govuk-label govuk-checkboxes__label"
-                                            htmlFor="documentBox"
-                                        >
-                                            separate documents
-                                        </label>
                                    </div>
-                                    <div
-                                        className={
-                                            _.isEmpty(
-                                                formObj["representationForm"]
-                                            )
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                                : _.isEmpty(
-                                                      formObj[
-                                                          "representationForm"
-                                                      ].values
-                                                  )
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : _.isEmpty(
-                                                      formObj[
-                                                          "representationForm"
-                                                      ].values.documentBox
-                                                  )
-                                                ? formObj["representationForm"]
-                                                      .values.documentBox ==
-                                                  false
-                                                    ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                    : "govuk-checkboxes__conditional"
-                                                : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
-                                        }
-                                        id="conditional-documentBox"
-                                    >
-                                        <div className="govuk-form-group">
-                                            <section className="container">
-                                                <div
-                                                    {...getRootProps({
-                                                        className: "dropzone",
-                                                    })}
-                                                >
-                                                    <input
-                                                        {...getInputProps()}
-                                                    />
-                                                    <p>
-                                                        Drag and drop files here
-                                                        or click to select files
-                                                    </p>
-                                                </div>
-                                                <aside>
-                                                    <h4>Files</h4>
-                                                    <ul>{files}</ul>
-                                                </aside>
-                                            </section>
-                                        </div>
+
+                                    <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                        <FileUploadField
+                                            name={"representationDocuments"}
+                                            id={"representationDocuments"}
+                                            label={t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                            ticketnumber={
+                                                props.currentView.caseReference
+                                                    .ticketnumber
+                                            }
+                                            hint={"sdsd"}
+                                            fileList={
+                                                props.currentView.fileList
+
+                                                // props.currentView.caseReference.hasOwnProperty(
+                                                //     "repDetails"
+                                                // )
+                                                //     ? props.currentView.caseReference.repDetails.hasOwnProperty(
+                                                //           "filesList"
+                                                //       ) &&
+                                                //       props.currentView
+                                                //           .caseReference
+                                                //           .repDetails.filesList
+                                                //           .length > 0
+                                                //         ? props.currentView
+                                                //               .caseReference
+                                                //               .repDetails
+                                                //               .filesList
+                                                //         : []
+                                                //     : []
+                                            }
+                                            setFilesForRepresentations={
+                                                setFilesForRepresentations
+                                            }
+                                            containerID={
+                                                props.props.props.accountDetails
+                                                    .containerID
+                                            }
+                                            filenamePrefix={props.formObj}
+                                            props={props.props.props}
+                                            setCurrentReference={
+                                                props.setCurrentReference
+                                            }
+                                        />
                                    </div>
-                                </div>
-                            </fieldset>
-                        </div>{" "}
-                    </div>
+                                </fieldset>
+                            </div>{" "}
+                        </div>
+                    </>
+                )}
+                {typeof formObj.representationForm.values.representationType !=
+                    "undefined" && (
                    <div className="govuk-grid-row">
                        <div className="govuk-button-group">
                            <button
@@ -299,32 +240,92 @@ const RepInterestedPartyPerson = (props) => {
                                className="govuk-button"
                                data-module="govuk-button"
                            >
-                                Continue
+                                {t("common:continue-button")}
                            </button>
-                            {/* <Link href="/representation">
-                                <a
+                            {/* 
+                        <a
+                            onClick={() => {
+                                setRepresentationCapacity();
+                                props.updateField(
+                                    "representationForm",
+                                    "representationCapacity",
+                                    ""
+                                );
+                                props.updateField(
+                                    "representationForm",
+                                    "representationType",
+                                    ""
+                                );
+                            }}
+                            className="govuk-link"
+                        >
+                            {t("case:summary-back-button-label")}
+                        </a> */}
+                            {savingStatus ? (
+                                <span className=" progress-save-active">
+                                    {router.locale == "cy"
+                                        ? "Nôl data"
+                                        : "Saving data"}
+                                    <img
+                                        className="data-loading-icon"
+                                        src="/assets/images/loading.gif"
+                                        alt={
+                                            router.locale == "cy"
+                                                ? "Nôl data"
+                                                : "Saving data"
+                                        }
+                                    />
+                                </span>
+                            ) : (
+                                <button
+                                    className="govuk-button progress-save "
                                    onClick={() => {
-                                        setRepresentationSubmit(true);
+                                        let valuesObj =
+                                            props.props.props.form[props.form]
+                                                .values || {};
+
+                                        //console.log("valuesobj:", valuesObj);
+
+                                        delete valuesObj[
+                                            "_pinswg_appellant_value"
+                                        ];
+
+                                        //console.log("on save:", valuesObj);
+                                        updateRepresentation(
+                                            valuesObj,
+                                            false,
+                                            true
+                                        );
                                    }}
-                                    className="govuk-button"
                                >
-                                    Continue
-                                </a>
-                            </Link> */}
-                            <a
-                                onClick={() => {
-                                    setRepresentationCapacity();
-                                }}
-                                className="govuk-link"
-                            >
-                                Back
-                            </a>
+                                    {t("common:save-exit-button")}
+                                </button>
+                            )}
                        </div>
                    </div>
-                </div>
-            </div>
-        </div>
-    );
+                )}
+            </>
+        );
+    }
 };

-export default RepInterestedPartyPerson;
+//const mapStateToProps = (state, props) => {};
+
+const mapDispatchToProps = (dispatch) => ({
+    updateField: (form, field, newValue) =>
+        dispatch(change(form, field, newValue)),
+    setFilesForRepresentations: (fileList) => {
+        dispatch(setFilesForRepresentations(fileList));
+    },
+});
+
+export default connect(
+    null,
+    mapDispatchToProps
+)(
+    reduxForm({
+        form: "representationForm",
+        enableReinitialize: true,
+        destroyOnUnmount: false,
+    })(RepInterestedPartyPerson)
+);
@@ -0,0 +1,664 @@
+import { JSONPath as jsonpath } from "jsonpath-plus";
+import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import { useDropzone } from "react-dropzone";
+import { connect } from "react-redux";
+import { Field, change, formValueSelector, reduxForm } from "redux-form";
+import { useState, useEffect } from "react";
+
+import {
+    FileUploadField,
+    RenderMultiline,
+    RenderPickList,
+} from "./representationElements";
+import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement";
+import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78";
+import Enforcement_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_enforcement";
+import S78_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_s78";
+
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+    setCurrentPage,
+    setCurrentReference,
+} from "../../../store/currentView/action";
+
+let RepLPA = (props) => {
+    let { t } = useTranslation();
+    const router = useRouter();
+    const { locale } = router;
+    const {
+        onSubmit,
+        handleSubmit,
+        formObj,
+        appellantApplicantRepresentationArr,
+        setRepresentationCapacity,
+        setRepresentationSubmit,
+        currentView,
+        procedureTypeValue,
+        onBehalfOfLPA,
+        setShowQuestionnaireSection,
+        showQuestionnaireSection,
+        questionnaireCount,
+        setQuestionnaireCount,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
+    } = props;
+    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
+
+    const files = acceptedFiles.map((file) => (
+        <li key={file.path}>
+            {file.path} - {file.size} bytes
+        </li>
+    ));
+    const required = (value) => (value ? undefined : "Required");
+
+    const whichQuestionnaire = () => {
+        {
+            switch (currentView.caseReference.appealType) {
+                case 846040000:
+                case 846040001:
+                case 846040025:
+                case 846040004:
+                case 846040018:
+                case 846040003:
+                case 846040009:
+                case 846040008:
+                case 846040010:
+                case 846040017:
+                    return (
+                        <S78_Questionnaire
+                            questionnaireType={"s78"}
+                            props={props}
+                            containerID={
+                                props.props.props.accountDetails.containerID
+                            }
+                            currentView={currentView}
+                            showQuestionnaireSection={showQuestionnaireSection}
+                            setShowQuestionnaireSection={
+                                setShowQuestionnaireSection
+                            }
+                            questionnaireCount={questionnaireCount}
+                            setRepresentationSubmit={setRepresentationSubmit}
+                        />
+                    );
+                    break;
+
+                case 846040005:
+                case 846040006:
+                case 846040007:
+                    return (
+                        <Enforcement_Questionnaire
+                            questionnaireType={"enf"}
+                            props={props}
+                            containerID={
+                                props.props.props.accountDetails.containerID
+                            }
+                            currentView={currentView}
+                            showQuestionnaireSection={showQuestionnaireSection}
+                            setShowQuestionnaireSection={
+                                setShowQuestionnaireSection
+                            }
+                            questionnaireCount={questionnaireCount}
+                            setRepresentationSubmit={setRepresentationSubmit}
+                        />
+                    );
+                    break;
+                default:
+                    return <></>;
+                    break;
+            }
+        }
+    };
+
+    const whichProgress = () => {
+        {
+            switch (currentView.caseReference.appealType) {
+                case 846040000:
+                case 846040001:
+                case 846040025:
+                case 846040004:
+                case 846040018:
+                case 846040003:
+                case 846040009:
+                case 846040008:
+                case 846040010:
+                case 846040017:
+                    return (
+                        <RepresentationProgress_s78
+                            props={props}
+                            containerID={
+                                props.props.props.accountDetails.containerID
+                            }
+                            currentView={currentView}
+                            showQuestionnaireSection={showQuestionnaireSection}
+                            setShowQuestionnaireSection={
+                                setShowQuestionnaireSection
+                            }
+                        />
+                    );
+                    break;
+
+                case 846040005:
+                case 846040006:
+                case 846040007:
+                    return (
+                        <RepresentationProgress_enforcement
+                            props={props}
+                            containerID={
+                                props.props.props.accountDetails.containerID
+                            }
+                            currentView={currentView}
+                            showQuestionnaireSection={showQuestionnaireSection}
+                            setShowQuestionnaireSection={
+                                setShowQuestionnaireSection
+                            }
+                        />
+                    );
+                    break;
+                default:
+                    return <></>;
+                    break;
+            }
+        }
+    };
+
+    let setCaseDetailsObj = router.query.hasOwnProperty("state")
+        ? router.query.state == "edit"
+            ? props.props.myRepresentations.myRepresentations
+            : props.props.searchResultsObj.searchDetailsObj
+        : props.props.searchResultsObj.searchDetailsObj;
+
+    var detailsObj = {};
+
+    detailsObj = jsonpath({
+        path:
+            '$..[?(@ && @.pinswg_name=="' +
+            currentView.caseReference.currentReference +
+            '")]',
+        json: setCaseDetailsObj,
+        eval: true,
+    });
+
+    let setCaseResultssObj = router.query.hasOwnProperty("state")
+        ? router.query.state == "edit"
+            ? props.props.myRepresentations.myRepresentations
+            : props.props.searchResultsObj.searchResultsObj
+        : props.props.searchResultsObj.searchResultsObj;
+
+    detailsObj = detailsObj[0];
+
+    var resultsObj = {};
+
+    resultsObj = jsonpath({
+        path:
+            '$..[?@ && @.pinswg_name=="' +
+            currentView.caseReference.currentReference +
+            '")]',
+        json: setCaseResultssObj,
+        eval: true,
+    });
+    resultsObj = resultsObj[0];
+
+    props.formObj.hasOwnProperty("representationForm") &&
+        props.formObj["representationForm"].hasOwnProperty("values") &&
+        props.formObj["representationForm"].values.hasOwnProperty(
+            "representationCapacity"
+        ) &&
+        props.formObj["representationForm"].values.hasOwnProperty(
+            "representationType"
+        ) &&
+        setRepFileName(props.formObj["representationForm"].values);
+
+    let filesListObj =
+        props.formObj.hasOwnProperty("representationForm") &&
+        props.formObj["representationForm"].hasOwnProperty("values") &&
+        props.formObj["representationForm"].values.hasOwnProperty("filesList")
+            ? props.formObj["representationForm"].values.filesList
+            : {};
+
+    return (
+        <>
+            <div className="govuk-grid-row">
+                <div className="govuk-form-group">
+                    {!_.has(
+                        formObj["representationForm"],
+                        ["values", "representationType"] ||
+                            typeof props.currentView.caseReference.repDetails !=
+                                "undefined"
+                    ) ? (
+                        <>
+                            <label
+                                className="govuk-label govuk-body-m"
+                                htmlFor="representationType"
+                            >
+                                {t(
+                                    "myrepresentations:representation-from-an-lpa-heading"
+                                )}
+                            </label>
+                            <Field
+                                id="representationType"
+                                name="representationType"
+                                component={RenderPickList}
+                                datafieldname="representationType"
+                                optionsArr={appellantApplicantRepresentationArr}
+                            />
+                        </>
+                    ) : (
+                        <label className="govuk-label govuk-body-m">
+                            {t("myrepresentations:representation-type")}:{" "}
+                            {router.locale == "cy"
+                                ? formObj.representationForm.values
+                                      .representationType == "Questionnaire"
+                                    ? "Holiadur"
+                                    : formObj.representationForm.values
+                                          .representationType == "Statement"
+                                    ? "Datganiad"
+                                    : formObj.representationForm.values
+                                          .representationType ==
+                                      "Final comments"
+                                    ? "Sylwadau terfynol"
+                                    : formObj.representationForm.values
+                                          .representationType
+                                : formObj.representationForm.values
+                                      .representationType}
+                        </label>
+                    )}
+                </div>
+            </div>
+            <div className="govuk-grid-row">
+                <div className="govuk-form-group">
+                    {(_.has(formObj["representationForm"], [
+                        "values",
+                        "representationType",
+                    ]) ||
+                        typeof props.representationType != "undefined") &&
+                        (props.representationType != "Questionnaire" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <p className="govuk-body">
+                                    {t("myrepresentations:enter-comment-label")}
+                                </p>
+                                <fieldset
+                                    className="govuk-fieldset"
+                                    aria-describedby="commentBox-hint"
+                                >
+                                    {/* <div
+                                        id="commentBox-hint"
+                                        className="govuk-hint"
+                                    >
+                                        {t(
+                                            "myrepresentations:comments-set-out-label"
+                                        )}
+                                        :
+                                    </div> */}
+                                    <div className="govuk-form-group">
+                                        <Field
+                                            name="representationComments"
+                                            id="representationComments"
+                                            component={RenderMultiline}
+                                            type="text"
+                                            rows="5"
+                                            className="govuk-textarea govuk-input--width-30"
+                                            aria-describedby={
+                                                props.name + "-hint"
+                                            }
+                                        />
+                                    </div>
+                                </fieldset>
+                                <fieldset
+                                    className="govuk-fieldset govuk-!-margin-top-9"
+                                    aria-describedby="commentBox-hint"
+                                >
+                                    {" "}
+                                    <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                        {console.log(
+                                            "--------",
+                                            props.formObj.hasOwnProperty(
+                                                "representationForm"
+                                            ) &&
+                                                props.formObj[
+                                                    "representationForm"
+                                                ].hasOwnProperty("values") &&
+                                                props.formObj[
+                                                    "representationForm"
+                                                ].values.hasOwnProperty(
+                                                    "filesList"
+                                                )
+                                                ? props.props.props.form[
+                                                      "representationForm"
+                                                  ].values.filesList
+                                                : ""
+                                        )}
+                                        {/* {props.formObj.hasOwnProperty(
+                                            "representationForm"
+                                        ) &&
+                                            props.formObj[
+                                                "representationForm"
+                                            ].hasOwnProperty("values") &&
+                                            props.formObj[
+                                                "representationForm"
+                                            ].values.hasOwnProperty(
+                                                "filesList"
+                                            ) && ( */}
+                                        <FileUploadField
+                                            name={"representationDocuments"}
+                                            id={"representationDocuments"}
+                                            label={t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                            ticketnumber={
+                                                props.currentView.caseReference.ticketnumber
+                                            }
+                                            hint={"sdsd"}
+                                            fileList={
+                                                props.currentView.fileList
+                                                // (props.formObj.hasOwnProperty(
+                                                //     "representationForm"
+                                                // ) &&
+                                                //     props.formObj[
+                                                //         "representationForm"
+                                                //     ].hasOwnProperty(
+                                                //         "values"
+                                                //     ) &&
+                                                //     props.formObj[
+                                                //         "representationForm"
+                                                //     ].values.hasOwnProperty(
+                                                //         "filesList"
+                                                //     ) &&
+                                                //     props.props.props.form[
+                                                //         "representationForm"
+                                                //     ].values.filesList) ||
+                                                // []
+                                            }
+                                            setFilesForRepresentations={
+                                                setFilesForRepresentations
+                                            }
+                                            containerID={
+                                                props.props.props.accountDetails
+                                                    .containerID
+                                            }
+                                            filenamePrefix={props.formObj}
+                                            props={props.props.props}
+                                            setCurrentReference={
+                                                props.setCurrentReference
+                                            }
+                                        />
+                                        {/* // )} */}
+                                    </div>
+                                </fieldset>
+                            </>
+                        ) : (
+                            whichQuestionnaire()
+                        ))}
+                </div>{" "}
+            </div>
+            <div className="govuk-grid-row">
+                <div className="govuk-button-group">
+                    {(typeof props.representationType != "undefined" ||
+                        _.has(formObj, "values", "representationType")) &&
+                        props.representationType == "Questionnaire" && (
+                            <>
+                                {showQuestionnaireSection <
+                                    questionnaireCount && (
+                                    <button
+                                        type="submit"
+                                        className="govuk-button"
+                                        data-module="govuk-button"
+                                    >
+                                        {t("common:continue-button")}
+                                    </button>
+                                    // <a
+                                    //     href="#"
+                                    //     onClick={() => {
+                                    //         setShowQuestionnaireSection(
+                                    //             showQuestionnaireSection + 1
+                                    //         );
+                                    //     }}
+                                    //     className="govuk-button"
+                                    // >
+                                    //     Next section
+                                    // </a>
+                                )}
+                                {showQuestionnaireSection ==
+                                    questionnaireCount && (
+                                    <button
+                                        type="submit"
+                                        className="govuk-button"
+                                        data-module="govuk-button"
+                                    >
+                                        {t("common:continue-button")}
+                                    </button>
+                                )}
+                                {showQuestionnaireSection > 1 && (
+                                    <a
+                                        onClick={() => {
+                                            // window.scrollTo({
+                                            //     top: 0,
+                                            //     behavior: "smooth",
+                                            // });
+                                            setRepFileName(
+                                                props.formObj[
+                                                    "representationForm"
+                                                ].values
+                                            ),
+                                                setShowQuestionnaireSection(
+                                                    showQuestionnaireSection - 1
+                                                );
+                                        }}
+                                        className="govuk-link"
+                                    >
+                                        Back
+                                    </a>
+                                )}
+                                {savingStatus ? (
+                                    <span className=" progress-save-active">
+                                        {router.locale == "cy"
+                                            ? "Nôl data"
+                                            : "Saving data"}
+                                        <img
+                                            className="data-loading-icon"
+                                            src="/assets/images/loading.gif"
+                                            alt={
+                                                router.locale == "cy"
+                                                    ? "Nôl data"
+                                                    : "Saving data"
+                                            }
+                                        />
+                                    </span>
+                                ) : (
+                                    <button
+                                        className="govuk-button progress-save "
+                                        onClick={() => {
+                                            let valuesObj =
+                                                props.props.props.form[
+                                                    props.form
+                                                ].values || {};
+
+                                            // console.log(
+                                            //     "valuesobj:",
+                                            //     valuesObj
+                                            // );
+
+                                            delete valuesObj[
+                                                "_pinswg_appellant_value"
+                                            ];
+
+                                            //console.log("on save:", valuesObj);
+                                            updateRepresentation(
+                                                valuesObj,
+                                                false,
+                                                true
+                                            );
+                                        }}
+                                    >
+                                        {t("common:save-exit-button")}
+                                    </button>
+                                )}
+                            </>
+                        )}{" "}
+                    {(typeof props.representationType != "undefined" ||
+                        _.has(formObj, "values", "representationType")) &&
+                        props.representationType != "Questionnaire" && (
+                            <>
+                                <button
+                                    type="submit"
+                                    className="govuk-button"
+                                    data-module="govuk-button"
+                                    onClick={() => {
+                                        let valuesObj =
+                                            props.props.props.form[props.form]
+                                                .values || {};
+
+                                        //console.log("valuesobj:", valuesObj);
+
+                                        delete valuesObj[
+                                            "_pinswg_appellant_value"
+                                        ];
+
+                                        //console.log("on save:", valuesObj);
+                                        updateRepresentation(
+                                            valuesObj,
+                                            false,
+                                            false
+                                        );
+                                        setRepresentationSubmit(true);
+                                    }}
+                                >
+                                    {t("common:continue-button")}
+                                </button>
+                                {/* {router.query.state != "edit" && (
+                                    <a
+                                        onClick={() => {
+                                            //setRepresentationCapacity();
+                                            props.updateField(
+                                                "representationForm",
+                                                "representationType",
+                                                ""
+                                            );
+                                        }}
+                                        className="govuk-link"
+                                    >
+                                        {t("common:back-link")}www
+                                    </a>
+                                )} */}
+                                {savingStatus ? (
+                                    <span className=" progress-save-active">
+                                        {router.locale == "cy"
+                                            ? "Nôl data"
+                                            : "Saving data"}
+                                        <img
+                                            className="data-loading-icon"
+                                            src="/assets/images/loading.gif"
+                                            alt={
+                                                router.locale == "cy"
+                                                    ? "Nôl data"
+                                                    : "Saving data"
+                                            }
+                                        />
+                                    </span>
+                                ) : (
+                                    <button
+                                        className="govuk-button progress-save "
+                                        onClick={() => {
+                                            let valuesObj =
+                                                props.props.props.form[
+                                                    props.form
+                                                ].values || {};
+
+                                            // console.log(
+                                            //     "valuesobj:",
+                                            //     valuesObj
+                                            // );
+
+                                            delete valuesObj[
+                                                "_pinswg_appellant_value"
+                                            ];
+
+                                            //console.log("on save:", valuesObj);
+                                            updateRepresentation(
+                                                valuesObj,
+                                                false,
+                                                true
+                                            );
+                                        }}
+                                    >
+                                        {t("common:save-exit-button")}
+                                    </button>
+                                )}
+                            </>
+                        )}
+                </div>
+            </div>
+        </>
+    );
+};
+
+const selector = formValueSelector("representationForm"); // <-- same as form name
+
+RepLPA = connect((state) => {
+    const representationType = selector(state, "representationType");
+    const procedureType = selector(state, "procedureType");
+
+    return {
+        procedureType,
+        representationType,
+    };
+})(RepLPA);
+
+const mapDispatchToProps = (dispatch) => ({
+    updateField: (form, field, newValue) =>
+        dispatch(change(form, field, newValue)),
+
+    setFilesForRepresentations: (fileList) => {
+        dispatch(setFilesForRepresentations(fileList));
+    },
+    setCurrentReference: (currentReference) => {
+        dispatch(setCurrentReference(currentReference));
+    },
+});
+
+const mapStateToProps = (state, props) => {
+    let initialValuesTemp = Object.assign(
+        state.currentView.caseReference.hasOwnProperty("repDetails")
+            ? state.currentView.caseReference.repDetails
+            : state.currentView.caseReference,
+        {
+            "representationCapacity": "LPA",
+            "onBehalfOfLPA":
+                props.props.props.accountDetails.accountDetails[
+                    "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
+                ],
+            "firstname":
+                props.props.props.accountDetails.accountDetails.firstname,
+            "lastname":
+                props.props.props.accountDetails.accountDetails.lastname,
+        }
+    );
+    return {
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        currentView: state.currentView,
+        myRepresentations: state.myRepresentations,
+        watchedCases: state.watchedCases,
+        initialValues: initialValuesTemp,
+    };
+};
+
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(
+    reduxForm({
+        form: "representationForm",
+        enableReinitialize: true,
+        destroyOnUnmount: false,
+    })(RepLPA)
+);
@@ -0,0 +1,89 @@
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import { useDropzone } from "react-dropzone";
+import RepLPADetails from "./representationLPADetails";
+
+let RepLPACapacitySelection = (props) => {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    const {
+        formObj,
+        capacityOptionsArr,
+        currentType,
+        casesObj,
+        detailsObj,
+        validate,
+        handleSubmit,
+    } = props;
+    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
+    const files = acceptedFiles.map((file) => (
+        <li key={file.path}>
+            {file.path} - {file.size} bytes
+        </li>
+    ));
+
+    const required = (value) => (value ? undefined : "Required");
+
+    return (
+        <>
+            <RepLPADetails
+                formObj={formObj}
+                currentType={currentType}
+                casesObj={casesObj}
+                detailsObj={detailsObj}
+                caseReference={props.props.caseReference}
+                ticketnumber={props.props.ticketnumber}
+                searchResultsObj={props.props.searchResultsObj}
+                props={props.props}
+            />{" "}
+            <div id="rep-details" className="vo_hiddens">
+                <div className="govuk-grid-column-three-quarters">
+                    <div className="govuk-grid-row">
+                        {/* <h2 className="govuk-heading-m ">
+                            Your details - {props.firstValue}
+                        </h2> */}
+
+                        {/* <div className="">
+                            <label className="govuk-visually-hidden2">
+                                <Field
+                                    name="representationCapacity"
+                                    datafieldname="representationCapacity"
+                                    label={t("myrepresentations:capacity-select-what-capacity-label")}
+                                    options={["LPA"]}
+                                    id="representationCapacity"
+                                    //className="govuk-radios__input "
+                                    errorMsg={t(
+                                        "myrepresentations:select-an-option-label"
+                                    )}
+                                    component="input"
+                                    validate={[required]}
+                                    value="LPA"
+                                    checked={"true"}
+                                    type="radio"
+                                />
+                                LPA
+                            </label>
+                        </div> */}
+                    </div>
+                </div>
+                <div className="govuk-grid-row">
+                    <div className="govuk-grid-column-full">
+                        <div className="govuk-button-group">
+                            <button
+                                type="submit"
+                                className="govuk-button"
+                                data-module="govuk-button"
+                            >
+                                {t("common:continue-button")}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </>
+    );
+};
+
+export default RepLPACapacitySelection;
@@ -0,0 +1,64 @@
+import { connect } from "react-redux";
+import { Field, formValueSelector, reduxForm } from "redux-form";
+import { RenderMultiline } from "./representationElements";
+
+let RepLPAQuestionnaire = (props) => {
+    return (
+        <>
+            <p className="govuk-body">
+                {t("myrepresentations:enter-comment-label")}
+            </p>
+            <fieldset
+                className="govuk-fieldset"
+                aria-describedby="commentBox-hint"
+            >
+                {/* <div id="commentBox-hint" className="govuk-hint">
+                    {t("myrepresentations:comments-set-out-label")}:
+                </div> */}
+                <div className="govuk-form-group">
+                    <Field
+                        name="representationComments"
+                        id="representationComments"
+                        component={RenderMultiline}
+                        type="text"
+                        rows="5"
+                        className="govuk-textarea govuk-input--width-30"
+                        aria-describedby={props.name + "-hint"}
+                    />
+                </div>
+            </fieldset>
+        </>
+    );
+};
+
+const selector = formValueSelector("representationForm"); // <-- same as form name
+
+RepLPAQuestionnaire = connect((state) => {
+    const representationTypeValue = selector(state, "representationType");
+    const procedureTypeValue = selector(state, "procedureType");
+
+    return {
+        procedureTypeValue,
+        representationTypeValue,
+    };
+})(RepLPAQuestionnaire);
+
+const mapStateToProps = (state, props) => {
+    return {
+        search: state.search,
+        searchResultsObj: state.searchResultsObj,
+        formData: state.formData,
+        appealType: state.appealType,
+        currentView: state.currentView,
+        myRepresentations: state.myRepresentations,
+        initialValues: state.currentView.caseReference.repDetails,
+    };
+};
+
+export default connect(mapStateToProps)(
+    reduxForm({
+        form: "representationForm",
+        enableReinitialize: true,
+        destroyOnUnmount: false,
+    })(RepLPAQuestionnaire)
+);
@@ -0,0 +1,98 @@
+import { JSONPath as jsonpath } from "jsonpath-plus";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+
+const RepLPADetails = (props) => {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+
+    const { currentType, casesObj, caseReference, ticketnumber } = props;
+
+    let setCaseDetailsObj = router.query.hasOwnProperty("state")
+        ? router.query.state == "edit"
+            ? props.props.myRepresentations.myRepresentations
+            : props.searchResultsObj.searchDetailsObj
+        : props.currentType == "watchedCases"
+        ? props.props.props.watchedCases.watchedCasesDetails
+        : props.props.searchResultsObj.searchDetailsObj;
+
+    var detailsObj = {};
+
+    detailsObj = jsonpath({
+        path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
+        json: setCaseDetailsObj,
+        eval: true,
+    });
+
+    detailsObj = detailsObj[0];
+
+    return (
+        <>
+            {" "}
+            <div className="govuk-grid-column-full">
+                <div id="rep-sumamry" className="govuk-grid-row">
+                    <dl className="govuk-summary-list govuk-!-margin-bottom-9">
+                        <div className="govuk-summary-list__row">
+                            <dt className="govuk-summary-list__key">
+                                {t("case:summary-applicant-label")}
+                            </dt>
+                            <dd className="govuk-summary-list__value">
+                                {casesObj.appellantApplicant || ""}
+                                {detailsObj[
+                                    "_pinswg_appellant_value@OData.Community.Display.V1.FormattedValue"
+                                ] || "not entered"}
+                            </dd>
+                        </div>
+
+                        <div className="govuk-summary-list__row">
+                            <dt className="govuk-summary-list__key">
+                                {t("case:summary-site-address-label")}
+                            </dt>
+                            <dd className="govuk-summary-list__value">
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
+                                    ? detailsObj.pinswg_siteaddressline1
+                                    : ""}
+                                {_.has(detailsObj, "pinswg_siteaddressline1") &&
+                                    detailsObj.pinswg_siteaddressline1 !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddressline2")
+                                    ? detailsObj.pinswg_siteaddressline2
+                                    : ""}
+                                {_.has(detailsObj, "pinswg_siteaddressline2") &&
+                                    detailsObj.pinswg_siteaddressline2 !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddresstown")
+                                    ? detailsObj.pinswg_siteaddresstown
+                                    : ""}
+                                {_.has(detailsObj, "pinswg_siteaddresstown") &&
+                                    detailsObj.pinswg_siteaddresstown !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddresscounty")
+                                    ? detailsObj.pinswg_siteaddresscounty
+                                    : ""}
+                                {_.has(
+                                    detailsObj,
+                                    "pinswg_siteaddresscounty"
+                                ) &&
+                                    detailsObj.pinswg_siteaddresscounty !=
+                                        null && <br />}
+                                {_.has(detailsObj, "pinswg_siteaddresspostcode")
+                                    ? detailsObj.pinswg_siteaddresspostcode
+                                    : ""}
+                            </dd>
+                        </div>
+                    </dl>
+                </div>
+                <div className="govuk-grid-row">
+                    <p className="govuk-body">
+                        {t("myrepresentations:lpa-capacity-para-one")}
+                    </p>
+                </div>
+            </div>
+        </>
+    );
+};
+
+export default RepLPADetails;
@@ -1,18 +1,12 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
-import {
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
+import { useRouter } from "next/router";
 import { useDropzone } from "react-dropzone";
+import { Field } from "redux-form";
 import {
-    setRepresentationCapacity,
-    setRepresentationSubmit,
-} from "../../../store/currentView/action";
+    FileUploadField,
+    RenderPickList,
+    RenderRichMultiline,
+} from "./representationElements";

 const RepLandOwner = (props) => {
    let { t } = useTranslation();
@@ -37,7 +31,7 @@ const RepLandOwner = (props) => {
            <div className="govuk-grid-column-full">
                <div className="govuk-grid-row">
                    <h2 className="govuk-heading-m ">
-                        Representation - landowner
+                        Representation for a Land owner
                    </h2>

                    <div className="govuk-form-group">
@@ -45,7 +39,10 @@ const RepLandOwner = (props) => {
                            className="govuk-label govuk-body-m"
                            htmlFor="representationType"
                        >
-                            What kind of representation are you making?
+                            {t(
+                                "myrepresentations:representation-from-an-agent-heading"
+                            )}
+                            ?
                        </label>
                        <Field
                            name="representationType"
@@ -55,180 +52,78 @@ const RepLandOwner = (props) => {
                        />
                    </div>
                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-form-group">
-                        <Field
-                            className="govuk-input govuk-!-width-three-quarters"
-                            id="representationDescription"
-                            name="representationDescription"
-                            value="email"
-                            data-aria-controls="representationDescription"
-                            type="text"
-                            component={RenderTextfield}
-                            label="Description of representation"
-                        />
-                    </div>
-                </div>
+
                <div className="govuk-grid-row">
                    <div className="govuk-form-group">
                        <p className="govuk-body">
-                            You can enter your comments in the space provided or
-                            attach a separate document.
+                            {t("myrepresentations:enter-comment-label")}
                        </p>
                        <fieldset
                            className="govuk-fieldset"
                            aria-describedby="commentBox-hint"
                        >
-                            <div id="commentBox-hint" className="govuk-hint">
-                                My comments are set out in:*
+                            {/* <div id="commentBox-hint" className="govuk-hint">
+                                {t("myrepresentations:comments-set-out-label")}:
+                            </div> */}
+                            <div className="govuk-form-group">
+                                <Field
+                                    name="representationComments"
+                                    id="representationComments"
+                                    component={RenderRichMultiline}
+                                    type="text"
+                                    rows="5"
+                                    className="govuk-textarea govuk-input--width-30"
+                                    aria-describedby={props.name + "-hint"}
+                                />
                            </div>
-                            <div
-                                className="govuk-checkboxes"
-                                data-module="govuk-checkboxes"
-                            >
-                                <div className="govuk-checkboxes__item">
-                                    <Field
-                                        className="govuk-checkboxes__input"
-                                        id="commentBox"
-                                        name="commentBox"
-                                        value="email"
-                                        data-aria-controls="commentBox"
-                                        type="checkbox"
-                                        component={RenderTextfield}
-                                    />
-                                    <label
-                                        className="govuk-label govuk-checkboxes__label"
-                                        htmlFor="commentBox"
-                                    >
-                                        the box below{" "}
-                                    </label>
-                                </div>
-                                <div
-                                    className={
-                                        _.isEmpty(formObj["representationForm"])
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values
-                                              )
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden q11 "
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values.commentBox
-                                              )
-                                            ? formObj["representationForm"]
-                                                  .values.commentBox == false
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : "govuk-checkboxes__conditional"
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden wwwaqqqq"
+
+                            <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                <FileUploadField
+                                    name={"representationDocuments"}
+                                    id={"representationDocuments"}
+                                    label={t(
+                                        "myrepresentations:add-files-label"
+                                    )}
+                                    ticketnumber={
+                                        props.currentView.caseReference
+                                            .ticketnumber
                                    }
-                                    id="conditional-commentBox"
-                                >
-                                    <div className="govuk-form-group">
-                                        <Field
-                                            name="representationComments"
-                                            id="representationComments"
-                                            component={RenderMultiline}
-                                            type="text"
-                                            rows="5"
-                                            className="govuk-textarea govuk-input--width-30"
-                                            aria-describedby={
-                                                props.name + "-hint"
-                                            }
-                                        />
-                                    </div>
-                                </div>
-                                <div className="govuk-checkboxes__item">
-                                    <Field
-                                        className="govuk-checkboxes__input"
-                                        id="documentBox"
-                                        name="documentBox"
-                                        value="email"
-                                        data-aria-controls="documentBox"
-                                        type="checkbox"
-                                        component={RenderTextfield}
-                                    />
-                                    <label
-                                        className="govuk-label govuk-checkboxes__label"
-                                        htmlFor="documentBox"
-                                    >
-                                        separate documents
-                                    </label>
-                                </div>
-                                <div
-                                    className={
-                                        _.isEmpty(formObj["representationForm"])
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values
-                                              )
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                            : _.isEmpty(
-                                                  formObj["representationForm"]
-                                                      .values.documentBox
-                                              )
-                                            ? formObj["representationForm"]
-                                                  .values.documentBox == false
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
-                                                : "govuk-checkboxes__conditional"
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
+                                    hint={"sdsd"}
+                                    fileList={[]}
+                                    setFilesForRepresentation={[]}
+                                    containerID={
+                                        props.props.props.accountDetails
+                                            .containerID
                                    }
-                                    id="conditional-documentBox"
-                                >
-                                    <div className="govuk-form-group">
-                                        <section className="container">
-                                            <div
-                                                {...getRootProps({
-                                                    className: "dropzone",
-                                                })}
-                                            >
-                                                <input {...getInputProps()} />
-                                                <p>
-                                                    Drag and drop files here or
-                                                    click to select files
-                                                </p>
-                                            </div>
-                                            <aside>
-                                                <h4>Files</h4>
-                                                <ul>{files}</ul>
-                                            </aside>
-                                        </section>
-                                    </div>
-                                </div>
+                                />
                            </div>
                        </fieldset>
-                    </div>
+                    </div>{" "}
                </div>
-                <div className="govuk-grid-row">
-                    <div className="govuk-button-group">
-                        <button
-                            type="submit"
-                            className="govuk-button"
-                            data-module="govuk-button"
-                        >
-                            Continue
-                        </button>
-                        {/* <Link href="/representation">
-                            <a
-                                onClick={() => {
-                                    setRepresentationSubmit(true);
-                                }}
+                {typeof formObj.representationForm.values.representationType !=
+                    "undefined" && (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-button-group">
+                            <button
+                                type="submit"
                                className="govuk-button"
+                                data-module="govuk-button"
                            >
-                                Continue
-                            </a>
-                        </Link> */}
-                        <a
-                            onClick={() => {
-                                setRepresentationCapacity();
-                            }}
-                            className="govuk-link"
-                        >
-                            Back
-                        </a>
+                                {t("common:continue-button")}
+                            </button>
+                            {router.query.state != "edit" && (
+                                <a
+                                    onClick={() => {
+                                        setRepresentationCapacity();
+                                    }}
+                                    className="govuk-link"
+                                >
+                                    {t("common:back-link")}
+                                </a>
+                            )}
+                        </div>
                    </div>
-                </div>
+                )}
            </div>
        </div>
    );
@@ -0,0 +1,596 @@
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+
+const RepresentationProgress_enforcement = (props) => {
+    let { t } = useTranslation();
+    const router = useRouter();
+    const {
+        formObj,
+        appellantApplicantRepresentationArr,
+        setRepresentationCapacity,
+        setRepresentationSubmit,
+        currentView,
+        procedureTypeValue,
+        onBehalfOfLPA,
+        setShowQuestionnaireSection,
+        showQuestionnaireSection,
+    } = props;
+
+    return (
+        <nav role="navigation" aria-label="progress-list" className="at-nav">
+            <div
+                id="step-by-step-navigation"
+                data-module="gemstepnav"
+                className="app-step-nav  app-step-nav--active"
+                data-id="e01e924b-9c7c-4c71-8241-66a575c2f61f"
+                data-show-text="show"
+                data-hide-text="hide"
+                data-show-all-text="Show all"
+                data-hide-all-text="Hide all"
+            >
+                <ol className="app-step-nav__steps">
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 1
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-one")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            1
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(1);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-one"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-one"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 2
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-two")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            2
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(2);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-two"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-two"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 3
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-three")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            3
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(3);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-three"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-three"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 4
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-four")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            4
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(4);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-four"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-four"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 5
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-five")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            5
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(5);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-five"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-five"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 6
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-six")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            6
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(6);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-six"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-six"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>{" "}
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 7
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-seven")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            7
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(7);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-seven"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-five-sub"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 8
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:add-files-label")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            8
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(8);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:add-files-label"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 9
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:enf-section-heading-eight")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            9
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(9);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:enf-section-heading-eight"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:enf-section-heading-eight"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                </ol>
+            </div>
+        </nav>
+    );
+};
+
+export default RepresentationProgress_enforcement;
@@ -0,0 +1,473 @@
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+
+const RepresentationProgress_s78 = (props) => {
+    let { t } = useTranslation();
+    const router = useRouter();
+
+    const {
+        formObj,
+        appellantApplicantRepresentationArr,
+        setRepresentationCapacity,
+        setRepresentationSubmit,
+        currentView,
+        procedureTypeValue,
+        onBehalfOfLPA,
+        setShowQuestionnaireSection,
+        showQuestionnaireSection,
+    } = props;
+
+    return (
+        <nav role="navigation" aria-label="progress-list" className="at-nav">
+            <div
+                id="step-by-step-navigation"
+                data-module="gemstepnav"
+                className="app-step-nav  app-step-nav--active"
+                data-id="e01e924b-9c7c-4c71-8241-66a575c2f61f"
+                data-show-text="show"
+                data-hide-text="hide"
+                data-show-all-text="Show all"
+                data-hide-all-text="Hide all"
+            >
+                <ol className="app-step-nav__steps">
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 1
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-one")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            1
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(1);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:s78-section-heading-one"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-one"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 2
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-two")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            2
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(2);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:s78-section-heading-two"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-two"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 3
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-three")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            3
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(3);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:s78-section-heading-three"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-three"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 4
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-four")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            4
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(4);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:s78-section-heading-four"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-four"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 5
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-five")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            5
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(5);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:s78-section-heading-five"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-five-sub"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>{" "}
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 6
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-six")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            6
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(6);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:add-files-label"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                    <li
+                        className={
+                            "app-step-nav__step js-step app-step-nav__step--active" +
+                            (showQuestionnaireSection >= 7
+                                ? " sectionComplete"
+                                : " sectionIncomplete")
+                        }
+                        aria-current="step"
+                        data-show=""
+                        id={t("myrepresentations:s78-section-heading-seven")
+                            .replace(/\s+/g, "-")
+                            .toLowerCase()}
+                    >
+                        <div
+                            className="app-step-nav__header js-toggle-panel "
+                            data-position="1"
+                        >
+                            <h3 className="app-step-nav__title ">
+                                <span className="app-step-nav__circle app-step-nav__circle--number">
+                                    <span className="app-step-nav__circle-inner">
+                                        <span className="app-step-nav__circle-background">
+                                            <span className="app-step-nav__circle-step-label govuk-visually-hidden">
+                                                Step
+                                            </span>{" "}
+                                            7
+                                            <span
+                                                className="app-step-nav__circle-step-colon govuk-visually-hidden"
+                                                aria-hidden="true"
+                                            >
+                                                :
+                                            </span>
+                                        </span>
+                                    </span>
+                                </span>
+
+                                <span className="js-step-title">
+                                    <a
+                                        href="#"
+                                        onClick={() => {
+                                            setShowQuestionnaireSection(7);
+                                        }}
+                                        className="app-step-nav__button app-step-nav__button--title js-step-title-button"
+                                        aria-expanded="false"
+                                        aria-controls={
+                                            "step-panel-" +
+                                            t(
+                                                "myrepresentations:s78-section-heading-seven"
+                                            )
+                                                .replace(/\s+/g, "-")
+                                                .toLowerCase()
+                                        }
+                                    >
+                                        <span className="js-step-title-text govuk-!-font-size-16">
+                                            {t(
+                                                "myrepresentations:s78-section-heading-seven"
+                                            )}
+                                        </span>
+                                    </a>
+                                </span>
+                            </h3>
+                        </div>
+                    </li>
+                </ol>
+            </div>
+        </nav>
+    );
+};
+
+export default RepresentationProgress_s78;
@@ -1,15 +1,14 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useState, useEffect, useRef } from "react";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import { useEffect, useState } from "react";
+import { connect } from "react-redux";
 import transLookup from "../../data/lookuptranslations.json";
-import LoadingOverlay from "react-loading-overlay";
+
 import { getRepresentations } from "../../actions";
 import { setRepresentations } from "../../store/searchOutput/action";
-import PaginationControl from "./pagination";
+import { formatDates } from "../utils";

 const RepresentationList = (props) => {
    const { incidentid, representationsObj, setRepresentations } = props;
@@ -17,7 +16,7 @@ const RepresentationList = (props) => {

    const router = useRouter();
    const { locale } = router;
-    // const [showSpinnerState, setShowSpinnerState] = useState(false);
+    //const [showSpinnerState, setShowSpinnerState] = useState(false);

    // let spinnerState = () => {
    //     showSpinnerState == true
@@ -28,8 +27,6 @@ const RepresentationList = (props) => {
    var representationsArr = representationsObj || [];

    const RepresentationsView = (representationsArr) => {
-        //console.log(documentDetailsArr);
-
        representationsArr = representationsArr.value;
        return (
            <>
@@ -60,12 +57,14 @@ const RepresentationList = (props) => {
                    </div>

                    {representationsArr.map((item, key) => {
-                        let detailsObj = jsonpath.query(
-                            item,
-                            "$..[?(@.pinswg_representationsid=='" +
+                        let detailsObj = jsonpath({
+                            path:
+                                "$..[?(@ && @.pinswg_representationsid=='" +
                                incidentid +
-                                "')]"
-                        );
+                                "')]",
+                            json: item,
+                            eval: true,
+                        });
                        detailsObj = item;

                        console.log(detailsObj);
@@ -90,14 +89,16 @@ const RepresentationList = (props) => {
                                    </span>

                                    {router.locale == "cy"
-                                        ? jsonpath.query(
-                                              transLookup,
-                                              '$..[?(@.value=="' +
+                                        ? jsonpath({
+                                              path:
+                                                  '$..[?(@ && @.value=="' +
                                                  detailsObj[
                                                      "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                                  ] +
-                                                  '")].value_cy'
-                                          )
+                                                  '")].value_cy',
+                                              json: transLookup,
+                                              sanbox: {},
+                                          })
                                        : detailsObj[
                                              "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                          ] ||
@@ -129,12 +130,6 @@ const RepresentationList = (props) => {
                        );
                    })}
                </dl>
-                {/* <PaginationControl
-                    currentPage={currentPage}
-                    searchResultsObj={documentDetailsObj}
-                    // spinnerState={spinnerState}
-                    getDocumentResults={getDocumentResults}
-                /> */}
            </>
        );
    };
@@ -153,15 +148,6 @@ const RepresentationList = (props) => {
        const representationResultsObj = representationDetailsObj();
    }, [incidentid, setRepresentations]);

-    function formatDates(dateObj) {
-        var dateObj = new Date(dateObj);
-        var dd = String(dateObj.getDate()).padStart(2, "0");
-        var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
-        var yyyy = dateObj.getFullYear();
-
-        return dd + "/" + mm + "/" + yyyy;
-    }
-
    const pagesCount = Math.ceil(representationsObj["@odata.count"] / 10);

    let currentPage = 0;
@@ -224,11 +210,6 @@ const RepresentationList = (props) => {
                    </div>
                </div>
            </div>
-            {/* <LoadingOverlay
-                active={showSpinnerState}
-                spinner
-                text={t("common:spinner-searching")}
-            /> */}
        </>
    );
 };
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_advertsid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_advertsid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_advertsid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -43,20 +45,45 @@ const Pinswg_advertsid = (props) => {
                                              )}
                                    </dd>
                                </div>
+
+                                <div className="govuk-summary-list__row">
+                                    <dt className="govuk-summary-list__key">
+                                        Specialist Case Process
+                                    </dt>
+                                    <dd className="govuk-summary-list__value">
+                                        {router.locale == "cy"
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
+                                                      detailsObj[
+                                                          "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : detailsObj[
+                                                  "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue"
+                                              ] || ""}
+                                    </dd>
+                                </div>
+
                                <div className="govuk-summary-list__row">
                                    <dt className="govuk-summary-list__key">
                                        {t("case:summary-lpa-label")}
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +110,16 @@ const Pinswg_advertsid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +131,16 @@ const Pinswg_advertsid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +152,16 @@ const Pinswg_advertsid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -137,25 +170,28 @@ const Pinswg_advertsid = (props) => {
                                              )}
                                    </dd>
                                </div>
+
                                <div className="govuk-summary-list__row">
                                    <dt className="govuk-summary-list__key">
                                        {t("case:summary-decision-label")}
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +249,7 @@ const Pinswg_advertsid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_callinss77id = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_callinss77id = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_callinss77id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_callinss77id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_callinss77id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_callinss77id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_callinss77id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_callinss77id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_callinss77id = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -313,13 +325,13 @@ const Pinswg_callinss77id = (props) => {
                                    <dd className="govuk-summary-list__value">
                                        {_.has(
                                            detailsObj,
-                                            "pinswg_statementduedate"
+                                            "pinswg_statementsduedate"
                                        )
                                            ? !_.isEmpty(
-                                                  detailsObj.pinswg_statementduedate
+                                                  detailsObj.pinswg_statementsduedate
                                              )
                                                ? formatDates(
-                                                      detailsObj.pinswg_statementduedate
+                                                      detailsObj.pinswg_statementsduedate
                                                  )
                                                : t(
                                                      "case:summary-no-date-entered-label"
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_commonlandid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_commonlandid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -217,18 +229,22 @@ const Pinswg_commonlandid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -238,7 +254,7 @@ const Pinswg_commonlandid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -314,13 +330,13 @@ const Pinswg_commonlandid = (props) => {
                                    <dd className="govuk-summary-list__value">
                                        {_.has(
                                            detailsObj,
-                                            "pinswg_statementduedate"
+                                            "pinswg_statementsduedate"
                                        )
                                            ? !_.isEmpty(
-                                                  detailsObj.pinswg_statementduedate
+                                                  detailsObj.pinswg_statementsduedate
                                              )
                                                ? formatDates(
-                                                      detailsObj.pinswg_statementduedate
+                                                      detailsObj.pinswg_statementsduedate
                                                  )
                                                : t(
                                                      "case:summary-no-date-entered-label"
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_communityinfrastructurelevyid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_compulsorypurchaseordersid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -65,14 +67,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -84,14 +88,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -103,14 +109,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -125,19 +133,21 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -199,18 +209,22 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -220,7 +234,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,10 +1,7 @@
 import { useRouter } from "next/router";
-import Head from "next/head";
-import { useEffect, useRef, ReactElement } from "react";
-
+import { JSONPath as jsonpath } from "jsonpath-plus";
+import _ from "lodash";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
-import _, { round } from "lodash";
 import transLookup from "../../../data/lookuptranslations.json";

 import GoogleMapComponent from "../../mapping/";
@@ -18,8 +15,8 @@ const Pinswg_dnsid = (props) => {

    const router = useRouter();
    const { locale } = router;
-    const point = {};
-    const siteCoords = {};
+    let point = {};
+    let siteCoords = {};
    let center = {};

    point = new OSPoint(
@@ -111,7 +108,7 @@ const Pinswg_dnsid = (props) => {

            <div className="govuk-grid-row">
                <div className="flex-container grid-row govuk-body case">
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="case-details-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -125,14 +122,16 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -151,12 +150,14 @@ const Pinswg_dnsid = (props) => {
                                            </dt>
                                            <dd className="govuk-summary-list__value">
                                                {router.locale == "cy"
-                                                    ? jsonpath.query(
-                                                          transLookup,
-                                                          '$..[?(@.value=="' +
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
                                                              detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
-                                                      )
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                    : (
                                                          <a
                                                              target="_blank"
@@ -187,14 +188,16 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -206,14 +209,16 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -228,13 +233,13 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({path:
+                                                      
+                                                      '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "statuscode@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
+                                                          '")].value_cy',transLookup
                                                  )
                                                : casesObj[
                                                      "statuscode@OData.Community.Display.V1.FormattedValue"
@@ -267,14 +272,16 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -334,14 +341,16 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -433,11 +442,12 @@ const Pinswg_dnsid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({path:
+                                                      '$..[?(@ && @.value=="' +
                                                          detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
+                                                          '")].value_cy', 
+                                                          transLookup,
+
                                                  )
                                                : detailsObj.pinswg_recommendation}
                                        </dd>
@@ -446,7 +456,7 @@ const Pinswg_dnsid = (props) => {
                            </div>
                        </div>
                    </div>
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="key-dates-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_electricityactid = (props) => {
@@ -51,7 +51,7 @@ const Pinswg_electricityactid = (props) => {
            )}
            <div className="govuk-grid-row">
                <div className="flex-container grid-row govuk-body case">
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="case-details-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -65,14 +65,16 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -87,14 +89,16 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -123,14 +127,16 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -144,14 +150,16 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -163,14 +171,16 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "statuscode@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "statuscode@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -185,14 +195,16 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -259,12 +271,14 @@ const Pinswg_electricityactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj.pinswg_recommendation ||
                                                  t(
                                                      "case:summary-no-date-entered-label"
@@ -280,12 +294,14 @@ const Pinswg_electricityactid = (props) => {
                                            </dt>
                                            <dd className="govuk-summary-list__value">
                                                {router.locale == "cy"
-                                                    ? jsonpath.query(
-                                                          transLookup,
-                                                          '$..[?(@.value=="' +
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
                                                              detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
-                                                      )
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                    : detailsObj.pinswg_webaddress ||
                                                      t(
                                                          "case:summary-no-date-entered-label"
@@ -297,7 +313,7 @@ const Pinswg_electricityactid = (props) => {
                            </div>
                        </div>
                    </div>
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="key-dates-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_enforcementlistedbuildingconseid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_enforcementnoticeappeals174id = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_environmentalpermittingid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_environmentalpermittingid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -217,18 +229,22 @@ const Pinswg_environmentalpermittingid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -238,7 +254,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_harbourrevisionorderid = (props) => {
@@ -51,7 +51,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
            )}
            <div className="govuk-grid-row">
                <div className="flex-container grid-row govuk-body case">
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="case-details-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -65,14 +65,16 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -87,14 +89,16 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -123,14 +127,16 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                  ] || ""}
@@ -142,14 +148,16 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "statuscode@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "statuscode@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -164,19 +172,21 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj[
                                                              "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj[
                                                      "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
                                                  t(
-                                                      "case:summary-no-date-entered-label"
+                                                      "case:summary-no-information-to-date-label"
                                                  )}

                                            <br />
@@ -238,12 +248,14 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj.pinswg_recommendation ||
                                                  t(
                                                      "case:summary-no-date-entered-label"
@@ -259,12 +271,14 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                            </dt>
                                            <dd className="govuk-summary-list__value">
                                                {router.locale == "cy"
-                                                    ? jsonpath.query(
-                                                          transLookup,
-                                                          '$..[?(@.value=="' +
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
                                                              detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
-                                                      )
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                    : detailsObj.pinswg_webaddress ||
                                                      t(
                                                          "case:summary-no-date-entered-label"
@@ -276,7 +290,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                            </div>
                        </div>
                    </div>
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="key-dates-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -43,20 +45,45 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                              )}
                                    </dd>
                                </div>
+
+                                <div className="govuk-summary-list__row">
+                                    <dt className="govuk-summary-list__key">
+                                        Specialist Case Process
+                                    </dt>
+                                    <dd className="govuk-summary-list__value">
+                                        {router.locale == "cy"
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
+                                                      detailsObj[
+                                                          "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : detailsObj[
+                                                  "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue"
+                                              ] || ""}
+                                    </dd>
+                                </div>
+
                                <div className="govuk-summary-list__row">
                                    <dt className="govuk-summary-list__key">
                                        {t("case:summary-lpa-label")}
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +110,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +131,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +152,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +176,21 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -217,18 +252,22 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -238,7 +277,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_householderappealhasid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_householderappealhasid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_householderappealhasid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_householderappealhasid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_householderappealhasid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_householderappealhasid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -124,19 +132,21 @@ const Pinswg_householderappealhasid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -194,7 +204,7 @@ const Pinswg_householderappealhasid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -296,26 +306,26 @@ const Pinswg_householderappealhasid = (props) => {
                                    <dd className="govuk-summary-list__value">
                                        {_.has(
                                            detailsObj,
-                                            "pinswg_otherpartiesstatement"
+                                            "pinswg_otherpartiesstmt"
                                        )
                                            ? !_.isEmpty(
-                                                  detailsObj.pinswg_otherpartiesstatement
+                                                  detailsObj.pinswg_otherpartiesstmt
                                              )
                                                ? formatDates(
-                                                      detailsObj.pinswg_otherpartiesstatement
+                                                      detailsObj.pinswg_otherpartiesstmt
                                                  )
                                                : t(
                                                      "case:summary-no-date-entered-label"
                                                  )
                                            : _.has(
                                                  detailsObj,
-                                                  "pinswg_otherpartiesstatements"
+                                                  "pinswg_otherpartiesstmt"
                                              )
                                            ? !_.isEmpty(
-                                                  detailsObj.pinswg_otherpartiesstatements
+                                                  detailsObj.pinswg_otherpartiesstmt
                                              )
                                                ? formatDates(
-                                                      detailsObj.pinswg_otherpartiesstatements
+                                                      detailsObj.pinswg_otherpartiesstmt
                                                  )
                                                : t(
                                                      "case:summary-no-date-entered-label"
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_ldpid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_ldpid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_ldpid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_ldpid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_ldpid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_ldpid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_ldpid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_ldpid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_ldpid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_listedbuildingandconservationrid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_maintenanceoflands217id = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_miscellaneouscasewordid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -217,18 +229,22 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -238,7 +254,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_nonvalidationid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_nonvalidationid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_nonvalidationid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_nonvalidationid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,15 @@ const Pinswg_nonvalidationid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({path:
+                                                  '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                      eval: true,
+                                  })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +107,16 @@ const Pinswg_nonvalidationid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -124,19 +131,21 @@ const Pinswg_nonvalidationid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -152,7 +161,7 @@ const Pinswg_nonvalidationid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_planningappeals78id = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_planningappeals78id = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_planningappeals78id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_planningappeals78id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_planningappeals78id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,17 +108,22 @@ const Pinswg_planningappeals78id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
-                                              ] || ""}
+                                              ] ||
+                                              t(
+                                                  "case:summary-no-information-to-date-label"
+                                              )}
                                    </dd>
                                </div>
                                <div className="govuk-summary-list__row">
@@ -121,14 +132,16 @@ const Pinswg_planningappeals78id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +156,21 @@ const Pinswg_planningappeals78id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_dicision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_dicision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -236,7 +251,7 @@ const Pinswg_planningappeals78id = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_planningconditionss73s79id = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_planningobligationappeals106id = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -213,7 +225,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_rowid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_rowid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_rowid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -43,20 +45,45 @@ const Pinswg_rowid = (props) => {
                                              )}
                                    </dd>
                                </div>
+
+                                <div className="govuk-summary-list__row">
+                                    <dt className="govuk-summary-list__key">
+                                        Specialist Case Process
+                                    </dt>
+                                    <dd className="govuk-summary-list__value">
+                                        {router.locale == "cy"
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
+                                                      detailsObj[
+                                                          "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : detailsObj[
+                                                  "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue"
+                                              ] || ""}
+                                    </dd>
+                                </div>
+
                                <div className="govuk-summary-list__row">
                                    <dt className="govuk-summary-list__key">
                                        {t("case:summary-lpa-label")}
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +110,16 @@ const Pinswg_rowid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +131,16 @@ const Pinswg_rowid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +152,16 @@ const Pinswg_rowid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +176,21 @@ const Pinswg_rowid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -217,18 +252,22 @@ const Pinswg_rowid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -238,7 +277,7 @@ const Pinswg_rowid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_transportandworkactid = (props) => {
@@ -51,7 +51,7 @@ const Pinswg_transportandworkactid = (props) => {
            )}
            <div className="govuk-grid-row">
                <div className="flex-container grid-row govuk-body case">
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="case-details-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -65,14 +65,16 @@ const Pinswg_transportandworkactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          casesObj[
                                                              "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                          ] +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : casesObj[
                                                      "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                  ] ||
@@ -90,12 +92,14 @@ const Pinswg_transportandworkactid = (props) => {
                                        </dt>
                                        <dd className="govuk-summary-list__value">
                                            {router.locale == "cy"
-                                                ? jsonpath.query(
-                                                      transLookup,
-                                                      '$..[?(@.value=="' +
+                                                ? jsonpath({
+                                                      path:
+                                                          '$..[?(@ && @.value=="' +
                                                          detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
-                                                  )
+                                                          '")].value_cy',
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                : detailsObj.pinswg_recommendation ||
                                                  t(
                                                      "case:summary-no-date-entered-label"
@@ -111,12 +115,14 @@ const Pinswg_transportandworkactid = (props) => {
                                            </dt>
                                            <dd className="govuk-summary-list__value">
                                                {router.locale == "cy"
-                                                    ? jsonpath.query(
-                                                          transLookup,
-                                                          '$..[?(@.value=="' +
+                                                    ? jsonpath({
+                                                          path:
+                                                              '$..[?(@ && @.value=="' +
                                                              detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
-                                                      )
+                                                              '")].value_cy',
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                    : detailsObj.pinswg_webaddress ||
                                                      t(
                                                          "case:summary-no-date-entered-label"
@@ -128,7 +134,7 @@ const Pinswg_transportandworkactid = (props) => {
                            </div>
                        </div>
                    </div>
-                    <div className="card" id="casescomment-card">
+                    <div className="card" id="key-dates-card">
                        <div className="card-body">
                            <div className="govuk-grid-column-full">
                                <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
+import { JSONPath as jsonpath } from "jsonpath-plus";
 import _ from "lodash";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import transLookup from "../../../data/lookuptranslations.json";

 const Pinswg_wayleaveid = (props) => {
@@ -13,7 +13,7 @@ const Pinswg_wayleaveid = (props) => {
    return (
        <div className="govuk-grid-row">
            <div className="flex-container grid-row govuk-body case">
-                <div className="card" id="casescomment-card">
+                <div className="card" id="case-details-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h2 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -27,14 +27,16 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -49,14 +51,16 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -83,14 +87,16 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -102,14 +108,16 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                              ] || ""}
@@ -121,14 +129,16 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      casesObj[
                                                          "statuscode@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : casesObj[
                                                  "statuscode@OData.Community.Display.V1.FormattedValue"
                                              ] ||
@@ -143,19 +153,21 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.value=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.value=="' +
                                                      detailsObj[
                                                          "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                      ] +
-                                                      '")].value_cy'
-                                              )
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
                                            : detailsObj[
                                                  "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                              ] ||
                                              t(
-                                                  "case:summary-no-date-entered-label"
+                                                  "case:summary-no-information-to-date-label"
                                              )}

                                        <br />
@@ -217,18 +229,22 @@ const Pinswg_wayleaveid = (props) => {
                                    </dt>
                                    <dd className="govuk-summary-list__value">
                                        {router.locale == "cy"
-                                            ? jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            ? jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
-                                              )
-                                            : jsonpath.query(
-                                                  transLookup,
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '")].value_cy',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              })
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                      detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
-                                              ) ||
+                                                      '")].value',
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                              t(
                                                  "case:summary-no-date-entered-label"
                                              )}
@@ -238,7 +254,7 @@ const Pinswg_wayleaveid = (props) => {
                        </div>
                    </div>
                </div>
-                <div className="card" id="casescomment-card">
+                <div className="card" id="key-dates-card">
                    <div className="card-body">
                        <div className="govuk-grid-column-full">
                            <h3 className="govuk-heading-m govuk-!-margin-bottom-7">
@@ -0,0 +1,94 @@
+import { signOut } from "next-auth/react";
+import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
+import { useState, useEffect } from "react";
+import { destroyCookie, parseCookies, setCookie } from "nookies";
+import { signIn, useSession } from "next-auth/react";
+
+const WatchModal = (props) => {
+    let { t } = useTranslation();
+
+    const { isOpen, onClose } = props;
+
+    const currentType = props.currentType;
+    const casesObj = props.casesObj;
+    const { data: session, status } = useSession();
+    const router = useRouter();
+    const { locale } = router;
+
+    let now = new Date();
+    let expDate = new Date(now);
+
+    expDate.setDate(now.getDate() + 365);
+
+    if (!isOpen) return null;
+
+    return (
+        <>
+            <div
+                className={open ? "modal fade show" : "modal fade"}
+                style={{
+                    display: open ? "flex" : "none",
+                }}
+            >
+                <div className="modal-dialog">
+                    <div className="modal-content">
+                        <h3>Watch case</h3>
+                        <p className="govuk-body">
+                            {!session
+                                ? "  You will now be signed in to watch this case"
+                                : " you are logged in already"}
+                        </p>
+                        <div className="govuk-checkboxes__item">
+                            <input
+                                className="govuk-checkboxes__input"
+                                type="checkbox"
+                                name="addInvolvement"
+                            />
+                            <label
+                                className="govuk-label-s govuk-checkboxes__label"
+                                htmlFor="addInvolvement"
+                            >
+                                {} Yes, I want you want to be emailed updates
+                                for case
+                                <div> {casesObj.title}</div>
+                            </label>
+                        </div>
+                        <div>
+                            <button
+                                className="govuk-button"
+                                onClick={() => {
+                                    setCookie(
+                                        null,
+                                        "pedwWatchCase",
+                                        currentType == "searchResultsObj"
+                                            ? detailsObj.pinswg_name
+                                            : currentType == "directResultsObj"
+                                            ? casesObj.title
+                                            : casesObj.reference,
+                                        {
+                                            path: "/",
+                                            expires: expDate,
+                                        }
+                                    ),
+                                        signIn();
+                                }}
+                            >
+                                Yes
+                            </button>{" "}
+                            <button
+                                className="govuk-button govuk-button--secondary"
+                                onClick={onClose}
+                            >
+                                No
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <div className="modal-backdrop fade show"></div>
+            </div>
+        </>
+    );
+};
+
+export default WatchModal;
@@ -1,8 +1,6 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useContext } from "react";
-import useTranslation from "next-translate/useTranslation";
-import SearchForCase from "./search/searchforcase";
 import SearchResults from "./search/searchresults";

 export default function Search({ children, pages }) {
@@ -25,17 +23,14 @@ export default function Search({ children, pages }) {
            <div className="govuk-grid-row">
                <div className="govuk-grid-column-full">
                    <div className="govuk-button-group">
-                        <Link href="/advancedsearch">
-                            <a className="govuk-button">
-                                {t("search:searchresults-search-button-label")}
-                            </a>
+                        <Link href="/advancedsearch" className="govuk-button">
+                            {t("search:searchresults-search-button-label")}
                        </Link>
-                        <Link href="/advancedsearch">
-                            <a className="govuk-button govuk-button--secondary">
-                                {t(
-                                    "search:searchresults-new-search-button-label"
-                                )}
-                            </a>
+                        <Link
+                            href="/advancedsearch"
+                            className="govuk-button govuk-button--secondary"
+                        >
+                            {t("search:searchresults-new-search-button-label")}
                        </Link>
                    </div>
                </div>
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";
 import BuildCheckSection from "./newappeal/buildchecksection";

 const CheckAnswers = (props) => {
@@ -19,7 +17,6 @@ const CheckAnswers = (props) => {
            id="main-content"
            role="main"
        >
-            sss
            <BuildCheckSection
                formXML={formXML}
                sectionCount={sectionCount}
@@ -1,9 +1,9 @@
-import CookieConsent from "react-cookie-consent";
+import cookie from "cookie-cutter";
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";
-import cookie from "cookie-cutter";
-import { useState, useEffect } from "react";
+import { useState } from "react";
+import { CookieConsent } from "react-cookie-consent";

 const CookieBanner = () => {
    let { t, lang } = useTranslation();
@@ -26,6 +26,7 @@ const CookieBanner = () => {
            "usage": "accepted",
            "communications": "accepted",
            "settings": "accepted",
+            "analytics_storage": "granted",
        };

        cookie.set("CookiePolicy", JSON.stringify(cookieStr).toString(), {
@@ -117,14 +118,13 @@ const CookieBanner = () => {
                                {t("common:cookie-banner-accept")}
                            </button>

-                            <Link href="/help/cookies">
-                                <a
-                                    className="cookies-banner__button govuk-link--no-underline"
-                                    id="rcc-decline-button"
-                                    aria-label="Decline cookies"
-                                >
-                                    {t("common:cookie-banner-change-settings")}
-                                </a>
+                            <Link
+                                href="/help/cookies"
+                                className="cookies-banner__button govuk-link--no-underline"
+                                id="rcc-decline-button"
+                                aria-label="Decline cookies"
+                            >
+                                {t("common:cookie-banner-change-settings")}
                            </Link>
                        </div>
                    </div>
@@ -1,6 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";

 const CookiePolicy = (props) => {
    let { t } = useTranslation();
@@ -1,10 +1,10 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useContext, useEffect, useState } from "react";
-import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
-import { parseCookies, setCookie, destroyCookie } from "nookies";
+import { parseCookies } from "nookies";
+import { useState } from "react";
 import { connect } from "react-redux";
+import { reduxForm } from "redux-form";

 import cookie from "cookie-cutter";

@@ -20,6 +20,8 @@ const CookieManagementMain = (props) => {
        Object.assign(values, {
            "essential": "accepted",
            "usage": usageState,
+            "analytics_storage":
+                usageState == "accepted" ? "granted" : "denied",
            // "communications": communicationsState,
            "settings": settingsState,
        });
@@ -65,7 +67,7 @@ const CookieManagementMain = (props) => {
    const [usageState, setUsageState] = useState(
        typeof cookieCheck.CookiePolicy == "undefined" ? null : cookieObj.usage
    );
-    // const [communicationsState, setCommunicationsState] = useState(
+    //const [communicationsState, setCommunicationsState] = useState(
    //     typeof cookieCheck.CookiePolicy == "undefined"
    //         ? null
    //         : cookieObj.communications
@@ -431,12 +433,11 @@ const CookieManagementMain = (props) => {
                                                href={t(
                                                    "cookies:cookie-settings-essential-link"
                                                )}
+                                                className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold"
                                            >
-                                                <a className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold">
-                                                    {t(
-                                                        "cookies:cookie-settings-essential-link-label"
-                                                    )}
-                                                </a>
+                                                {t(
+                                                    "cookies:cookie-settings-essential-link-label"
+                                                )}
                                            </Link>
                                        </p>
                                    </legend>
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { DiagConsoleLogger } from "@opentelemetry/api";
+import { useRouter } from "next/router";

 const CRMError = (props) => {
    let { t } = useTranslation();
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";

 const ApplicationSideBar = (props) => {
    let { t } = useTranslation();
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";

 const ApplicationSummary = (props) => {
    let { t } = useTranslation();
@@ -1,13 +1,11 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
-import { useState } from "react";
 import useTranslation from "next-translate/useTranslation";
-import ApplicationTabsTimeLine from "./applicationTabsTimeline";
+import { useRouter } from "next/router";
+import { useState } from "react";
 import ApplicationSideBar from "./applicationSideBar";
-import ApplicationTabsDocuments from "./applicationTabsDocuments";
 import ApplicationTabsComments from "./applicationTabsComments";
+import ApplicationTabsDocuments from "./applicationTabsDocuments";
 import ApplicationTabsRegistrationForm from "./applicationTabsRegistrationForm";
+import ApplicationTabsTimeLine from "./applicationTabsTimeline";

 const ApplicationTabs = (props) => {
    let { t } = useTranslation();
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";

 const ApplicationTabsComments = (props) => {
    let { t } = useTranslation();
@@ -1,12 +1,11 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useContext } from "react";
-import useTranslation from "next-translate/useTranslation";
 import {
    Accordion,
    AccordionItem,
-    AccordionItemHeading,
    AccordionItemButton,
+    AccordionItemHeading,
    AccordionItemPanel,
 } from "react-accessible-accordion";
 // import "react-accessible-accordion/dist/fancy-example.css";
@@ -133,7 +132,7 @@ const ApplicationTabsDocuments = (props) => {
                        </div>

                        <div className=" govuk-grid-column-two-thirds govuk-form-group">
-                            <label className="govuk-label-xs " htmlFor="sort">
+                            <label className="govuk-label-xs " htmlFor="showNo">
                                Show{" "}
                                <select
                                    className="govuk-select govuk-select-s"
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";

 const ApplicationTabsRegistrationForm = (props) => {
    let { t } = useTranslation();
@@ -1,7 +1,5 @@
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { useContext } from "react";
 import useTranslation from "next-translate/useTranslation";
+import { useRouter } from "next/router";

 const ApplicationTabsTimeLine = (props) => {
    let { t } = useTranslation();
@@ -1,7 +1,6 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useContext } from "react";
-import useTranslation from "next-translate/useTranslation";

 const ApplicationIntro = (props) => {
    let { t } = useTranslation();
@@ -27,10 +26,8 @@ const ApplicationIntro = (props) => {
                </ul>
                <p className="govuk-body">
                    {t("dnsApplications:page-intro-paragraph-2")}{" "}
-                    <Link href="/dns/calendar">
-                        <a className="govuk-link">
-                            {t("dnsApplications:page-intro-paragraph-2-link")}
-                        </a>
+                    <Link href="/dns/calendar" className="govuk-link">
+                        {t("dnsApplications:page-intro-paragraph-2-link")}
                    </Link>
                    .
                </p>
@@ -1,7 +1,6 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { useContext } from "react";
-import useTranslation from "next-translate/useTranslation";

 const ApplicationList = (props) => {
    let { t } = useTranslation();
@@ -14,7 +13,7 @@ const ApplicationList = (props) => {
            <div className="govuk-grid-row govuk-!-margin-top-9">
                <div className="govuk-grid-column-full">
                    <div className="govuk-form-group">
-                        <label className="govuk-label-s " htmlFor="sort">
+                        <label className="govuk-label-s " htmlFor="showNo">
                            {t("dnsCommon:result-list-show-label")}{" "}
                            <select
                                className="govuk-select"
@@ -84,15 +83,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -135,15 +132,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -186,15 +181,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -237,15 +230,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -288,15 +279,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -339,15 +328,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -390,15 +377,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -441,15 +426,13 @@ const ApplicationList = (props) => {
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                <Link href="/dns/application-view">
-                                    <a>
-                                        <span className="results-visually-hidden">
-                                            {t(
-                                                "dnsApplications:result-list-heading-label-application"
-                                            )}
-                                            :{" "}
-                                        </span>
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
                                </Link>
                            </dd>
                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -500,7 +483,7 @@ const ApplicationList = (props) => {
                        <span>
                            <Link href="#">5</Link>
                        </span>{" "}
-                        <Link href="#">
+                        <Link href="#" legacyBehavior>
                            {t("dnsCommon:result-list-next-label")}
                        </Link>
                    </p>
@@ -1,6 +1,6 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";

 const ApplicationsForComment = (props) => {
    let { t } = useTranslation();
@@ -15,10 +15,11 @@ const ApplicationsForComment = (props) => {
            <div className="govuk-panel__body">
                <ul className="govuk-list">
                    <li>
-                        <Link href="/dns/application-view">
-                            <a className="govuk-body-s ">
-                                Holyhead Harbour Revision Order
-                            </a>
+                        <Link
+                            href="/dns/application-view"
+                            className="govuk-body-s "
+                        >
+                            Holyhead Harbour Revision Order
                        </Link>
                    </li>
                </ul>
@@ -1,6 +1,6 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";

 const DNSLinks = (props) => {
    let { t } = useTranslation();
@@ -13,10 +13,11 @@ const DNSLinks = (props) => {
                <ul className="govuk-list">
                    <li>
                        <h3 className="govuk-heading-l govuk-!-font-size-27">
-                            <Link href="/dnsapplications">
-                                <a className="govuk-link govuk-link--no-underline">
-                                    {t("dnsHome:links-applications-title")}
-                                </a>
+                            <Link
+                                href="/dnsapplications"
+                                className="govuk-link govuk-link--no-underline"
+                            >
+                                {t("dnsHome:links-applications-title")}
                            </Link>
                            <p className="govuk-body-s govuk-!-padding-top-2">
                                {t(
@@ -43,10 +44,11 @@ const DNSLinks = (props) => {
                <ul className="govuk-list">
                    <li>
                        <h3 className="govuk-heading-l govuk-!-font-size-27">
-                            <Link href="https://gov.wales/developments-national-significance-dns-guidance">
-                                <a className="govuk-link govuk-link--no-underline ">
-                                    {t("dnsHome:links-help-title")}
-                                </a>
+                            <Link
+                                href="https://gov.wales/developments-national-significance-dns-guidance"
+                                className="govuk-link govuk-link--no-underline "
+                            >
+                                {t("dnsHome:links-help-title")}
                            </Link>
                            <p className="govuk-body-s govuk-!-padding-top-2">
                                {t("dnsHome:links-guidance-intro-paragraph")}
@@ -1,10 +1,10 @@
+import useTranslation from "next-translate/useTranslation";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import useTranslation from "next-translate/useTranslation";

 const LatestApplications = (props) => {
    let { t } = useTranslation();
-    const { dnsList } = props;
+    let { dnsList } = props;

    dnsList = dnsList.value;
    let dnsListArr = dnsList.slice(0, 3);
@@ -33,7 +33,7 @@ const LatestApplications = (props) => {
                                                  .join("-"))
                                    }
                                >
-                                    <a>{dnsList[key].title}</a>
+                                    {dnsList[key].title}
                                </Link>
                            </li>
                        );
--- a/Show More
+++ b/Show More