From 4c737371e3266836a5646c73f6cc85ad0d44ef58 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 23 Jan 2025 14:49:51 -0800 Subject: [PATCH 1/3] IO-3108 Adjust Initial Values Signed-off-by: Allan Carr --- .../jobs-convert-button/jobs-convert-button.component.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index bc4d28f59..a4b045acb 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -91,7 +91,9 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr towin: job.towin, ca_gst_registrant: job.ca_gst_registrant, employee_csr: job.employee_csr, - category: job.category + category: job.category, + referralsource: job.referralsource, + referral_source_extra: job.referral_source_extra ? job.referral_source_extra : "" }} > Date: Thu, 23 Jan 2025 15:19:33 -0800 Subject: [PATCH 2/3] IO-3108 Adjust Initial Values/FieldValues Signed-off-by: Allan Carr --- .../jobs-convert-button.component.jsx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index a4b045acb..9e1fbd979 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -36,6 +36,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr const { t } = useTranslation(); const [form] = Form.useForm(); const allFormValues = Form.useWatch([], form); + console.log("allFormValues", allFormValues, "towin", job.towin); const handleConvert = async ({ employee_csr, category, ...values }) => { if (parentFormIsFieldsTouched()) { @@ -92,8 +93,8 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr ca_gst_registrant: job.ca_gst_registrant, employee_csr: job.employee_csr, category: job.category, - referralsource: job.referralsource, - referral_source_extra: job.referral_source_extra ? job.referral_source_extra : "" + referral_source: job.referral_source, + referral_source_extra: job.referral_source_extra ?? "" }} > { setOpen(true); - form.setFieldsValue({ - driveable: true, - towin: false, - employee_csr: job.employee_csr - }); }} > {t("jobs.actions.convert")} From 5ec032d8d61f13dbfa51171539b604cf933bde42 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 23 Jan 2025 15:21:10 -0800 Subject: [PATCH 3/3] IO-3108 Remove Console Log Signed-off-by: Allan Carr --- .../jobs-convert-button/jobs-convert-button.component.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index 9e1fbd979..dc6f38168 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -36,7 +36,6 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr const { t } = useTranslation(); const [form] = Form.useForm(); const allFormValues = Form.useWatch([], form); - console.log("allFormValues", allFormValues, "towin", job.towin); const handleConvert = async ({ employee_csr, category, ...values }) => { if (parentFormIsFieldsTouched()) {