17143 pref lang abck in

Related work items: #17169

.env old.local

@@ -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

.env.local

@@ -1,118 +1,149 @@
 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"
+
+# //New Dev oauth ESNR
+# CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
+# 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"
 
 
-//Dev oauth ESNR
+# //Prod Oauth WGO
-CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a
+# CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
-//CLIENT_SECRET = 4Vt8Q~olL1hx7n01B0~tXf-N2YL5DyC_Fk6waagX
+# CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR
-CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE
+# RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
-RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
+# RELAYURI = "prod-pedw-ns.servicebus.windows.net"
-RELAYURI = "dev-pedw-ns.servicebus.windows.net"
+# RELAYPATH = "prod-pedw-hc"
-RELAYPATH = "dev-pedw-hc"
+# CRMURL = "crm2016.llc.gov.wales/PEDW"
 
 
-//Test Oauth ESNR
+//GOOGLE_TAG_MANAGER = GTM-T78CBC3
-//CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
+GOOGLE_TAG_MANAGER = G-GTWW3JT03Z
-//CLIENT_SECRET = IXI8Q~D5oqsC-nrtayHHc~tUAfjQFzNiKVQ~fc2S
+SHOWLOGIN = true
-//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
+SHOWREPRESENTATIONS = true 
-//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 = false
 SHOWFILEUPLOAD = "false"
-SHOWMAPS = "true"
+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"
+CY_API_ROOT = "http://cymru.local:3000"
+I18N_DOMAIN = "cymru.local"
+DOCAPI_OFFLINE = "12:00:00,14:00:00"
+SHOWFILTERDOCS = false
 
 
-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
+
+// 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
+
+// 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
 
 
+SECRET = SuperSecret
 
-//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_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
 
 
-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

.eslintrc

@@ -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"
+  //               }
+  //               ]
+  //           }
+  //       ]
+  //   }
+  // }
+  // ]
+
 }
 
 

.gitignore

@@ -13,7 +13,29 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.yarn
 
 #lock files
-yarn.lock
+# yarn.lock
-package-lock.json
+# 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
+
+# certs
+certificates/*

.vscode/launch.json

@@ -5,11 +5,17 @@
     "version": "0.2.0",
     "configurations": [
         { 
+            "name": "Next.js: debug server-side",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "yarn run dev"
+        },
+        {"name": "Launch Chrome against localhost",
             "type": "pwa-chrome",
             "request": "launch",
-            "name": "Launch Chrome against localhost",
             "url": "http://localhost:3000",
             "webRoot": "${workspaceFolder}"
         }
+        
     ]
 }

actions/govgateway.js

@@ -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;
-    },
-};

actions/selectQueryTypes.js

@@ -1,63 +1,88 @@
 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_detailedeiascreeningrequired,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=pinswg_eiarequired,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";
             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=pinswg_detailedeiascreeningrequired,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=pinswg_detailedeiascreeningrequired,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_detailedeiascreening,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":
+            return "&$select=pinswg_eiarequired,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_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=pinswg_detailedeiascreening,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=pinswg_detailedeiascreeningrequired,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=pinswg_detailedeiascreening,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";
+            return "&$select=pinswg_eiarequired,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=pinswg_eiarequired,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_harbourrevisionorders":
+            return "&$select=pinswg_eiarequired,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_projectdiscription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdate,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_casestage,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=pinswg_eiarequired,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=pinswg_eiarequired,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=pinswg_detailedeiascreeningrequired,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=pinswg_detailedeiascreeningrequired,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=pinswg_detailedeiascreeningrequiered,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=pinswg_detailedeiascreeningrequiered,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=pinswg_eiarequired,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=pinswg_eiarequired,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=pinswg_detailedeiascreeningrequiered,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=pinswg_detailedeiascreeningrequired,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_detailedeiascreeningrequired,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=pinswg_eiarequired,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;
+        case "pinswg_transportandworkacts":
+            return "&$select=pinswg_eiarequired,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_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdate,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_casestage,pinswg_startdateofevent,pinswg_typeofevent";
+        case "pinswg_sipses":
+            // 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";
+            return "&$select=_pinswg_projecttype_value,pinswg_eiarequired,pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,statuscode,pinswg_casestage,_pinswg_sipscase_value,pinswg_writtenacceptanceofnotification,pinswg_validnoticeofintentiontosubmit,pinswg_deadlineforsubmissionofapplication,pinswg_screeningstartdate,pinswg_eiatargetdate,pinswg_targetextended,pinswg_directionissueddate,pinswg_eiarequired,pinswg_scopingstartdate,pinswg_scopingtargetdate,pinswg_scopingtargetextended,pinswg_scopingoutcomeissueddate,pinswg_essubmitted,pinswg_deemedmarinelicenseappliedfor,pinswg_validationdeadlineextension,pinswg_casesuspensionstartdate,pinswg_casesuspensionenddate,pinswg_consultationopen,pinswg_consultationclose,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome";
             break;
         default:
             return "";

components/accessibility.js

@@ -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();

components/account/changepassword.js

@@ -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 {
+import Link from "next/link";
-    Field,
+import { useRouter } from "next/router";
-    reduxForm,
+import React, { useState } from "react";
-    formValueSelector,
+import { connect } from "react-redux";
-    getFormSubmitErrors,
+import { Field, formValueSelector, reduxForm } from "redux-form";
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
 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>
                 </>

components/account/personaldetails.js

@@ -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 {
+import Link from "next/link";
-    Field,
+import { useRouter } from "next/router";
-    reduxForm,
+import React, { useState } from "react";
-    formValueSelector,
+import { connect } from "react-redux";
-    getFormSubmitErrors,
+import { Field, formValueSelector, reduxForm } from "redux-form";
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
 
 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("");
@@ -103,167 +246,194 @@ let PersonalDetails = (props) => {
 
     return (
         <>
-            {props.accountUpdatedComplete == false ? (
+            <div className="govuk-form-group">
-                props.personalDetailsComplete == false ? (
+                {props.accountUpdatedComplete == false ? (
-                    <form onSubmit={handleSubmit(onHandleSubmit)}>
+                    props.personalDetailsComplete == false ? (
-                        <fieldset className="govuk-fieldset">
+                        <form onSubmit={handleSubmit(onHandleSubmit)}>
-                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
+                            <fieldset className="govuk-fieldset">
-                                <h2 className="govuk-fieldset__heading">
+                                <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
-                                    About you
+                                    <h2 className="govuk-fieldset__heading">
-                                </h2>
+                                        {t("account:account-about-you-label")}
-                            </legend>
+                                    </h2>
-                            <div className="govuk-form-group ">
+                                </legend>
-                                <span className="govuk-label ">
+                                <div className="govuk-form-group ">
-                                    Role:{" "}
+                                    <span className="govuk-label ">
-                                    {
+                                        {t("account:account-role-label")}:{" "}
+                                        {
+                                            props.props.accountDetails
+                                                .accountDetails[
+                                                "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
+                                            ]
+                                        }
+                                    </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"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-20"
+                                    validate={[required]}
+                                    label={t(
+                                        "account:account-first-name-label"
+                                    )}
+                                    errorMsg={t("account:is-required-label")}
+                                />
+                                <Field
+                                    name="lastname"
+                                    id="lastname"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-20"
+                                    validate={[required]}
+                                    label={t("account:account-last-name-label")}
+                                    errorMsg={t("account:is-required-label")}
+                                />
+                                <Field
+                                    name="emailaddress1"
+                                    id="emailaddress1"
+                                    component={RenderTextfield}
+                                    type="email"
+                                    className="govuk-input govuk-input--width-20"
+                                    validate={[required, email]}
+                                    label={t(
+                                        "account:account-email-address-label"
+                                    )}
+                                    disabled
+                                />
+                                <Field
+                                    name="telephone1"
+                                    id="telephone1"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-20"
+                                    validate={[required, phoneNumber]}
+                                    label={t("account:account-telephone-label")}
+                                />
+                                <Field
+                                    name="company"
+                                    id="company"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-20"
+                                    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">
+                                        {t(
+                                            "account:account-your-address-label"
+                                        )}
+                                    </h2>
+                                </legend>
+
+                                <Field
+                                    name="address1_line1"
+                                    id="address1_line1"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-20"
+                                    label={t(
+                                        "account:account-address-line-1-label"
+                                    )}
+                                    validate={[required]}
+                                    errorMsg={t("account:is-required-label")}
+                                />
+                                <Field
+                                    name="address1_line2"
+                                    id="address1_line2"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-20"
+                                    label={t(
+                                        "account:account-address-line-2-label"
+                                    )}
+                                    errorMsg={t("account:is-required-label")}
+                                />
+                                <Field
+                                    name="address1_city"
+                                    id="address1_city"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-10"
+                                    label={t("account:account-town-city-label")}
+                                    validate={[required]}
+                                    errorMsg={t("account:is-required-label")}
+                                />
+                                <Field
+                                    name="address1_county"
+                                    id="address1_county"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-10"
+                                    label={t("account:account-county-label")}
+                                    validate={[required]}
+                                    errorMsg={t("account:is-required-label")}
+                                />
+                                <Field
+                                    name="address1_postalcode"
+                                    id="address1_postalcode"
+                                    component={RenderTextfield}
+                                    type="text"
+                                    className="govuk-input govuk-input--width-5"
+                                    label={t("account:account-postcode-label")}
+                                    validate={[required, postcode]}
+                                />
+                            </fieldset>
+                            <div className="govuk-button-group">
+                                <button
+                                    type="submit"
+                                    className="govuk-button"
+                                    data-module="govuk-button"
+                                >
+                                    {t("common:continue-button")}
+                                </button>
+                                <Link
+                                    href={
+                                        "/myportal?q=" +
                                         props.props.accountDetails
-                                            .accountDetails[
+                                            .loggedinUserId
-                                            "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
-                                        ]
                                     }
-                                </span>
+                                    className="govuk-link"
+                                >
+                                    {t("common:cancel-link")}
+                                </Link>
                             </div>
-                            <Field
+                        </form>
-                                name="firstname"
+                    ) : (
-                                id="firstname"
+                        <>
-                                component={RenderTextfield}
+                            <BuildCheckPersonalDetails
-                                type="text"
+                                props={props}
-                                className="govuk-input govuk-input--width-20"
+                                setPersonalDetailsComplete={
-                                validate={[required]}
+                                    setPersonalDetailsComplete
-                                label="First name"
-                                errorMsg="Is required"
-                            />
-                            <Field
-                                name="lastname"
-                                id="lastname"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-20"
-                                validate={[required]}
-                                label="Last name"
-                                errorMsg="Is required"
-                            />
-                            <Field
-                                name="emailaddress1"
-                                id="emailaddress1"
-                                component={RenderTextfield}
-                                type="email"
-                                className="govuk-input govuk-input--width-20"
-                                validate={[required, email]}
-                                label="Email address"
-                                disabled
-                            />
-                            <Field
-                                name="telephone1"
-                                id="telephone1"
-                                component={RenderTextfield}
-                                type="number"
-                                className="govuk-input govuk-input--width-20"
-                                validate={[required, phoneNumber]}
-                                label="Telephone"
-                            />
-
-                            <Field
-                                name="company"
-                                id="company"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-20"
-                                label="Company/Group"
-                                errorMsg="Is required"
-                            />
-                        </fieldset>
-                        <fieldset className="govuk-fieldset">
-                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
-                                <h2 className="govuk-fieldset__heading">
-                                    What is your address?
-                                </h2>
-                            </legend>
-
-                            <Field
-                                name="address1_line1"
-                                id="address1_line1"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-20"
-                                label="Address line 1"
-                                validate={[required]}
-                                errorMsg="Is required"
-                            />
-                            <Field
-                                name="address1_line2"
-                                id="address1_line2"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-20"
-                                label="Address line 2"
-                                errorMsg="Is required"
-                            />
-                            <Field
-                                name="address1_city"
-                                id="address1_city"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-10"
-                                label="Town/City"
-                                validate={[required]}
-                                errorMsg="Is required"
-                            />
-                            <Field
-                                name="address1_county"
-                                id="address1_county"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-10"
-                                label="County"
-                                validate={[required]}
-                                errorMsg="Is required"
-                            />
-                            <Field
-                                name="address1_postalcode"
-                                id="address1_postalcode"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-5"
-                                label="Postcode"
-                                validate={[required]}
-                                errorMsg="Is required"
-                            />
-                        </fieldset>
-                        <div className="govuk-button-group">
-                            <button
-                                type="submit"
-                                className="govuk-button"
-                                data-module="govuk-button"
-                            >
-                                Continue
-                            </button>
-                            <Link
-                                href={
-                                    "/myportal?q=" +
-                                    props.props.accountDetails.loggedinUserId
                                 }
-                            >
+                                setAccountUpdatedComplete={
-                                <a className="govuk-link">Cancel</a>
+                                    setAccountUpdatedComplete
-                            </Link>
+                                }
-                        </div>
+                            />
-                    </form>
+                        </>
+                    )
                 ) : (
-                    <>
+                    <PersonalDetailsComplete props={props} />
-                        <BuildCheckPersonalDetails
+                )}
-                            props={props}
+            </div>
-                            setPersonalDetailsComplete={
-                                setPersonalDetailsComplete
-                            }
-                            setAccountUpdatedComplete={
-                                setAccountUpdatedComplete
-                            }
-                        />
-                    </>
-                )
-            ) : (
-                <PersonalDetailsComplete props={props} />
-            )}
         </>
     );
 };

components/account/personaldetailsCheck.js

@@ -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 {
+import Link from "next/link";
-    Field,
+import { useRouter } from "next/router";
-    reduxForm,
+import React from "react";
-    formValueSelector,
+import { connect } from "react-redux";
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, 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>
         </>

components/account/personaldetailsComplete.js

@@ -1,23 +1,10 @@
-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 {
+import Link from "next/link";
-    Field,
+import { useRouter } from "next/router";
-    reduxForm,
+import React, { useEffect } from "react";
-    formValueSelector,
+import { connect } from "react-redux";
-    getFormSubmitErrors,
-} from "redux-form";
-import {
-    useDispatch,
-    useSelector,
-    shallowEqual,
-    connect,
-    setRegisterFormComplete,
-    setAccountCreatedComplete,
-} from "react-redux";
 import { updateAccount } from "../../actions";
+import { setCookie } from "nookies";
 
 const PersonalDetailsComplete = (props) => {
     const {
@@ -31,30 +18,50 @@ const PersonalDetailsComplete = (props) => {
     const router = useRouter();
     const { locale } = router;
 
+    // let contactid = props.accountDetails.loggedinUserId;
+    // let updateBody = props.props.props.form.personalDetailsForm.values;
+    // let prefLang =
+    //     props.props.props.form.personalDetailsForm.values
+    //         .pinswg_preferredlanguage;
+
+    const { loggedinUserId } = props.accountDetails || {};
+    const formValues = props.props?.props?.form?.personalDetailsForm?.values;
+    const prefLang = formValues?.pinswg_preferredlanguage;
+
     useEffect(() => {
-        let contactid = props.accountDetails.loggedinUserId;
+        // let contactid = props.accountDetails.loggedinUserId;
-        let updateBody = props.props.props.form.personalDetailsForm.values;
+        // let updateBody = props.props.props.form.personalDetailsForm.values;
-        updateAccount(contactid, updateBody);
+        // let prefLang =
-    }, [
+        //     props.props.props.form.personalDetailsForm.values
-        props.accountDetails.loggedinUserId,
+        //         .pinswg_preferredlanguage;
-        props.props.props.form.personalDetailsForm.values,
+        if (!loggedinUserId || !formValues) return;
-    ]);
+
+        console.log("=============== pref lang", prefLang);
+        const userLang = prefLang == "846040000" ? "cy" : "en";
+        setCookie(null, "pedw_locale", userLang, {
+            path: "/",
+            maxAge: 60 * 60 * 24 * 365,
+        });
+
+        console.log("Set cookie to:", userLang);
+
+        async function doUpdate() {
+            const response = await updateAccount(loggedinUserId, formValues);
+        }
+
+        doUpdate();
+    }, [loggedinUserId, formValues, prefLang]);
 
     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">{t("account:account-complete-para-2")}</p> */}
 
             <p className="govuk-body">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a
+                <Link href={"/"} className="govuk-link">
-                metus non quam mollis egestas. Integer ac leo cursus, laoreet
+                    {" "}
-                nulla sed, tempus tellus. Mauris condimentum erat arcu.
+                    {t("account:account-complete-return-to-portal-link")}
-            </p>
-
-            <p className="govuk-body">
-                <Link
-                    href={"/myportal?q=" + props.accountDetails.loggedinUserId}
-                >
-                    <a className="govuk-link">Return to My Portal</a>
                 </Link>
             </p>
         </>

components/account/registerCheck.js

@@ -1,14 +1,7 @@
-import _ from "lodash";
-import React, { useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
+import { useRouter } from "next/router";
-    Field,
+import React from "react";
-    reduxForm,
+import { connect } from "react-redux";
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, 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">

components/account/registerComplete.js

@@ -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 { connect } from "react-redux";
-import {
-    Field,
-    reduxForm,
-    formValueSelector,
-    getFormSubmitErrors,
-} from "redux-form";
-import {
-    useDispatch,
-    useSelector,
-    shallowEqual,
-    connect,
-    setRegisterFormComplete,
-    setAccountCreatedComplete,
-} 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="/">
+                        {t("account:register-new-account-paragraph-thanks")}
-                            <a
+                    </p>
-                                className="govuk-link"
+
-                                onClick={() => {
+                    <p className="govuk-body">
-                                    setLogout(),
+                        <Link href="/" className="govuk-link">
-                                        window.localStorage.clear(),
+                            {t("account:register-new-account-my-portal-link")}
-                                        destroyCookie({}, "pinsUser"),
-                                        signOut({ callbackUrl: "/logout" });
-                                }}
-                            >
-                                {t(
-                                    "account:register-new-account-my-portal-link"
-                                )}
-                            </a>
                         </Link>
                     </p>
                 </>

components/account/registerform.js

@@ -1,14 +1,8 @@
-import _ from "lodash";
-import React, { useState } from "react";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import {
+import { useRouter } from "next/router";
-    Field,
+import React, { useState } from "react";
-    reduxForm,
+import { connect } from "react-redux";
-    formValueSelector,
+import { Field, formValueSelector, reduxForm } from "redux-form";
-    getFormSubmitErrors,
-} from "redux-form";
-import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
 
 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 && (
@@ -134,185 +137,153 @@ const RegisterForm = (props) => {
             {props.accountCreatedComplete != true ? (
                 props.registerFormComplete == false ? (
                     <form onSubmit={handleSubmit(onHandleSubmit)}>
-                        <fieldset className="govuk-fieldset">
+                        <div className="card" id="personalDetailsCard">
-                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
+                            <div className="card-body">
-                                <h2 className="govuk-fieldset__heading">
+                                <fieldset className="govuk-fieldset">
-                                    {t(
+                                    <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
-                                        "account:register-new-account-sub-heading-1"
+                                        <h2 className="govuk-fieldset__heading">
-                                    )}{" "}
+                                            {t(
-                                    {loggedInUserEmail}
+                                                "account:register-new-account-sub-heading-1"
-                                </h2>
+                                            )}{" "}
-                            </legend>
+                                            {loggedInUserEmail}
-                            <Field
+                                        </h2>
-                                name="firstname"
+                                    </legend>
-                                id="firstname"
+                                    <Field
-                                component={RenderTextfield}
+                                        name="firstname"
-                                type="text"
+                                        id="firstname"
-                                className="govuk-input govuk-input--width-20"
+                                        component={RenderTextfield}
-                                validate={[required]}
+                                        type="text"
-                                label={t(
+                                        className="govuk-input govuk-input--width-20"
-                                    "account:register-new-account-first-name-label"
+                                        validate={[required]}
-                                )}
+                                        label={t(
-                                errorMsg={t(
+                                            "account:register-new-account-first-name-label"
-                                    "account:register-new-account-first-name-label-errormsg"
+                                        )}
-                                )}
+                                        errorMsg={t(
-                            />
+                                            "account:register-new-account-first-name-label-errormsg"
-                            <Field
+                                        )}
-                                name="lastname"
+                                    />
-                                id="lastname"
+                                    <Field
-                                component={RenderTextfield}
+                                        name="lastname"
-                                type="text"
+                                        id="lastname"
-                                className="govuk-input govuk-input--width-20"
+                                        component={RenderTextfield}
-                                validate={[required]}
+                                        type="text"
-                                label={t(
+                                        className="govuk-input govuk-input--width-20"
-                                    "account:register-new-account-last-name-label"
+                                        validate={[required]}
-                                )}
+                                        label={t(
-                                errorMsg={t(
+                                            "account:register-new-account-last-name-label"
-                                    "account:register-new-account-last-name-label-errormsg"
+                                        )}
-                                )}
+                                        errorMsg={t(
-                            />
+                                            "account:register-new-account-last-name-label-errormsg"
-                            <Field
+                                        )}
-                                name="emailaddress1"
+                                    />
-                                id="emailaddress1"
+                                    <Field
-                                component={RenderTextfield}
+                                        name="emailaddress1"
-                                type="email"
+                                        id="emailaddress1"
-                                className="govuk-input govuk-input--width-20"
+                                        component={RenderTextfield}
-                                validate={[required, email]}
+                                        type="email"
-                                label={t(
+                                        className="govuk-input govuk-input--width-20"
-                                    "account:register-new-account-email-address-label"
+                                        validate={[required, email]}
-                                )}
+                                        label={t(
-                                disabled
+                                            "account:register-new-account-email-address-label"
-                            />
+                                        )}
-                            <Field
+                                        disabled
-                                name="telephone1"
+                                    />
-                                id="telephone1"
+                                    <Field
-                                component={RenderTextfield}
+                                        name="telephone1"
-                                type="number"
+                                        id="telephone1"
-                                className="govuk-input govuk-input--width-20"
+                                        component={RenderTextfield}
-                                validate={[required, phoneNumber]}
+                                        type="text"
-                                label={t(
+                                        className="govuk-input govuk-input--width-20"
-                                    "account:register-new-account-phone-label"
+                                        validate={[required, phoneNumber]}
-                                )}
+                                        label={t(
-                            />
+                                            "account:register-new-account-phone-label"
+                                        )}
+                                    />
+                                </fieldset>
+                                <fieldset className="govuk-fieldset">
+                                    <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
+                                        <h2 className="govuk-fieldset__heading">
+                                            {t(
+                                                "account:register-new-account-sub-heading-2"
+                                            )}
+                                        </h2>
+                                    </legend>
 
-                            {/* <Field
+                                    <Field
-                                name="pinswg_custom_password"
+                                        name="address1_line1"
-                                id="pinswg_custom_password"
+                                        id="address1_line1"
-                                component={RenderTextfield}
+                                        component={RenderTextfield}
-                                type="password"
+                                        type="text"
-                                className="govuk-input govuk-input--width-20"
+                                        className="govuk-input govuk-input--width-20"
-                                label={t(
+                                        label={t(
-                                    "account:register-new-account-password-label"
+                                            "account:register-new-account-address-line-1-label"
-                                )}
+                                        )}
-                                validate={[required, minLength5]}
+                                        validate={[required]}
-                                errorMsg={t(
+                                        errorMsg={t(
-                                    "account:register-new-account-password-label-errormsg"
+                                            "account:register-new-account-address-line-1-label-errormsg"
-                                )}
+                                        )}
-                            />
+                                    />
-                            <Field
+                                    <Field
-                                name="custom_password_check"
+                                        name="address1_line2"
-                                id="custom_password_check"
+                                        id="address1_line2"
-                                component={RenderTextfield}
+                                        component={RenderTextfield}
-                                type="password"
+                                        type="text"
-                                className="govuk-input govuk-input--width-20"
+                                        className="govuk-input govuk-input--width-20"
-                                label={t(
+                                        label={t(
-                                    "account:register-new-account-confirm-password-label"
+                                            "account:register-new-account-address-line-2-label"
-                                )}
+                                        )}
-                                validate={[
+                                    />
-                                    required,
+                                    <Field
-                                    passwordsMatch,
+                                        name="address1_city"
-                                    minLength5,
+                                        id="address1_city"
-                                ]}
+                                        component={RenderTextfield}
-                                errorMsg={t(
+                                        type="text"
-                                    "account:register-new-account-confirm-password-label-errormsg"
+                                        className="govuk-input govuk-input--width-10"
-                                )}
+                                        label={t(
-                            /> */}
+                                            "account:register-new-account-town-label"
-                        </fieldset>
+                                        )}
-                        <fieldset className="govuk-fieldset">
+                                        validate={[required]}
-                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
+                                        errorMsg={t(
-                                <h2 className="govuk-fieldset__heading">
+                                            "account:register-new-account-town-label-errormsg"
-                                    {t(
+                                        )}
-                                        "account:register-new-account-sub-heading-2"
+                                    />
-                                    )}
+                                    <Field
-                                </h2>
+                                        name="address1_county"
-                            </legend>
+                                        id="address1_county"
+                                        component={RenderTextfield}
+                                        type="text"
+                                        className="govuk-input govuk-input--width-10"
+                                        label={t(
+                                            "account:register-new-account-county-label"
+                                        )}
+                                        validate={[required]}
+                                        errorMsg={t(
+                                            "account:register-new-account-county-label-errormsg"
+                                        )}
+                                    />
+                                    <Field
+                                        name="address1_postalcode"
+                                        id="address1_postalcode"
+                                        component={RenderTextfield}
+                                        type="text"
+                                        className="govuk-input govuk-input--width-5"
+                                        label={t(
+                                            "account:register-new-account-postcode-label"
+                                        )}
+                                        validate={[required, postcode]}
+                                    />
+                                </fieldset>
 
-                            <Field
+                                <div className="govuk-button-group">
-                                name="address1_line1"
+                                    <button
-                                id="address1_line1"
+                                        type="submit"
-                                component={RenderTextfield}
+                                        className="govuk-button"
-                                type="text"
+                                        data-module="govuk-button"
-                                className="govuk-input govuk-input--width-20"
+                                    >
-                                label={t(
+                                        {t("common:continue-button")}
-                                    "account:register-new-account-address-line-1-label"
+                                    </button>
-                                )}
+                                </div>
-                                validate={[required]}
+                            </div>
-                                errorMsg={t(
-                                    "account:register-new-account-address-line-1-label-errormsg"
-                                )}
-                            />
-                            <Field
-                                name="address1_line2"
-                                id="address1_line2"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-20"
-                                label={t(
-                                    "account:register-new-account-address-line-2-label"
-                                )}
-                            />
-                            <Field
-                                name="address1_city"
-                                id="address1_city"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-10"
-                                label={t(
-                                    "account:register-new-account-town-label"
-                                )}
-                                validate={[required]}
-                                errorMsg={t(
-                                    "account:register-new-account-town-label-errormsg"
-                                )}
-                            />
-                            <Field
-                                name="address1_county"
-                                id="address1_county"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-10"
-                                label={t(
-                                    "account:register-new-account-county-label"
-                                )}
-                                validate={[required]}
-                                errorMsg={t(
-                                    "account:register-new-account-county-label-errormsg"
-                                )}
-                            />
-                            <Field
-                                name="address1_postalcode"
-                                id="address1_postalcode"
-                                component={RenderTextfield}
-                                type="text"
-                                className="govuk-input govuk-input--width-5"
-                                label={t(
-                                    "account:register-new-account-postcode-label"
-                                )}
-                                validate={[required]}
-                                errorMsg={t(
-                                    "account:register-new-account-postcode-label-errormsg"
-                                )}
-                            />
-                        </fieldset>
-
-                        <div className="govuk-button-group">
-                            <button
-                                type="submit"
-                                className="govuk-button"
-                                data-module="govuk-button"
-                            >
-                                {t("common:continue-button")}
-                            </button>
                         </div>
                     </form>
                 ) : (

components/addresssearch.js

@@ -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>
+    );
+}

components/addresssearchresults.js

@@ -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>
+    );
+}

components/azureappinsights.js

@@ -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);

components/banner.js

@@ -1,4 +1,3 @@
-import Link from "next/link";
 import useTranslation from "next-translate/useTranslation";
 
 export default function Banner() {

components/case.js

@@ -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;
@@ -32,20 +30,19 @@ const Case = (props) => {
                         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}
-                        showLoginCheck={props.showLoginCheck}
+                        currentView={props.currentView}
-                    />
+                        messagesObj={props.messagesObj}
-                    <Documents
+                        docsOffline={props.props.docsOffline}
-                        incidentid={props.incidentid}
-                        caseReference={props.caseReference}
-                        searchResultsObj={props.searchResultsObj}
-                        searchDetailsObj={props.searchDetailsObj}
                         documentDetailsObj={props.documentDetailsObj}
+                        showFilteredDocs={props.showFilteredDocs}
+                        eventsObj={props.eventsObj}
                     />
-                    {showRepresentations == "true" && (
+                    {showRepresentations == true && (
                         <RepresentationList
                             incidentid={props.incidentid}
                             caseReference={props.caseReference}

components/case/caseNoticeBanner.js

@@ -0,0 +1,105 @@
+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;
+
+    let todaysDate = new Date();
+
+    return (
+        <>
+            {messagesObjArr.map((message, index) => (
+                <div key={index}>
+                    {todaysDate.toISOString() >= message.scheduledstart &&
+                        todaysDate.toISOString() <= message.scheduledend && (
+                            <div
+                                className="govuk-warning-text noticebanner"
+                                key={index}
+                            >
+                                <strong className="govuk-warning-text__text">
+                                    <span className="govuk-visually-hidden">
+                                        {t("case:notice-label")}
+                                    </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>
+                        )}
+                </div>
+            ))}
+        </>
+    );
+}

components/case/eia.js

@@ -0,0 +1,221 @@
+import { setEventDetails } from "../../store/searchOutput/action";
+import { setCurrentPage } from "../../store/currentView/action";
+import { connect } from "react-redux";
+import useTranslation from "next-translate/useTranslation";
+import { formatDates } from "../utils";
+
+const EIADetails = (props) => {
+    let { t } = useTranslation();
+
+    const EventView = (eventsArr) => {
+        eventsArr = eventsArr.value;
+
+        return eventsArr.map((item, key) => {
+            <div>{item.pinswg_name}</div>;
+        });
+    };
+
+    const eventsArr = props.eventsObj?.value || [];
+
+    // event publishiing flag set to true displa
+
+    function hasOwnPropertyAndNotNull(obj, property) {
+        return obj.hasOwnProperty(property) && obj[property] !== null;
+    }
+
+    //console.log(eventsArr.length > 0);
+
+    return (
+        eventsArr.length > 0 && (
+            <div className="govuk-grid-row">
+                <div className="card">
+                    <div className="card-body">
+                        <h2 className="govuk-heading-m ">
+                            {t("case:event-title")}
+                        </h2>
+                        {eventsArr.map(
+                            (item, key) =>
+                                item.pinswg_eventpublishflag && (
+                                    <>
+                                        {" "}
+                                        <div className="eventContainer">
+                                            <div className="eventColumn">
+                                                <div>
+                                                    <b>
+                                                        {" "}
+                                                        {t(
+                                                            "case:event-name-label"
+                                                        )}
+                                                    </b>
+                                                    : {item.pinswg_name}
+                                                </div>
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventname"
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-event-name-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {item.pinswg_eventname}
+                                                    </div>
+                                                )}
+                                            </div>
+                                            <div className="eventColumn">
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddressline1"
+                                                ) && (
+                                                    <>
+                                                        <div>
+                                                            <b>
+                                                                {t(
+                                                                    "case:event-address-label"
+                                                                )}
+                                                            </b>
+                                                            :
+                                                        </div>
+                                                        <div>
+                                                            {
+                                                                item.pinswg_eventaddressline1
+                                                            }
+                                                        </div>
+                                                    </>
+                                                )}
+
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddressline2"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddressline2
+                                                        }
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddresstown"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddresstown
+                                                        }
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddresscounty"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddresscounty
+                                                        }
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddresscounty"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddresspostcode
+                                                        }
+                                                    </div>
+                                                )}
+                                            </div>
+                                            {/* type of event
+                            start date date of event - end date of event
+
+                            if virtual event no address showNoOfRecords
+                            show event address  */}
+                                            <div className="eventColumn">
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_dateeventrequested"
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-start-date-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {formatDates(
+                                                            item.pinswg_dateeventrequested
+                                                        )}
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_enddateoftheevent"
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-end-date-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {item.pinswg_enddateoftheevent !=
+                                                            null &&
+                                                            formatDates(
+                                                                item.pinswg_enddateoftheevent
+                                                            )}
+                                                    </div>
+                                                )}
+                                            </div>
+                                            <div className="eventColumn">
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    [
+                                                        "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue",
+                                                    ]
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-type-of-event-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {
+                                                            item[
+                                                                "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
+                                                            ]
+                                                        }
+                                                    </div>
+                                                )}
+                                            </div>
+                                        </div>
+                                    </>
+                                )
+                        )}{" "}
+                    </div>
+                </div>
+            </div>
+        )
+    );
+};
+
+const mapStateToProps = (state) => {
+    return {
+        ...state,
+    };
+};
+
+const mapDispatchToProps = (dispatch) => {
+    return {
+        setEventDetails: (eventsObj) => {
+            dispatch(setEventDetails(eventsObj));
+        },
+        setCurrentPage: (currentPage) => {
+            dispatch(setCurrentPage(currentPage));
+        },
+    };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(EIADetails);

components/case/events.js

@@ -0,0 +1,221 @@
+import { setEventDetails } from "../../store/searchOutput/action";
+import { setCurrentPage } from "../../store/currentView/action";
+import { connect } from "react-redux";
+import useTranslation from "next-translate/useTranslation";
+import { formatDates } from "../utils";
+
+const EventsDetails = (props) => {
+    let { t } = useTranslation();
+
+    const EventView = (eventsArr) => {
+        eventsArr = eventsArr.value;
+
+        return eventsArr.map((item, key) => {
+            <div>{item.pinswg_name}</div>;
+        });
+    };
+
+    const eventsArr = props.eventsObj?.value || [];
+
+    // event publishiing flag set to true displa
+
+    function hasOwnPropertyAndNotNull(obj, property) {
+        return obj.hasOwnProperty(property) && obj[property] !== null;
+    }
+
+    //console.log(eventsArr.length > 0);
+
+    return (
+        eventsArr.length > 0 && (
+            <div className="govuk-grid-row">
+                <div className="card">
+                    <div className="card-body">
+                        <h2 className="govuk-heading-m ">
+                            {t("case:event-title")}
+                        </h2>
+                        {eventsArr.map(
+                            (item, key) =>
+                                item.pinswg_eventpublishflag && (
+                                    <>
+                                        {" "}
+                                        <div className="eventContainer">
+                                            <div className="eventColumn">
+                                                <div>
+                                                    <b>
+                                                        {" "}
+                                                        {t(
+                                                            "case:event-name-label"
+                                                        )}
+                                                    </b>
+                                                    : {item.pinswg_name}
+                                                </div>
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventname"
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-event-name-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {item.pinswg_eventname}
+                                                    </div>
+                                                )}
+                                            </div>
+                                            <div className="eventColumn">
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddressline1"
+                                                ) && (
+                                                    <>
+                                                        <div>
+                                                            <b>
+                                                                {t(
+                                                                    "case:event-address-label"
+                                                                )}
+                                                            </b>
+                                                            :
+                                                        </div>
+                                                        <div>
+                                                            {
+                                                                item.pinswg_eventaddressline1
+                                                            }
+                                                        </div>
+                                                    </>
+                                                )}
+
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddressline2"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddressline2
+                                                        }
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddresstown"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddresstown
+                                                        }
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddresscounty"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddresscounty
+                                                        }
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_eventaddresscounty"
+                                                ) && (
+                                                    <div>
+                                                        {
+                                                            item.pinswg_eventaddresspostcode
+                                                        }
+                                                    </div>
+                                                )}
+                                            </div>
+                                            {/* type of event
+                            start date date of event - end date of event
+
+                            if virtual event no address showNoOfRecords
+                            show event address  */}
+                                            <div className="eventColumn">
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_dateeventrequested"
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-start-date-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {formatDates(
+                                                            item.pinswg_dateeventrequested
+                                                        )}
+                                                    </div>
+                                                )}
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    "pinswg_enddateoftheevent"
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-end-date-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {item.pinswg_enddateoftheevent !=
+                                                            null &&
+                                                            formatDates(
+                                                                item.pinswg_enddateoftheevent
+                                                            )}
+                                                    </div>
+                                                )}
+                                            </div>
+                                            <div className="eventColumn">
+                                                {hasOwnPropertyAndNotNull(
+                                                    item,
+                                                    [
+                                                        "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue",
+                                                    ]
+                                                ) && (
+                                                    <div>
+                                                        <b>
+                                                            {t(
+                                                                "case:event-type-of-event-label"
+                                                            )}
+                                                        </b>
+                                                        :{" "}
+                                                        {
+                                                            item[
+                                                                "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
+                                                            ]
+                                                        }
+                                                    </div>
+                                                )}
+                                            </div>
+                                        </div>
+                                    </>
+                                )
+                        )}{" "}
+                    </div>
+                </div>
+            </div>
+        )
+    );
+};
+
+const mapStateToProps = (state) => {
+    return {
+        ...state,
+    };
+};
+
+const mapDispatchToProps = (dispatch) => {
+    return {
+        setEventDetails: (eventsObj) => {
+            dispatch(setEventDetails(eventsObj));
+        },
+        setCurrentPage: (currentPage) => {
+            dispatch(setCurrentPage(currentPage));
+        },
+    };
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(EventsDetails);

components/case/pagination.js

@@ -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;
     };
 

components/case/representation/consultationAgent.js

@@ -0,0 +1,364 @@
+import useTranslation from "next-translate/useTranslation";
+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,
+    RenderRichMultiline,
+    shouldDisableButton,
+} from "./representationElements";
+
+import { useDropzone } from "react-dropzone";
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";
+
+const ConsultationAgent = (props) => {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    const {
+        formObj,
+        appellantApplicantRepresentationArr,
+        setRepresentationCapacity,
+        setRepresentationSubmit,
+        currentView,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
+    } = props;
+    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>
+        ));
+        const required = (value) => (value ? undefined : "Required");
+
+        return (
+            <>
+                <div className="govuk-grid-row">
+                    <div className="govuk-form-group">
+                        {typeof formObj.representationForm.values
+                            .representationType == "undefined" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <h2 className="govuk-heading-m ">
+                                    {t(
+                                        "myrepresentations:consultation-from-an-agent-heading"
+                                    )}
+                                </h2>
+
+                                <label
+                                    className="govuk-label govuk-body-m"
+                                    htmlFor="representationType"
+                                >
+                                    {t(
+                                        "myrepresentations:kind-of-consultation-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">
+                                    {formObj.representationForm.values
+                                        .representationType ==
+                                    "Consultation Response"
+                                        ? t(
+                                              "myrepresentations:enter-comment-label"
+                                          )
+                                        : t(
+                                              "myrepresentations:consultation-comment-label"
+                                          )}
+                                </p>
+                                <fieldset
+                                    className="govuk-fieldset"
+                                    aria-describedby="commentBox-hint"
+                                >
+                                    {formObj.representationForm.values
+                                        .representationType ==
+                                        "Consultation Response" && (
+                                        <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"
+                                                }
+                                            />
+                                            {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="govuk-form-group govuk-!-margin-bottom-9">
+                                        <FileUploadField
+                                            name={"representationDocuments"}
+                                            id={"representationDocuments"}
+                                            label={t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                            ticketnumber={
+                                                props.props.caseReference
+                                            }
+                                            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>
+                                </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"
+                                disabled={shouldDisableButton({
+                                    props,
+                                    formObj,
+                                })}
+                            >
+                                {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>
+                )}
+            </>
+        );
+    }
+};
+
+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,
+    })(ConsultationAgent)
+);

components/case/representation/consultationAppellant.js

@@ -0,0 +1,337 @@
+import useTranslation from "next-translate/useTranslation";
+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,
+    RenderRichMultiline,
+    shouldDisableButton,
+} from "./representationElements";
+
+import { useDropzone } from "react-dropzone";
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";
+
+const ConsultationAppellant = (props) => {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    const {
+        formObj,
+        appellantApplicantRepresentationArr,
+        setRepresentationCapacity,
+        setRepresentationSubmit,
+        currentView,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
+    } = props;
+    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
+
+    console.log(JSON.stringify(formObj) == "{}" ? "empty" : "value");
+
+    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">
+                        {typeof formObj.representationForm.values
+                            .representationType == "undefined" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <h2 className="govuk-heading-m ">
+                                    {t(
+                                        "myrepresentations:consultation-from-an-appellant-heading"
+                                    )}
+                                </h2>
+                                <label
+                                    className="govuk-label govuk-body-m"
+                                    htmlFor="representationType"
+                                >
+                                    {t(
+                                        "myrepresentations:kind-of-consultation-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">
+                            <p className="govuk-body">
+                                {formObj.representationForm.values
+                                    .representationType ==
+                                "Consultation Response"
+                                    ? t("myrepresentations:enter-comment-label")
+                                    : t(
+                                          "myrepresentations:consultation-comment-label"
+                                      )}
+                            </p>
+                            <fieldset
+                                className="govuk-fieldset"
+                                aria-describedby="commentBox-hint"
+                            >
+                                {formObj.representationForm.values
+                                    .representationType ==
+                                    "Consultation Response" && (
+                                    <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"
+                                            }
+                                        />
+                                        {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="govuk-form-group govuk-!-margin-bottom-9">
+                                    <FileUploadField
+                                        name={"representationDocuments"}
+                                        id={"representationDocuments"}
+                                        label={t(
+                                            "myrepresentations:add-files-label"
+                                        )}
+                                        ticketnumber={props.props.caseReference}
+                                        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>
+                            </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"
+                                disabled={shouldDisableButton({
+                                    props,
+                                    formObj,
+                                })}
+                            >
+                                {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>
+                )}
+            </>
+        );
+    }
+};
+
+//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,
+    })(ConsultationAppellant)
+);

components/case/representation/consultationInterestedPartyPerson.js

@@ -0,0 +1,378 @@
+import useTranslation from "next-translate/useTranslation";
+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,
+    RenderRichMultiline,
+    shouldDisableButton,
+} from "./representationElements";
+
+import { useDropzone } from "react-dropzone";
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";
+
+const ConsultationInterestedPartyPerson = (props) => {
+    let { t } = useTranslation();
+
+    const router = useRouter();
+    const { locale } = router;
+    const {
+        formObj,
+        interestedPersonRepresentationArr,
+        setRepresentationCapacity,
+        setRepresentationSubmit,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
+    } = props;
+    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">
+                        {typeof formObj.representationForm.values
+                            .representationType == "undefined" &&
+                        props.representationType != "Select..." ? (
+                            <>
+                                <h2 className="govuk-heading-m ">
+                                    {t(
+                                        "myrepresentations:consultation-from-an-interested-person-heading"
+                                    )}
+                                </h2>
+
+                                <label
+                                    className="govuk-label govuk-body-m"
+                                    htmlFor="representationType"
+                                >
+                                    {t(
+                                        "myrepresentations:kind-of-consultation-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>
+                {(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 className="govuk-grid-row">
+                            <div className="govuk-form-group">
+                                <p className="govuk-body">
+                                    {formObj.representationForm.values
+                                        .representationType ==
+                                    "Consultation Response"
+                                        ? t(
+                                              "myrepresentations:enter-comment-label"
+                                          )
+                                        : t(
+                                              "myrepresentations:consultation-comment-label"
+                                          )}
+                                </p>
+                                <fieldset
+                                    className="govuk-fieldset"
+                                    aria-describedby="commentBox-hint"
+                                >
+                                    {" "}
+                                    {formObj.representationForm.values
+                                        .representationType ==
+                                        "Consultation Response" && (
+                                        <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"
+                                                }
+                                            />
+                                            {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="govuk-form-group govuk-!-margin-bottom-9">
+                                        <FileUploadField
+                                            name={"representationDocuments"}
+                                            id={"representationDocuments"}
+                                            label={t(
+                                                "myrepresentations:add-files-label"
+                                            )}
+                                            ticketnumber={
+                                                props.props.caseReference
+                                            }
+                                            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>
+                                </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"
+                                disabled={shouldDisableButton({
+                                    props,
+                                    formObj,
+                                })}
+                            >
+                                {t("common:continue-button")}
+                            </button>
+                            {/* 
+                        <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={() => {
+                                        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 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,
+    })(ConsultationInterestedPartyPerson)
+);

components/case/representation/index copy.js

@@ -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)
-);

components/case/representation/representationAgent.js

@@ -1,18 +1,24 @@
-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,
+    RenderRichMultiline,
-    RenderRadioList,
+    shouldDisableButton,
-    RenderMultiline,
 } 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 +31,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 (
+    if (JSON.stringify(formObj) != "{}") {
-        <div id="rep-appellant">
+        setRepFileName(formObj.representationForm.values);
-            <div className="govuk-grid-column-full">
-                <div className="govuk-grid-row">
-                    <h2 className="govuk-heading-m ">Representation - agent</h2>
 
-                    <div className="govuk-form-group">
+        let filterFilesList = props.currentView.caseReference.hasOwnProperty(
-                        <label
+            "repDetails"
-                            className="govuk-label govuk-body-m"
+        )
-                            htmlFor="representationType"
+            ? props.currentView.caseReference.repDetails.hasOwnProperty(
-                        >
+                  "filesList"
-                            What kind of representation are you making?
+              )
-                        </label>
+                ? props.currentView.caseReference.repDetails.filesList.filter(
-                        <Field
+                      function (el) {
-                            name="representationType"
+                          return el != null;
-                            component={RenderPickList}
+                      }
-                            datafieldname="representationType"
+                  )
-                            optionsArr={appellantApplicantRepresentationArr}
+                : []
-                        />
+            : [];
-                    </div>
+
-                </div>
+        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
+                        {typeof formObj.representationForm.values
-                            className="govuk-input govuk-!-width-three-quarters"
+                            .representationType == "undefined" &&
-                            id="representationDescription"
+                        props.representationType != "Select..." ? (
-                            name="representationDescription"
+                            <>
-                            value="email"
+                                <h2 className="govuk-heading-m ">
-                            data-aria-controls="representationDescription"
+                                    {t(
-                            type="text"
+                                        "myrepresentations:representation-from-an-agent-heading"
-                            component={RenderTextfield}
+                                    )}
-                            label="Description of representation"
+                                </h2>
-                        />
+
-                    </div>
+                                <label
-                </div>
+                                    className="govuk-label govuk-body-m"
-                <div className="govuk-grid-row">
+                                    htmlFor="representationType"
-                    <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"
                                 >
+                                    {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 +171,154 @@ const RepAgent = (props) => {
                                                 props.name + "-hint"
                                             }
                                         />
-                                    </div>
+                                        <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
-                                </div>
+                                            {t(
-                                <div className="govuk-checkboxes__item">
+                                                "myrepresentations:publish-policy-label"
-                                    <Field
+                                            )}{" "}
-                                        className="govuk-checkboxes__input"
+                                            <a
-                                        id="documentBox"
+                                                href={t(
-                                        name="documentBox"
+                                                    "myrepresentations:publish-policy-link"
-                                        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",
-                                                })}
                                             >
-                                                <input {...getInputProps()} />
+                                                {t(
-                                                <p>
+                                                    "myrepresentations:publish-policy-link-label"
-                                                    Drag and drop files here or
+                                                )}
-                                                    click to select files
+                                            </a>{" "}
-                                                </p>
+                                            {t(
-                                            </div>
+                                                "myrepresentations:publish-policy-label-two"
-                                            <aside>
+                                            )}
-                                                <h4>Files</h4>
+                                        </p>
-                                                <ul>{files}</ul>
-                                            </aside>
-                                        </section>
                                     </div>
-                                </div>
+                                    <div className="govuk-form-group govuk-!-margin-bottom-9">
-                            </div>
+                                        <FileUploadField
-                        </fieldset>
+                                            name={"representationDocuments"}
-                    </div>{" "}
+                                            id={"representationDocuments"}
-                </div>
+                                            label={t(
-                <div className="govuk-grid-row">
+                                                "myrepresentations:add-files-label"
-                    <div className="govuk-button-group">
+                                            )}
-                        <button
+                                            ticketnumber={
-                            type="submit"
+                                                props.props.caseReference
-                            className="govuk-button"
+                                            }
-                            data-module="govuk-button"
+                                            hint={"sdsd"}
-                        >
+                                            fileList={
-                            Continue
+                                                props.currentView.fileList
-                        </button>
-                        {/* <a
-                            onClick={() => {
-                                setRepresentationSubmit(false);
-                            }}
-                            className="govuk-button"
-                        >
-                            Continue
-                        </a> */}
 
-                        <a
+                                                // props.currentView.caseReference.hasOwnProperty(
-                            onClick={() => {
+                                                //     "repDetails"
-                                setRepresentationCapacity();
+                                                // )
-                            }}
+                                                //     ? props.currentView.caseReference.repDetails.hasOwnProperty(
-                            className="govuk-link"
+                                                //           "filesList"
-                        >
+                                                //       ) &&
-                            Back
+                                                //       props.currentView
-                        </a>
+                                                //           .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"
+                                disabled={shouldDisableButton({
+                                    props,
+                                    formObj,
+                                })}
+                            >
+                                {t("common:continue-button")}
+                            </button>
+
+                            {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)
+);

components/case/representation/representationAppellant.js

@@ -1,22 +1,23 @@
-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 { useRouter } from "next/router";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+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,
+    RenderRichMultiline,
-    RenderRadioList,
+    shouldDisableButton,
-    RenderMultiline,
-    RenderFileUpload,
 } from "./representationElements";
+
 import { useDropzone } from "react-dropzone";
-// import {
+import {
-//     setRepresentationCapacity,
+    setRepresentationCapacity,
-//     setRepresentationSubmit,
+    setRepresentationSubmit,
-// } from "../../../store/currentView/action";
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";
 
 const RepAppellant = (props) => {
     let { t } = useTranslation();
@@ -29,207 +30,287 @@ 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 (
+    if (JSON.stringify(formObj) != "{}") {
-        <div id="rep-appellant">
+        setRepFileName(formObj.representationForm.values);
-            <div className="govuk-grid-column-full">
+
+        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
+                        {typeof formObj.representationForm.values
-                            className="govuk-label govuk-body-m"
+                            .representationType == "undefined" &&
-                            htmlFor="representationType"
+                        props.representationType != "Select..." ? (
-                        >
+                            <>
-                            What kind of representation are you making?
+                                <h2 className="govuk-heading-m ">
-                        </label>
+                                    {t(
-                        <Field
+                                        "myrepresentations:representation-from-an-appellant-heading"
-                            name="representationType"
+                                    )}
-                            component={RenderPickList}
+                                </h2>
-                            datafieldname="representationType"
+                                <label
-                            optionsArr={appellantApplicantRepresentationArr}
+                                    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">
+                {(typeof props.representationType != "undefined" ||
-                    <div className="govuk-form-group">
+                    typeof formObj.representationForm.values
-                        <Field
+                        .representationType != "undefined") && (
-                            className="govuk-input govuk-!-width-three-quarters"
+                    <div className="govuk-grid-row">
-                            id="representationDescription"
+                        <div className="govuk-form-group">
-                            name="representationDescription"
+                            <p className="govuk-body">
-                            value="email"
+                                {t("myrepresentations:enter-comment-label")}
-                            data-aria-controls="representationDescription"
+                            </p>
-                            type="text"
+                            <fieldset
-                            component={RenderTextfield}
+                                className="govuk-fieldset"
-                            label="Description of representation"
+                                aria-describedby="commentBox-hint"
-                        />
-                    </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">
+                                {/* <div
-                                    <Field
+                                    id="commentBox-hint"
-                                        className="govuk-checkboxes__input"
+                                    className="govuk-hint"
-                                        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 className="govuk-form-group">
+                                    {t(
-                                        <Field
+                                        "myrepresentations:comments-set-out-label"
-                                            name="representationComments"
+                                    )}
-                                            id="representationComments"
+                                    :
-                                            component={RenderMultiline}
+                                </div> */}
-                                            type="text"
+                                <div className="govuk-form-group">
-                                            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"
+                                        name="representationComments"
-                                        id="documentBox"
+                                        id="representationComments"
-                                        name="documentBox"
+                                        component={RenderRichMultiline}
-                                        data-aria-controls="documentBox"
+                                        type="text"
-                                        type="checkbox"
+                                        rows="5"
-                                        component={RenderTextfield}
+                                        className="govuk-textarea govuk-input--width-30"
+                                        aria-describedby={props.name + "-hint"}
                                     />
-                                    <label
+                                    {formObj.representationForm.values
-                                        className="govuk-label govuk-checkboxes__label"
+                                        .appealType == "846040004" ? (
-                                        htmlFor="documentBox"
+                                        <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
-                                    >
+                                            {t(
-                                        separate documents
+                                                "myrepresentations:publish-policy-label"
-                                    </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
+                                <div className="govuk-form-group govuk-!-margin-bottom-9">
-                                    className={
+                                    <FileUploadField
-                                        _.isEmpty(formObj["representationForm"])
+                                        name={"representationDocuments"}
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
+                                        id={"representationDocuments"}
-                                            : _.isEmpty(
+                                        label={t(
-                                                  formObj["representationForm"]
+                                            "myrepresentations:add-files-label"
-                                                      .values
+                                        )}
-                                              )
+                                        ticketnumber={props.props.caseReference}
-                                            ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
+                                        hint={"sdsd"}
-                                            : _.isEmpty(
+                                        fileList={
-                                                  formObj["representationForm"]
+                                            props.currentView.fileList
-                                                      .values.documentBox
+                                            // props.currentView.caseReference.hasOwnProperty(
-                                              )
+                                            //     "repDetails"
-                                            ? formObj["representationForm"]
+                                            // )
-                                                  .values.documentBox == false
+                                            //     ? props.currentView.caseReference.repDetails.hasOwnProperty(
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
+                                            //           "filesList"
-                                                : "govuk-checkboxes__conditional"
+                                            //       ) &&
-                                            : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
+                                            //       props.currentView
-                                    }
+                                            //           .caseReference.repDetails
-                                    id="conditional-documentBox"
+                                            //           .filesList.length > 0
-                                >
+                                            //         ? props.currentView
-                                    <h2 className="govuk-heading-s">
+                                            //               .caseReference
-                                        {props.label}{" "}
+                                            //               .repDetails.filesList
-                                    </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
                                         }
-                                        hint={props.hint}
+                                        setFilesForRepresentations={
-                                        fileList={props.fileList}
+                                            setFilesForRepresentations
-                                        setFilesForAppeal={
+                                        }
-                                            props.setFilesForAppeal
+                                        containerID={
+                                            props.props.props.accountDetails
+                                                .containerID
+                                        }
+                                        filenamePrefix={props.formObj}
+                                        props={props.props.props}
+                                        setCurrentReference={
+                                            props.setCurrentReference
                                         }
-                                        containerID={props.containerID}
                                     />
                                 </div>
-                            </div>
+                            </fieldset>
-                        </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>
-                        {/* <a
-                            onClick={() => {
-                                setRepresentationSubmit(true);
-                            }}
-                            className="govuk-button"
-                        >
-                            Continue ww
-                        </a> */}
-                        <a
-                            onClick={() => {
-                                setRepresentationCapacity();
-                            }}
-                            className="govuk-link"
-                        >
-                            Back
-                        </a>
                     </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"
+                                disabled={shouldDisableButton({
+                                    props,
+                                    formObj,
+                                })}
+                            >
+                                {t("common:continue-button")}
+                            </button>
+
+                            {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)
+);

components/case/representation/representationCapacitySelection.js

@@ -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 {
+import { useRouter } from "next/router";
-    Field,
-    reduxForm,
-    formValueSelector,
-    handleSubmit,
-    reset,
-} from "redux-form";
-import {
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
 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) => (
@@ -40,6 +27,7 @@ let RepCapacitySelection = (props) => {
     ));
 
     const required = (value) => (value ? undefined : "Required");
+    const appealType = props.props.currentView.caseReference.appealType;
 
     return (
         <>
@@ -47,22 +35,41 @@ let RepCapacitySelection = (props) => {
                 formObj={formObj}
                 currentType={currentType}
                 casesObj={casesObj}
+                caseReference={props.props.caseReference}
+                searchResultsObj={props.props.searchResultsObj}
+                myRepresentations={props.props.myRepresentations}
+                props={props}
+                setCurrentReference={setCurrentReference}
+                appealType={appealType}
             />{" "}
-            <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={
+                                appealType != 846040002
+                                    ? t(
+                                          "myrepresentations:capacity-select-what-capacity-label"
+                                      )
+                                    : t(
+                                          "myrepresentations:sips-capacity-select-what-capacity-label"
+                                      )
+                            }
                             options={capacityOptionsArr}
                             id="representationCapacity"
                             className="govuk-radios__input"
-                            errorMsg={t("newappeal:select-an-option-label")}
+                            errorMsg={t(
-                            component={RenderRadioList}
+                                "myrepresentations:select-an-option-label"
+                            )}
+                            component={RenderRadioListWithText}
                             validate={[required]}
                         />
                     </div>
@@ -75,7 +82,7 @@ let RepCapacitySelection = (props) => {
                                 className="govuk-button"
                                 data-module="govuk-button"
                             >
-                                Continue
+                                {t("common:continue-button")}
                             </button>
                         </div>
                     </div>

components/case/representation/representationComplete.js

@@ -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 { useEffect } from "react";
-import { Field, reduxForm } from "redux-form";
+import { connect } from "react-redux";
-import {
+
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
-import {
-    setRepresentationCapacity,
-    setRepresentationSubmit,
-    setSubmitBack,
-} from "../../../store/currentView/action";
 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,74 @@ const RepComplete = (props) => {
         </li>
     ));
 
+    useEffect(() => {
+        const reference = "PEDW-REPRESENTATION-COMPLETE";
+        const templateId = "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.currentReference,
+                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));
+    });
     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>
+                    <p>{t("myrepresentations:rep-complete-para-one")}</p>
-                        Thank you for submitting your representation(s) using
+                    <p>{t("myrepresentations:rep-complete-para-two")}</p>
-                        the Appeals Casework Portal.
+                    <p> {t("myrepresentations:rep-complete-para-three")}</p>
-                    </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>
                 </div>
                 <div className="govuk-grid-row">
                     <div className="govuk-button-group">
-                        <Link href="/myportal">
+                        <Link
-                            <a className="govuk-button">Continue</a>
+                            href="/"
+                            onClick={() => setRepresentationReset()}
+                            className="govuk-button"
+                        >
+                            {t("common:continue-button")}
                         </Link>
                     </div>
                 </div>
@@ -73,4 +112,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);

components/case/representation/representationCompleteSubmit.js

@@ -1,24 +1,28 @@
-import Link from "next/link";
+import _ from "lodash";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
+import { useRouter } from "next/router";
-import {
+import { useState } from "react";
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
-import {
-    setRepresentationCapacity,
-    setRepresentationSubmit,
-    setSubmitBack,
-    setRepresentationSubmitConfirmation,
-} from "../../../store/currentView/action";
 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,661 @@ 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 ">
+                                {" "}
+                                {repFormData.appealType == 846040002
+                                    ? t(
+                                          "myrepresentations:consultation-check-submit-heading"
+                                      )
+                                    : t(
+                                          "myrepresentations:rep-check-submit-heading"
+                                      )}
+                            </h1>
+                            <dl className="govuk-summary-list ">
+                                <h2 className="govuk-heading-m govuk-!-margin-top-9">
+                                    {repFormData.appealType == 846040002
+                                        ? t(
+                                              "myrepresentations:consultation-check-your-rep-heading"
+                                          )
+                                        : t(
+                                              "myrepresentations:rep-check-your-rep-heading"
+                                          )}
+                                </h2>
+                                <div className="govuk-summary-list__row">
+                                    <dt className="govuk-summary-list__key">
+                                        {repFormData.appealType == 846040002
+                                            ? t(
+                                                  "case:consultation-representation-type"
+                                              )
+                                            : 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" &&
+                                    repFormData.appealType != 846040002 && (
+                                        <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
+                                {t(
-                                personal data supplied by you in this form, is
+                                    "myrepresentations:rep-check-tandc-para-one"
-                                in accordance with the terms of our registration
+                                )}
-                                under the Data Protection Act 2018.
                             </p>
-
                             <p>
-                                The Planning Inspectorate takes its data
+                                {t(
-                                protection responsibilities for the information
+                                    "myrepresentations:rep-check-tandc-para-two"
-                                you provide us with very seriously. To find out
+                                )}{" "}
-                                more about how we use and manage your personal
+                                <Link
-                                data, please go to our privacy notice.
+                                    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
+                                {t(
-                                been fully completed and that the details are
+                                    "myrepresentations:rep-check-tandc-para-three"
-                                correct to the best of my knowledge.
+                                )}
                             </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">
+                                    <div className="govuk-grid-row">
-                                <label
+                                        <div className="govuk-button-group">
-                                    className="govuk-label govuk-body-m"
+                                            <button
-                                    htmlFor="representationType"
+                                                disabled={
-                                >
+                                                    confirmSections
-                                    I confirm I have read the above.
+                                                        ? false
-                                </label>
+                                                        : true
-                                {/* <Field
+                                                }
-                        name="representationType"
+                                                type="submit"
-                        component={RenderPickList}
+                                                className="govuk-button"
-                        datafieldname="representationType"
+                                                data-module="govuk-button"
-                        optionsArr={appellantApplicantRepresentationArr}
+                                                onClick={() => {
-                    /> */}
+                                                    // setRepresentationSubmitConfirmation(
-                            </div>
+                                                    //     true
-                        </div>
+                                                    // );
-                        <div className="govuk-grid-row">
+                                                    setRepresentationSubmit(
-                            <div className="govuk-button-group">
+                                                        true
-                                <button
+                                                    );
-                                    type="submit"
+                                                }}
-                                    className="govuk-button"
+                                            >
-                                    data-module="govuk-button"
+                                                {t("common:continue-button")}
-                                    onClick={() =>
+                                            </button>
-                                        setRepresentationSubmitConfirmation()
+                                            <a
-                                    }
+                                                onClick={() => setSubmitBack()}
-                                >
+                                                className="govuk-link"
-                                    Continue
+                                            >
-                                </button>
+                                                {t(
-                                {/* <a
+                                                    "case:summary-back-button-label"
-                        onClick={() => {
+                                                )}
-                            setRepresentationSubmit(false);
+                                            </a>
-                        }}
+                                        </div>
-                        className="govuk-button"
+                                    </div>
-                    >
+                                </>
-                        Continue
+                            )}
-                    </a> */}
-
-                                <a
-                                    onClick={() => setSubmitBack()}
-                                    className="govuk-link"
-                                >
-                                    Back
-                                </a>
-                            </div>
                         </div>
                     </div>
                 </div>
@@ -119,4 +712,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);

components/case/representation/representationDetails.js

@@ -1,8 +1,6 @@
-import Link from "next/link";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import { useRouter } from "next/router";
 import useTranslation from "next-translate/useTranslation";
-import { Field, reduxForm } from "redux-form";
+import { useRouter } from "next/router";
-import { RenderPickList, RenderTextfield } from "./representationElements";
 
 const RepDetails = (props) => {
     let { t } = useTranslation();
@@ -10,7 +8,33 @@ const RepDetails = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    const { currentType, casesObj } = props;
+    const { currentType, casesObj, appealType } = props;
+
+    let { caseReference } = 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: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
+        json: setCaseDetailsObj,
+        eval: true,
+    });
+
+    detailsObj = detailsObj[0];
 
     return (
         <>
@@ -24,41 +48,63 @@ 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 || ""}
+                                {_.has(detailsObj, "pinswg_siteaddressline1")
-                                <br />
+                                    ? detailsObj.pinswg_siteaddressline1
-                                {casesObj.town || ""}
+                                    : ""}
-
+                                {_.has(detailsObj, "pinswg_siteaddressline1") &&
-                                <br />
+                                    detailsObj.pinswg_siteaddressline1 !=
-                                {casesObj.postcode || ""}
+                                        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
+                        {appealType == 846040002
-                        Planning and Environment Decisions Wales.{" "}
+                            ? t("myrepresentations:sips-capacity-para-one")
+                            : t("myrepresentations:capacity-para-one")}
                     </p>
                     <p className="govuk-body">
-                        Please note that comments from interested parties need
+                        {appealType == 846040002
-                        to be made within the timetable. This can be found on
+                            ? t("myrepresentations:sips-capacity-para-two")
-                        the previous &lsquo;Case Summary&lsquo; page. Comments
+                            : t("myrepresentations:capacity-para-two")}
-                        submitted after this date may be considered invalid.
                     </p>
                 </div>
             </div>

components/case/representation/representationInterestedPartyPerson.js

@@ -1,14 +1,24 @@
-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,
+    RenderRichMultiline,
-    RenderRadioList,
+    shouldDisableButton,
-    RenderMultiline,
 } from "./representationElements";
+
 import { useDropzone } from "react-dropzone";
+import {
+    setRepresentationCapacity,
+    setRepresentationSubmit,
+    setFilesForRepresentations,
+} from "../../../store/currentView/action";
 
 const RepInterestedPartyPerson = (props) => {
     let { t } = useTranslation();
@@ -20,311 +30,306 @@ const RepInterestedPartyPerson = (props) => {
         interestedPersonRepresentationArr,
         setRepresentationCapacity,
         setRepresentationSubmit,
+        setRepFileName,
+        updateRepresentation,
+        setSavingStatus,
+        savingStatus,
+        setFilesForRepresentations,
     } = props;
-    const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
+    const required = (value) => (value ? undefined : "Required");
-    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 { 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
+                        {typeof formObj.representationForm.values
-                            className="govuk-label govuk-body-m"
+                            .representationType == "undefined" &&
-                            htmlFor="representationType"
+                        props.representationType != "Select..." ? (
-                        >
+                            <>
-                            What kind of representation are you making?
+                                <h2 className="govuk-heading-m ">
-                        </label>
+                                    {t(
-                        <Field
+                                        "myrepresentations:consultation-from-an-interested-person-heading"
-                            name="representationType"
+                                    )}
-                            component={RenderPickList}
+                                </h2>
-                            datafieldname="representationType"
+
-                            optionsArr={interestedPersonRepresentationArr}
+                                <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">
+                {(typeof props.representationType != "undefined" ||
-                    <div className="govuk-form-group">
+                    typeof formObj.representationForm.values
-                        <Field
+                        .representationType != "undefined") && (
-                            className="govuk-input govuk-!-width-three-quarters"
+                    <>
-                            id="representationDescription"
+                        <div className="govuk-grid-row">
-                            name="representationDescription"
+                            <div className="govuk-form-group">
-                            value="email"
+                                <Field
-                            data-aria-controls="representationDescription"
+                                    name="representationOnBehalfOf"
-                            type="text"
+                                    datafieldname="representationOnBehalfOf"
-                            component={RenderTextfield}
+                                    // label="In what capacity do you wish to make representations on this case?"
-                            label="Description of representation"
+                                    options={[
-                        />
+                                        t(
-                    </div>
+                                            "myrepresentations:questionnaire-yes"
-                    <div className="govuk-grid-row">
+                                        ),
-                        <div className="govuk-form-group">
+                                        t("myrepresentations:questionnaire-no"),
-                            <fieldset
+                                    ]}
-                                className="govuk-fieldset"
+                                    id="representationOnBehalfOf"
-                                aria-describedby="contact-hint"
+                                    className="govuk-radios__input"
-                            >
+                                    errorMsg={t(
-                                <legend className="govuk-fieldset__legend govuk-fieldset__legend--l">
+                                        "myrepresentations:select-an-option-label"
-                                    <label
+                                    )}
-                                        className="govuk-fieldset__heading govuk-body-m"
+                                    component={RenderCondtionalRadioList}
-                                        id="representationCapacity_label"
+                                    validate={[required]}
-                                    >
+                                    legend={t("case:representation-onbehalfof")}
-                                        Are you acting on behalf of a company,
+                                    hint={t(
-                                        group or organisation?
+                                        "myrepresentations:representation-onbehalfof-hint"
-                                    </label>
+                                    )}
-                                </legend>
+                                />
-                                <div id="contact-hint" className="govuk-hint">
+                            </div>
-                                    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>
                         </div>
-                    </div>
+
-                    <div className="govuk-grid-row">
+                        <div className="govuk-grid-row">
-                        <div className="govuk-form-group">
+                            <div className="govuk-form-group">
-                            <p className="govuk-body">
+                                <p className="govuk-body">
-                                You can enter your comments in the space
+                                    {t("myrepresentations:enter-comment-label")}
-                                provided or attach a separate document.
+                                </p>
-                            </p>
+                                <fieldset
-                            <fieldset
+                                    className="govuk-fieldset"
-                                className="govuk-fieldset"
+                                    aria-describedby="commentBox-hint"
-                                aria-describedby="commentBox-hint"
-                            >
-                                <div
-                                    id="commentBox-hint"
-                                    className="govuk-hint"
                                 >
-                                    My comments are set out in:*
+                                    {/* <div
-                                </div>
+                                        id="commentBox-hint"
-                                <div
+                                        className="govuk-hint"
-                                    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 className="govuk-form-group">
+                                        {t(
-                                            <Field
+                                            "myrepresentations:comments-set-out-label"
-                                                name="representationComments"
+                                        )}
-                                                id="representationComments"
+                                        :
-                                                component={RenderMultiline}
+                                    </div> */}
-                                                type="text"
+                                    <div className="govuk-form-group">
-                                                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"
+                                            name="representationComments"
-                                            id="documentBox"
+                                            id="representationComments"
-                                            name="documentBox"
+                                            component={RenderRichMultiline}
-                                            value="email"
+                                            type="text"
-                                            data-aria-controls="documentBox"
+                                            rows="5"
-                                            type="checkbox"
+                                            className="govuk-textarea govuk-input--width-30"
-                                            component={RenderTextfield}
+                                            aria-describedby={
+                                                props.name + "-hint"
+                                            }
                                         />
-                                        <label
-                                            className="govuk-label govuk-checkboxes__label"
-                                            htmlFor="documentBox"
-                                        >
-                                            separate documents
-                                        </label>
                                     </div>
-                                    <div
+
-                                        className={
+                                    <div className="govuk-form-group govuk-!-margin-bottom-9">
-                                            _.isEmpty(
+                                        <FileUploadField
-                                                formObj["representationForm"]
+                                            name={"representationDocuments"}
-                                            )
+                                            id={"representationDocuments"}
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
+                                            label={t(
-                                                : _.isEmpty(
+                                                "myrepresentations:add-files-label"
-                                                      formObj[
+                                            )}
-                                                          "representationForm"
+                                            ticketnumber={
-                                                      ].values
+                                                props.props.caseReference
-                                                  )
+                                            }
-                                                ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
+                                            hint={"sdsd"}
-                                                : _.isEmpty(
+                                            fileList={
-                                                      formObj[
+                                                props.currentView.fileList
-                                                          "representationForm"
+
-                                                      ].values.documentBox
+                                                // props.currentView.caseReference.hasOwnProperty(
-                                                  )
+                                                //     "repDetails"
-                                                ? formObj["representationForm"]
+                                                // )
-                                                      .values.documentBox ==
+                                                //     ? props.currentView.caseReference.repDetails.hasOwnProperty(
-                                                  false
+                                                //           "filesList"
-                                                    ? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
+                                                //       ) &&
-                                                    : "govuk-checkboxes__conditional"
+                                                //       props.currentView
-                                                : "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
+                                                //           .caseReference
-                                        }
+                                                //           .repDetails.filesList
-                                        id="conditional-documentBox"
+                                                //           .length > 0
-                                    >
+                                                //         ? props.currentView
-                                        <div className="govuk-form-group">
+                                                //               .caseReference
-                                            <section className="container">
+                                                //               .repDetails
-                                                <div
+                                                //               .filesList
-                                                    {...getRootProps({
+                                                //         : []
-                                                        className: "dropzone",
+                                                //     : []
-                                                    })}
+                                            }
-                                                >
+                                            setFilesForRepresentations={
-                                                    <input
+                                                setFilesForRepresentations
-                                                        {...getInputProps()}
+                                            }
-                                                    />
+                                            containerID={
-                                                    <p>
+                                                props.props.props.accountDetails
-                                                        Drag and drop files here
+                                                    .containerID
-                                                        or click to select files
+                                            }
-                                                    </p>
+                                            filenamePrefix={props.formObj}
-                                                </div>
+                                            props={props.props.props}
-                                                <aside>
+                                            setCurrentReference={
-                                                    <h4>Files</h4>
+                                                props.setCurrentReference
-                                                    <ul>{files}</ul>
+                                            }
-                                                </aside>
+                                        />
-                                            </section>
-                                        </div>
                                     </div>
-                                </div>
+                                </fieldset>
-                            </fieldset>
+                            </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"
+                                disabled={shouldDisableButton({
+                                    props,
+                                    formObj,
+                                })}
                             >
-                                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
+                                    {t("common:save-exit-button")}
-                                </a>
+                                </button>
-                            </Link> */}
+                            )}
-                            <a
-                                onClick={() => {
-                                    setRepresentationCapacity();
-                                }}
-                                className="govuk-link"
-                            >
-                                Back
-                            </a>
                         </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)
+);

components/case/representation/representationLPA.js

@@ -0,0 +1,669 @@
+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,
+    shouldDisableButton,
+} 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.props.caseReference
+                                            }
+                                            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"
+                                    disabled={shouldDisableButton({
+                                        props,
+                                        formObj,
+                                    })}
+                                    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)
+);

components/case/representation/representationLPACapacitySelection.js

@@ -0,0 +1,88 @@
+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}
+                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;

components/case/representation/representationLPAComments.js

@@ -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)
+);

components/case/representation/representationLPADetails.js

@@ -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 } = 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: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
+        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;

components/case/representation/representationLandowner.js

@@ -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 { useRouter } from "next/router";
-import {
-    RenderPickList,
-    RenderTextfield,
-    RenderRadioList,
-    RenderMultiline,
-} from "./representationElements";
 import { useDropzone } from "react-dropzone";
+import { Field } from "redux-form";
 import {
-    setRepresentationCapacity,
+    FileUploadField,
-    setRepresentationSubmit,
+    RenderPickList,
-} from "../../../store/currentView/action";
+    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,75 @@ 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
+                            {t("myrepresentations:enter-comment-label")}
-                            attach a separate document.
                         </p>
                         <fieldset
                             className="govuk-fieldset"
                             aria-describedby="commentBox-hint"
                         >
-                            <div id="commentBox-hint" className="govuk-hint">
+                            {/* <div id="commentBox-hint" className="govuk-hint">
-                                My comments are set out in:*
+                                {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"
+                            <div className="govuk-form-group govuk-!-margin-bottom-9">
-                                data-module="govuk-checkboxes"
+                                <FileUploadField
-                            >
+                                    name={"representationDocuments"}
-                                <div className="govuk-checkboxes__item">
+                                    id={"representationDocuments"}
-                                    <Field
+                                    label={t(
-                                        className="govuk-checkboxes__input"
+                                        "myrepresentations:add-files-label"
-                                        id="commentBox"
+                                    )}
-                                        name="commentBox"
+                                    ticketnumber={props.props.caseReference}
-                                        value="email"
+                                    hint={"sdsd"}
-                                        data-aria-controls="commentBox"
+                                    fileList={[]}
-                                        type="checkbox"
+                                    setFilesForRepresentation={[]}
-                                        component={RenderTextfield}
+                                    containerID={
-                                    />
+                                        props.props.props.accountDetails
-                                    <label
+                                            .containerID
-                                        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 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"
-                                    }
-                                    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">
+                {typeof formObj.representationForm.values.representationType !=
-                    <div className="govuk-button-group">
+                    "undefined" && (
-                        <button
+                    <div className="govuk-grid-row">
-                            type="submit"
+                        <div className="govuk-button-group">
-                            className="govuk-button"
+                            <button
-                            data-module="govuk-button"
+                                type="submit"
-                        >
-                            Continue
-                        </button>
-                        {/* <Link href="/representation">
-                            <a
-                                onClick={() => {
-                                    setRepresentationSubmit(true);
-                                }}
                                 className="govuk-button"
+                                data-module="govuk-button"
                             >
-                                Continue
+                                {t("common:continue-button")}
-                            </a>
+                            </button>
-                        </Link> */}
+                            {router.query.state != "edit" && (
-                        <a
+                                <a
-                            onClick={() => {
+                                    onClick={() => {
-                                setRepresentationCapacity();
+                                        setRepresentationCapacity();
-                            }}
+                                    }}
-                            className="govuk-link"
+                                    className="govuk-link"
-                        >
+                                >
-                            Back
+                                    {t("common:back-link")}
-                        </a>
+                                </a>
+                            )}
+                        </div>
                     </div>
-                </div>
+                )}
             </div>
         </div>
     );

components/case/representation/representationProgress/representationProgress_enforcement.js

@@ -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;

components/case/representation/representationProgress/representationProgress_s78.js

@@ -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;

components/case/representationList.js

@@ -1,15 +1,14 @@
-import Link from "next/link";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-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 _ 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(
+                        let detailsObj = jsonpath({
-                            item,
+                            path:
-                            "$..[?(@.pinswg_representationsid=='" +
+                                "$..[?(@ && @.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(
+                                        ? jsonpath({
-                                              transLookup,
+                                              path:
-                                              '$..[?(@.value=="' +
+                                                  '$..[?(@ && @.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")}
-            /> */}
         </>
     );
 };

components/case/summary/utils/helpers.js

@@ -0,0 +1,81 @@
+import Link from "next/link";
+import { useRouter } from "next/router";
+
+export function capitalizeFirstLetter(val) {
+    return String(val).charAt(0).toUpperCase() + String(val).slice(1);
+}
+
+export function formatDates(dateObj, showTime) {
+    const d = new Date(dateObj);
+    const dd = String(d.getDate()).padStart(2, "0");
+    const mm = String(d.getMonth() + 1).padStart(2, "0");
+    const yyyy = d.getFullYear();
+    const hh = String(d.getHours()).padStart(2, "0");
+    const mins = String(d.getMinutes()).padStart(2, "0");
+
+    return showTime && !(hh === "00" && mins === "00")
+        ? `${hh}:${mins}`
+        : `${dd}/${mm}/${yyyy}`;
+}
+
+export function hasValidKey(obj, key) {
+    return obj?.hasOwnProperty(key) && obj[key] !== null && obj[key] !== "";
+}
+
+export function showReps(startDate, endDate) {
+    const now = new Date();
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+    return now >= start && now <= end;
+}
+
+export function showRepsEnded(startDate, endDate) {
+    const now = new Date();
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+    return now > start && now > end;
+}
+
+export function isObjectNotEmpty(obj, key) {
+    return obj.hasOwnProperty(key) && Object.keys(obj[key]).length > 0;
+}
+
+export function hasOwnPropertyAndNotNull(obj, property) {
+    return obj.hasOwnProperty(property) && obj[property] !== null;
+}
+
+export function linkedCasesList(linkedCasesReference) {
+    //console.log(linkedCasesReference);
+
+    const router = useRouter();
+
+    linkedCasesReference = linkedCasesReference.value || [];
+
+    return (
+        <>
+            <ul className="govuk-list govuk-!-font-size-16">
+                {linkedCasesReference.map((item, key) => {
+                    return (
+                        <li key={key}>
+                            <Link
+                                href={
+                                    router.locale == "cy"
+                                        ? "/canlyniadauchwilio?q=" +
+                                          item.title +
+                                          "&lk=1"
+                                        : "/searchresults?q=" +
+                                          item.title +
+                                          "&lk=1"
+                                }
+                                className=""
+                            >
+                                {item.title}
+                            </Link>
+                        </li>
+                    );
+                    //console.log(item.incidentid, item.title);
+                })}
+            </ul>
+        </>
+    );
+}

components/case/summaryTypes/index.js

@@ -0,0 +1,26 @@
+export { default as Pinswg_advertsid } from "./pinswg_advertsid";
+export { default as Pinswg_callinss77id } from "./pinswg_callinss77id";
+export { default as Pinswg_commonlandid } from "./pinswg_commonlandid";
+export { default as Pinswg_communityinfrastructurelevyid } from "./pinswg_communityinfrastructurelevyid";
+export { default as Pinswg_compulsorypurchaseordersid } from "./pinswg_compulsorypurchaseordersid";
+export { default as Pinswg_dnsid } from "./pinswg_dnsid";
+export { default as Pinswg_sipscase } from "./pinswg_sipscase";
+export { default as Pinswg_electricityactid } from "./pinswg_electricityactid";
+export { default as Pinswg_enforcementlistedbuildingconseid } from "./pinswg_enforcementlistedbuildingconseid";
+export { default as Pinswg_enforcementnoticeappeals174id } from "./pinswg_enforcementnoticeappeals174id";
+export { default as Pinswg_environmentalpermittingid } from "./pinswg_environmentalpermittingid";
+export { default as Pinswg_harbourrevisionorderid } from "./pinswg_harbourrevisionorderid";
+export { default as Pinswg_hedgeshedgerowstreepreservatioid } from "./pinswg_hedgeshedgerowstreepreservatioid";
+export { default as Pinswg_householderappealhasid } from "./pinswg_householderappealhasid";
+export { default as Pinswg_lawfuldevelopmentcertificatappid } from "./pinswg_lawfuldevelopmentcertificatappid";
+export { default as Pinswg_ldpid } from "./pinswg_ldpid";
+export { default as Pinswg_listedbuildingandconservationrid } from "./pinswg_listedbuildingandconservationrid";
+export { default as Pinswg_maintenanceoflands217id } from "./pinswg_maintenanceoflands217id";
+export { default as Pinswg_miscellaneouscasewordid } from "./pinswg_miscellaneouscasewordid";
+export { default as Pinswg_nonvalidationid } from "./pinswg_nonvalidationid";
+export { default as Pinswg_planningappeals78id } from "./pinswg_planningappeals78id";
+export { default as Pinswg_planningconditionss73s79id } from "./pinswg_planningconditionss73s79id";
+export { default as Pinswg_planningobligationappeals106id } from "./pinswg_planningobligationappeals106id";
+export { default as Pinswg_rowid } from "./pinswg_rowid";
+export { default as Pinswg_transportandworkactid } from "./pinswg_transportandworkactid";
+export { default as Pinswg_wayleaveid } from "./pinswg_wayleaveid";

components/case/summaryTypes/pinswg_advertsid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +91,24 @@ const Pinswg_advertsid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +117,16 @@ const Pinswg_advertsid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +138,16 @@ const Pinswg_advertsid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +159,16 @@ const Pinswg_advertsid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +177,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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +256,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">

components/case/summaryTypes/pinswg_callinss77id.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_callinss77id = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_callinss77id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_callinss77id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_callinss77id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_callinss77id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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 +332,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"

components/case/summaryTypes/pinswg_commonlandid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_commonlandid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_commonlandid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_commonlandid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_commonlandid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_commonlandid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +236,22 @@ const Pinswg_commonlandid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -238,7 +261,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 +337,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"

components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] ||
@@ -46,17 +48,24 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
 
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -65,14 +74,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +95,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +116,16 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +140,21 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +216,22 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -220,7 +241,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">

components/case/summaryTypes/pinswg_dnsid.js

@@ -1,10 +1,7 @@
 import { useRouter } from "next/router";
-import Head from "next/head";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import { useEffect, useRef, ReactElement } from "react";
+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 = {};
+    let point = {};
-    const siteCoords = {};
+    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,17 @@ const Pinswg_dnsid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +151,14 @@ const Pinswg_dnsid = (props) => {
                                             </dt>
                                             <dd className="govuk-summary-list__value">
                                                 {router.locale == "cy"
-                                                    ? jsonpath.query(
+                                                    ? jsonpath({
-                                                          transLookup,
+                                                          path:
-                                                          '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
+                                                              '")].value_cy',
-                                                      )
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                     : (
                                                           <a
                                                               target="_blank"
@@ -187,33 +189,61 @@ const Pinswg_dnsid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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"
                                                   ] || ""}
                                         </dd>
                                     </div>
+                                    <div className="govuk-summary-list__row">
+                                        <dt className="govuk-summary-list__key">
+                                            {t(
+                                                "case:summary-eia-required-label"
+                                            )}
+                                        </dt>
+                                        <dd className="govuk-summary-list__value">
+                                            {router.locale == "cy"
+                                                ? jsonpath(
+                                                      '$..[?(@.value=="' +
+                                                          detailsObj[
+                                                              "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                          ] +
+                                                          '")].value_cy',
+                                                      transLookup
+                                                  )
+                                                : detailsObj[
+                                                      "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                  ] ||
+                                                  t(
+                                                      "case:summary-to-be-confirmed-label"
+                                                  )}
+                                        </dd>
+                                    </div>
                                     <div className="govuk-summary-list__row">
                                         <dt className="govuk-summary-list__key">
                                             {t("case:summary-procedure-label")}
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +258,13 @@ const Pinswg_dnsid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({path:
-                                                      transLookup,
+                                                      
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "statuscode@OData.Community.Display.V1.FormattedValue"
                                                           ] +
-                                                          '")].value_cy'
+                                                          '")].value_cy',transLookup
                                                   )
                                                 : casesObj[
                                                       "statuscode@OData.Community.Display.V1.FormattedValue"
@@ -267,14 +297,16 @@ const Pinswg_dnsid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +366,16 @@ const Pinswg_dnsid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +467,12 @@ const Pinswg_dnsid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({path:
-                                                      transLookup,
+                                                      '$..[?(@ && @.value=="' +
-                                                      '$..[?(@.value=="' +
                                                           detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
+                                                          '")].value_cy', 
+                                                          transLookup,
+
                                                   )
                                                 : detailsObj.pinswg_recommendation}
                                         </dd>
@@ -446,7 +481,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">

components/case/summaryTypes/pinswg_electricityactid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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,19 +89,45 @@ const Pinswg_electricityactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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"
                                                   ] || ""}
                                         </dd>
                                     </div>
+                                    <div className="govuk-summary-list__row">
+                                        <dt className="govuk-summary-list__key">
+                                            {t(
+                                                "case:summary-eia-required-label"
+                                            )}
+                                        </dt>
+                                        <dd className="govuk-summary-list__value">
+                                            {router.locale == "cy"
+                                                ? jsonpath(
+                                                      '$..[?(@.value=="' +
+                                                          detailsObj[
+                                                              "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                          ] +
+                                                          '")].value_cy',
+                                                      transLookup
+                                                  )
+                                                : detailsObj[
+                                                      "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                  ] ||
+                                                  t(
+                                                      "case:summary-to-be-confirmed-label"
+                                                  )}
+                                        </dd>
+                                    </div>
                                     <div className="govuk-summary-list__row">
                                         <dt className="govuk-summary-list__key">
                                             {t(
@@ -123,14 +151,16 @@ const Pinswg_electricityactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +174,16 @@ const Pinswg_electricityactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +195,16 @@ const Pinswg_electricityactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +219,16 @@ const Pinswg_electricityactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +295,14 @@ const Pinswg_electricityactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
+                                                          '")].value_cy',
-                                                  )
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                 : detailsObj.pinswg_recommendation ||
                                                   t(
                                                       "case:summary-no-date-entered-label"
@@ -280,12 +318,14 @@ const Pinswg_electricityactid = (props) => {
                                             </dt>
                                             <dd className="govuk-summary-list__value">
                                                 {router.locale == "cy"
-                                                    ? jsonpath.query(
+                                                    ? jsonpath({
-                                                          transLookup,
+                                                          path:
-                                                          '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
+                                                              '")].value_cy',
-                                                      )
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                     : detailsObj.pinswg_webaddress ||
                                                       t(
                                                           "case:summary-no-date-entered-label"
@@ -297,7 +337,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">

components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_environmentalpermittingid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_environmentalpermittingid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_environmentalpermittingid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_environmentalpermittingid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +236,22 @@ const Pinswg_environmentalpermittingid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -238,7 +261,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">

components/case/summaryTypes/pinswg_harbourrevisionorderid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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,19 +89,45 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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"
                                                   ] || ""}
                                         </dd>
                                     </div>
+                                    <div className="govuk-summary-list__row">
+                                        <dt className="govuk-summary-list__key">
+                                            {t(
+                                                "case:summary-eia-required-label"
+                                            )}
+                                        </dt>
+                                        <dd className="govuk-summary-list__value">
+                                            {router.locale == "cy"
+                                                ? jsonpath(
+                                                      '$..[?(@.value=="' +
+                                                          detailsObj[
+                                                              "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                          ] +
+                                                          '")].value_cy',
+                                                      transLookup
+                                                  )
+                                                : detailsObj[
+                                                      "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                  ] ||
+                                                  t(
+                                                      "case:summary-to-be-confirmed-label"
+                                                  )}
+                                        </dd>
+                                    </div>
                                     <div className="govuk-summary-list__row">
                                         <dt className="govuk-summary-list__key">
                                             {t(
@@ -123,14 +151,16 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +172,16 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +196,21 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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 +272,14 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
+                                                          '")].value_cy',
-                                                  )
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                 : detailsObj.pinswg_recommendation ||
                                                   t(
                                                       "case:summary-no-date-entered-label"
@@ -259,12 +295,14 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             </dt>
                                             <dd className="govuk-summary-list__value">
                                                 {router.locale == "cy"
-                                                    ? jsonpath.query(
+                                                    ? jsonpath({
-                                                          transLookup,
+                                                          path:
-                                                          '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
+                                                              '")].value_cy',
-                                                      )
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                     : detailsObj.pinswg_webaddress ||
                                                       t(
                                                           "case:summary-no-date-entered-label"
@@ -276,7 +314,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">

components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +91,24 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +117,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +138,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +159,16 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +183,21 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +259,22 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -238,7 +284,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">

components/case/summaryTypes/pinswg_householderappealhasid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_householderappealhasid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_householderappealhasid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_householderappealhasid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +139,21 @@ const Pinswg_householderappealhasid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +211,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 +313,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"

components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_ldpid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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,48 +51,38 @@ const Pinswg_ldpid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
                                     </dd>
                                 </div>
-                                <div className="govuk-summary-list__row">
+
-                                    <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
-                                    </dt>
-                                    <dd className="govuk-summary-list__value">
-                                        {" "}
-                                        {/* {casesObj.caseDetails.caseOfficer ||
-                                ""} */}
-                                        {_.has(casesObj, "_ownerid_value")
-                                            ? casesObj[
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
-                                              ]
-                                            : ""}
-                                    </dd>
-                                </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
                                         {t("case:summary-procedure-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +94,16 @@ const Pinswg_ldpid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_ldpid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +139,21 @@ const Pinswg_ldpid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +211,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">

components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_maintenanceoflands217id.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_miscellaneouscasewordid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +236,22 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -238,7 +261,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">

components/case/summaryTypes/pinswg_nonvalidationid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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,48 +51,37 @@ const Pinswg_nonvalidationid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
                                     </dd>
                                 </div>
-                                <div className="govuk-summary-list__row">
+
-                                    <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
-                                    </dt>
-                                    <dd className="govuk-summary-list__value">
-                                        {" "}
-                                        {/* {casesObj.caseDetails.caseOfficer ||
-                                ""} */}
-                                        {_.has(casesObj, "_ownerid_value")
-                                            ? casesObj[
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
-                                              ]
-                                            : ""}
-                                    </dd>
-                                </div>
                                 {/* <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
                                         {t("case:summary-procedure-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({path:
-                                                  transLookup,
+                                                  '$..[?(@ && @.value=="' +
-                                                  '$..[?(@.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 +93,16 @@ const Pinswg_nonvalidationid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +117,21 @@ const Pinswg_nonvalidationid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +147,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">

components/case/summaryTypes/pinswg_planningappeals78id.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_planningappeals78id = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_planningappeals78id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,22 @@ const Pinswg_planningappeals78id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +139,16 @@ const Pinswg_planningappeals78id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +163,21 @@ const Pinswg_planningappeals78id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +258,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">

components/case/summaryTypes/pinswg_planningconditionss73s79id.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequiered@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_planningobligationappeals106id.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +232,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">

components/case/summaryTypes/pinswg_rowid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +91,24 @@ const Pinswg_rowid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreeningrequired@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +117,16 @@ const Pinswg_rowid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +138,16 @@ const Pinswg_rowid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +159,16 @@ const Pinswg_rowid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +183,21 @@ const Pinswg_rowid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +259,22 @@ const Pinswg_rowid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -238,7 +284,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">

components/case/summaryTypes/pinswg_transportandworkactid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.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"
                                                   ] ||
@@ -81,6 +83,30 @@ const Pinswg_transportandworkactid = (props) => {
                                                   )}
                                         </dd>
                                     </div>
+                                    <div className="govuk-summary-list__row">
+                                        <dt className="govuk-summary-list__key">
+                                            {t(
+                                                "case:summary-eia-required-label"
+                                            )}
+                                        </dt>
+                                        <dd className="govuk-summary-list__value">
+                                            {router.locale == "cy"
+                                                ? jsonpath(
+                                                      '$..[?(@.value=="' +
+                                                          detailsObj[
+                                                              "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                          ] +
+                                                          '")].value_cy',
+                                                      transLookup
+                                                  )
+                                                : detailsObj[
+                                                      "pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
+                                                  ] ||
+                                                  t(
+                                                      "case:summary-to-be-confirmed-label"
+                                                  )}
+                                        </dd>
+                                    </div>
 
                                     <div className="govuk-summary-list__row">
                                         <dt className="govuk-summary-list__key">
@@ -90,12 +116,14 @@ const Pinswg_transportandworkactid = (props) => {
                                         </dt>
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
-                                                ? jsonpath.query(
+                                                ? jsonpath({
-                                                      transLookup,
+                                                      path:
-                                                      '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
-                                                          '")].value_cy'
+                                                          '")].value_cy',
-                                                  )
+                                                      json: transLookup,
+                                                      eval: true,
+                                                  })
                                                 : detailsObj.pinswg_recommendation ||
                                                   t(
                                                       "case:summary-no-date-entered-label"
@@ -111,12 +139,14 @@ const Pinswg_transportandworkactid = (props) => {
                                             </dt>
                                             <dd className="govuk-summary-list__value">
                                                 {router.locale == "cy"
-                                                    ? jsonpath.query(
+                                                    ? jsonpath({
-                                                          transLookup,
+                                                          path:
-                                                          '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
-                                                              '")].value_cy'
+                                                              '")].value_cy',
-                                                      )
+                                                          json: transLookup,
+                                                          eval: true,
+                                                      })
                                                     : detailsObj.pinswg_webaddress ||
                                                       t(
                                                           "case:summary-no-date-entered-label"
@@ -128,7 +158,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">

components/case/summaryTypes/pinswg_wayleaveid.js

@@ -1,7 +1,7 @@
-import { useRouter } from "next/router";
+import { JSONPath as jsonpath } from "jsonpath-plus";
-import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
 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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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"
                                               ] || ""}
@@ -64,17 +68,24 @@ const Pinswg_wayleaveid = (props) => {
                                 </div>
                                 <div className="govuk-summary-list__row">
                                     <dt className="govuk-summary-list__key">
-                                        {t("case:summary-case-officer-label")}
+                                        {t("case:summary-eia-required-label")}
                                     </dt>
                                     <dd className="govuk-summary-list__value">
-                                        {" "}
+                                        {router.locale == "cy"
-                                        {/* {casesObj.caseDetails.caseOfficer ||
+                                            ? jsonpath(
-                                ""} */}
+                                                  '$..[?(@.value=="' +
-                                        {_.has(casesObj, "_ownerid_value")
+                                                      detailsObj[
-                                            ? casesObj[
+                                                          "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue"
-                                                  "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+                                                      ] +
-                                              ]
+                                                      '")].value_cy',
-                                            : ""}
+                                                  transLookup
+                                              )
+                                            : detailsObj[
+                                                  "pinswg_detailedeiascreening@OData.Community.Display.V1.FormattedValue"
+                                              ] ||
+                                              t(
+                                                  "case:summary-to-be-confirmed-label"
+                                              )}
                                     </dd>
                                 </div>
                                 <div className="govuk-summary-list__row">
@@ -83,14 +94,16 @@ const Pinswg_wayleaveid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +115,16 @@ const Pinswg_wayleaveid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +136,16 @@ const Pinswg_wayleaveid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +160,21 @@ const Pinswg_wayleaveid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.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 +236,22 @@ const Pinswg_wayleaveid = (props) => {
                                     </dt>
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
-                                            ? jsonpath.query(
+                                            ? jsonpath({
-                                                  transLookup,
+                                                  path:
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value_cy'
+                                                      '")].value_cy',
-                                              )
+                                                  json: transLookup,
-                                            : jsonpath.query(
+                                                  eval: true,
-                                                  transLookup,
+                                              })
-                                                  '$..[?(@.pinswg_lpa=="' +
+                                            : jsonpath({
+                                                  path:
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
-                                                      '")].value'
+                                                      '")].value',
-                                              ) ||
+                                                  json: transLookup,
+                                                  eval: true,
+                                              }) ||
                                               t(
                                                   "case:summary-no-date-entered-label"
                                               )}
@@ -238,7 +261,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">

components/case/watchmodal.js

@@ -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;

components/caseresults.js

@@ -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">
+                        <Link href="/advancedsearch" className="govuk-button">
-                            <a className="govuk-button">
+                            {t("search:searchresults-search-button-label")}
-                                {t("search:searchresults-search-button-label")}
-                            </a>
                         </Link>
-                        <Link href="/advancedsearch">
+                        <Link
-                            <a className="govuk-button govuk-button--secondary">
+                            href="/advancedsearch"
-                                {t(
+                            className="govuk-button govuk-button--secondary"
-                                    "search:searchresults-new-search-button-label"
+                        >
-                                )}
+                            {t("search:searchresults-new-search-button-label")}
-                            </a>
                         </Link>
                     </div>
                 </div>

components/checkanswers.js

@@ -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}

components/cookieBanner.js

@@ -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 { useState } from "react";
-import cookie from "cookie-cutter";
+import { CookieConsent } from "react-cookie-consent";
-import { useState, useEffect } from "react";
 
 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">
+                            <Link
-                                <a
+                                href="/help/cookies"
-                                    className="cookies-banner__button govuk-link--no-underline"
+                                className="cookies-banner__button govuk-link--no-underline"
-                                    id="rcc-decline-button"
+                                id="rcc-decline-button"
-                                    aria-label="Decline cookies"
+                                aria-label="Decline cookies"
-                                >
+                            >
-                                    {t("common:cookie-banner-change-settings")}
+                                {t("common:cookie-banner-change-settings")}
-                                </a>
                             </Link>
                         </div>
                     </div>

components/cookiePolicy.js

@@ -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();

components/cookiemanager/index.js

@@ -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 { parseCookies } from "nookies";
-import useTranslation from "next-translate/useTranslation";
+import { useState } from "react";
-import { Field, reduxForm } from "redux-form";
-import { parseCookies, setCookie, destroyCookie } from "nookies";
 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(
-                                                    {t(
+                                                    "cookies:cookie-settings-essential-link-label"
-                                                        "cookies:cookie-settings-essential-link-label"
+                                                )}
-                                                    )}
-                                                </a>
                                             </Link>
                                         </p>
                                     </legend>

components/crmError.js

@@ -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();

components/dns/applications/applicationSideBar.js

@@ -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();

components/dns/applications/applicationSummary.js

@@ -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();

components/dns/applications/applicationTabs.js

@@ -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();

components/dns/applications/applicationTabsComments.js

@@ -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();

components/dns/applications/applicationTabsDocuments.js

@@ -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"

components/dns/applications/applicationTabsRegistrationForm.js

@@ -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();

components/dns/applications/applicationTabsTimeline.js

@@ -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();

components/dns/applications/applicationsIntro.js

@@ -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">
+                    <Link href="/dns/calendar" className="govuk-link">
-                        <a className="govuk-link">
+                        {t("dnsApplications:page-intro-paragraph-2-link")}
-                            {t("dnsApplications:page-intro-paragraph-2-link")}
-                        </a>
                     </Link>
                     .
                 </p>

components/dns/applications/applicationsList.js

@@ -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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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">
-                                        <span className="results-visually-hidden">
+                                        {t(
-                                            {t(
+                                            "dnsApplications:result-list-heading-label-application"
-                                                "dnsApplications:result-list-heading-label-application"
+                                        )}
-                                            )}
+                                        :{" "}
-                                            :{" "}
+                                    </span>
-                                        </span>
+                                    TWA - Morlais Demonstration Zone
-                                        TWA - Morlais Demonstration Zone
-                                    </a>
                                 </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>

components/dns/homepage/applicationsForComment.js

@@ -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">
+                        <Link
-                            <a className="govuk-body-s ">
+                            href="/dns/application-view"
-                                Holyhead Harbour Revision Order
+                            className="govuk-body-s "
-                            </a>
+                        >
+                            Holyhead Harbour Revision Order
                         </Link>
                     </li>
                 </ul>

components/dns/homepage/dnsLinks.js

@@ -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">
+                            <Link
-                                <a className="govuk-link govuk-link--no-underline">
+                                href="/dnsapplications"
-                                    {t("dnsHome:links-applications-title")}
+                                className="govuk-link govuk-link--no-underline"
-                                </a>
+                            >
+                                {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">
+                            <Link
-                                <a className="govuk-link govuk-link--no-underline ">
+                                href="https://gov.wales/developments-national-significance-dns-guidance"
-                                    {t("dnsHome:links-help-title")}
+                                className="govuk-link govuk-link--no-underline "
-                                </a>
+                            >
+                                {t("dnsHome:links-help-title")}
                             </Link>
                             <p className="govuk-body-s govuk-!-padding-top-2">
                                 {t("dnsHome:links-guidance-intro-paragraph")}