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

Merged PR 2288: add in company name for appellant and autofill agent details in new appeal

Browse Source 
add in company name for appellant and autofill agent details in new appeal

Related work items: #22842
This commit is contained in:
Robert Bond
2026-04-30 16:25:03 +00:00
parent b596374c3c
commit d2e88b57d8
7 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+9 -9
View File
@@ -18,8 +18,8 @@ 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/ 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" RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net"
RELAYPATH = "ar-hc-lz-pedw-dev-uks-01" RELAYPATH = "ar-hc-lz-pedw-dev-uks-01"
CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS" CRMURL = "dv-pedw.crm11.dynamics.com"
CRMURL_VERSION = "v8.2" CRMURL_VERSION = "v9.2"
# //New Test # //New Test
CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
@@ -139,10 +139,10 @@ NEXTAUTH_SECRET = SuperSecret
# 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 # 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 // dev test sql server
# 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 DATABASE_URL = sqlserver://sql-srv-plt-pedw-dev-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
// test sql server // test sql server
DATABASE_URL = sqlserver://sql-srv-plt-pedw-test-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword DATABASE_URL = sqlserver://sql-srv-plt-pedw-test-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword
// Pre prod sql server // 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 # 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
@@ -248,22 +248,22 @@ SHOW_DEBUG = true
// DEV Connection string // 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 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 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 // 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 # 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 // 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=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 # 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 // 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 # 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 HIDEERRORLOGS = false
components/account/registerform.js
+16 -5
View File
@@ -66,7 +66,7 @@ const RegisterForm = (props) => {
setRegisterFormComplete, setRegisterFormComplete,
setAccountCreatedComplete, setAccountCreatedComplete,
loggedInUserEmail, loggedInUserEmail,
emailaddress1, emailaddress1
} = props; } = props;
let { t, lang } = useTranslation(); let { t, lang } = useTranslation();
@@ -199,6 +199,17 @@ const RegisterForm = (props) => {
"account:register-new-account-phone-label" "account:register-new-account-phone-label"
)} )}
/> />
<Field
name="company"
id="company"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t(
"account:register-new-account-company-label"
)}
/>
</fieldset> </fieldset>
<fieldset className="govuk-fieldset"> <fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m"> <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
@@ -312,8 +323,8 @@ const mapStateToProps = (state, props) => {
appealType: state.appealType, appealType: state.appealType,
//form: state.form, //form: state.form,
initialValues: { initialValues: {
emailaddress1: props.loggedInUserEmail, emailaddress1: props.loggedInUserEmail
}, }
}; };
}; };
@@ -321,7 +332,7 @@ const mapDispatchToProps = (dispatch) => {
return { return {
setCurrentSection: (currentSection) => { setCurrentSection: (currentSection) => {
dispatch(setCurrentSection(currentSection)); dispatch(setCurrentSection(currentSection));
}, }
}; };
}; };
@@ -334,6 +345,6 @@ export default connect(
reduxForm({ reduxForm({
form: "accountRegisterForm", form: "accountRegisterForm",
enableReinitialize: true, enableReinitialize: true,
destroyOnUnmount: false, destroyOnUnmount: false
})(RegisterForm) })(RegisterForm)
); );
components/case/media.js
+1 -1
View File
@@ -458,7 +458,7 @@ const MediaDetails = ({ mediaObj, whichTab, title, useNoCookie = true }) => {
.filter((x) => x?.pinswg_publishtoweb) .filter((x) => x?.pinswg_publishtoweb)
.map((item) => { .map((item) => {
const link = isWelsh const link = isWelsh
? item.pinswg_mediaLinkCY ? item.pinswg_videoplatformurlwelsh
: item.pinswg_videoplatformurl; : item.pinswg_videoplatformurl;
const videoId = extractYouTubeId(link); const videoId = extractYouTubeId(link);
components/newappeal/aboutyou.js
+40 -2
View File
@@ -452,6 +452,14 @@ let AboutYou = (props) => {
const isAgentSelected = appellantAgentValue == "846040001"; const isAgentSelected = appellantAgentValue == "846040001";
const isAppellantSelected = appellantAgentValue == "846040000"; const isAppellantSelected = appellantAgentValue == "846040000";
console.log(
"================",
props.initialValues.pinswg_typeofinvolvement
);
//props.initialValues.pinswg_typeofinvolvement === 846040000 &&
// setIsAgent(true);
const yesNo = isWelsh ? ["Ydw", "Na"] : ["Yes", "No"]; const yesNo = isWelsh ? ["Ydw", "Na"] : ["Yes", "No"];
const appellantAgent = isWelsh const appellantAgent = isWelsh
? ["Apelydd", "Asiant"] ? ["Apelydd", "Asiant"]
@@ -499,11 +507,14 @@ let AboutYou = (props) => {
if (isAgentSelected && isAgent == false) { if (isAgentSelected && isAgent == false) {
updateField("caseForm", "pinswg_appellantfirstname", ""); updateField("caseForm", "pinswg_appellantfirstname", "");
updateField("caseForm", "pinswg_appellantlastname", ""); updateField("caseForm", "pinswg_appellantlastname", "");
updateField("caseForm", "company", "");
updateField("caseForm", "pinswg_appellantemailaddress", ""); updateField("caseForm", "pinswg_appellantemailaddress", "");
updateField("caseForm", "pinswg_appellantaddress", ""); updateField("caseForm", "pinswg_appellantaddress", "");
updateField("caseForm", "pinswg_appellantphonenumber", ""); updateField("caseForm", "pinswg_appellantphonenumber", "");
setIsAgent(true); setIsAgent(true);
} //else { }
//else {
// updateField( // updateField(
// "caseForm", // "caseForm",
// "pinswg_appellantfirstname", // "pinswg_appellantfirstname",
@@ -602,6 +613,18 @@ let AboutYou = (props) => {
)} )}
maxFieldLength="200" maxFieldLength="200"
/> />
<Field
name={"pinswg_appellantcompany"}
id={"pinswg_appellantcompany"}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required, emojicheck]}
label={t(
"newappeal:about-you-agent-contact-details-companyname-label"
)}
maxFieldLength="200"
/>
<Field <Field
name={"pinswg_appellantaddress"} name={"pinswg_appellantaddress"}
id={"pinswg_appellantaddress"} id={"pinswg_appellantaddress"}
@@ -889,12 +912,27 @@ const mapStateToProps = (state) => {
state.accountDetails.accountDetails.firstname, state.accountDetails.accountDetails.firstname,
pinswg_appellantlastname: pinswg_appellantlastname:
state.accountDetails.accountDetails.lastname, state.accountDetails.accountDetails.lastname,
pinswg_appellantcompany:
state.accountDetails.accountDetails.company,
pinswg_appellantemailaddress: pinswg_appellantemailaddress:
state.accountDetails.accountDetails.emailaddress1, state.accountDetails.accountDetails.emailaddress1,
pinswg_appellantaddress: pinswg_appellantaddress:
state.accountDetails.accountDetails.address1_composite, state.accountDetails.accountDetails.address1_composite,
pinswg_appellantphonenumber: pinswg_appellantphonenumber:
state.accountDetails.accountDetails.telephone1 state.accountDetails.accountDetails.telephone1,
pinswg_agentcompanyname:
state.accountDetails.accountDetails.company,
pinswg_agentfirstname:
state.accountDetails.accountDetails.firstname,
pinswg_agentlastname: state.accountDetails.accountDetails.lastname,
pinswg_agentemailaddress:
state.accountDetails.accountDetails.emailaddress1,
pinswg_agentaddress:
state.accountDetails.accountDetails.address1_composite,
pinswg_agentphonenumber:
state.accountDetails.accountDetails.telephone1,
pinswg_typeofinvolvement:
state.accountDetails.accountDetails.pinswg_typeofinvolvement
} }
}; };
}; };
locales/cy/account.json
+1
View File
@@ -18,6 +18,7 @@
"register-new-account-email-address-label": "Cyfeiriad e-bost", "register-new-account-email-address-label": "Cyfeiriad e-bost",
"register-new-account-email-address-label-errormsg": "Rhowch gyfeiriad e-bost dilys", "register-new-account-email-address-label-errormsg": "Rhowch gyfeiriad e-bost dilys",
"register-new-account-phone-label": "Rhif ffôn", "register-new-account-phone-label": "Rhif ffôn",
"register-new-account-company-label": "Cwmni/Grŵp",
"register-new-account-password-label": "Cyfrinair", "register-new-account-password-label": "Cyfrinair",
"register-new-account-password-label-errormsg": "Cyfrinair", "register-new-account-password-label-errormsg": "Cyfrinair",
"register-new-account-confirm-password-label": "Cadarnhau cyfrinair", "register-new-account-confirm-password-label": "Cadarnhau cyfrinair",
locales/en/account.json
+1
View File
@@ -18,6 +18,7 @@
"register-new-account-email-address-label": "Email address", "register-new-account-email-address-label": "Email address",
"register-new-account-email-address-label-errormsg": "Enter a valid email address", "register-new-account-email-address-label-errormsg": "Enter a valid email address",
"register-new-account-phone-label": "Telephone", "register-new-account-phone-label": "Telephone",
"register-new-account-company-label": "Company/Group",
"register-new-account-password-label": "Password", "register-new-account-password-label": "Password",
"register-new-account-password-label-errormsg": "Password", "register-new-account-password-label-errormsg": "Password",
"register-new-account-confirm-password-label": "Confirm password", "register-new-account-confirm-password-label": "Confirm password",
pages/api/endpoint/getsipsmedia_api.js
+1 -1
View File
@@ -15,7 +15,7 @@ export default async function ApiProxy(req, res) {
const queryUrl = const queryUrl =
"pinswg_eventrecordings?$count=true&$filter=_pinswg_regardingcase_value eq " + "pinswg_eventrecordings?$count=true&$filter=_pinswg_regardingcase_value eq " +
caseid + caseid +
" and pinswg_publishtoweb eq true&$select=pinswg_videoplatformurl,pinswg_eventrecordingid,pinswg_publishtoweb,pinswg_eventrecordingname,pinswg_eventrecordingpublisheddate,createdon"; " and pinswg_publishtoweb eq true&$select=pinswg_videoplatformurl,pinswg_eventrecordingid,pinswg_publishtoweb,pinswg_eventrecordingname,pinswg_eventrecordingpublisheddate,createdon,pinswg_description,pinswg_videoplatformurlwelsh";
return relayGet({ return relayGet({
queryUrl, queryUrl,