From f9ca36ec896ddbea494d113ec1285cdc7db2a0cd Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 19 Mar 2024 17:52:47 -0700 Subject: [PATCH 1/2] IO-2710 Job Assignment Signed-off-by: Allan Carr --- .../job-employee-assignments.component.jsx | 2 +- .../job-employee-assignments.container.jsx | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx index 6cfdc8307..5962d40fe 100644 --- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx +++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx @@ -78,7 +78,7 @@ export function JobEmployeeAssignments({ setVisibility(false); }} > - Assign + {t("allocations.actions.assign")} diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx index a5feb3fa7..cd04d4fa1 100644 --- a/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx +++ b/client/src/components/job-employee-assignments/job-employee-assignments.container.jsx @@ -43,13 +43,13 @@ export function JobEmployeeAssignmentsContainer({ }); if (refetch) refetch(); - insertAuditTrail({ - jobid: job.id, - operation: AuditTrailMapping.jobassignmentchange(operation, name), - type: "jobassignmentchange", - }); - - if (!!result.errors) { + if (!!!result.errors) { + insertAuditTrail({ + jobid: job.id, + operation: AuditTrailMapping.jobassignmentchange(operation, name), + type: "jobassignmentchange", + }); + } else { notification["error"]({ message: t("jobs.errors.assigning", { message: JSON.stringify(result.errors), @@ -67,18 +67,19 @@ export function JobEmployeeAssignmentsContainer({ variables: { jobId: job.id, job: { [empAssignment]: null } }, }); - if (!!result.errors) { + if (!!!result.errors) { + insertAuditTrail({ + jobid: job.id, + operation: AuditTrailMapping.jobassignmentremoved(operation), + type: "jobassignmentremoved", + }); + } else { notification["error"]({ message: t("jobs.errors.assigning", { message: JSON.stringify(result.errors), }), }); } - insertAuditTrail({ - jobid: job.id, - operation: AuditTrailMapping.jobassignmentremoved(operation), - type: "jobassignmentremoved", - }); setLoading(false); }; From b1ca09bd4fa908ed8b71bccde03b633b69d4100f Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 19 Mar 2024 17:55:59 -0700 Subject: [PATCH 2/2] IO-2710 Prettierr Signed-off-by: Allan Carr --- .../job-employee-assignments.component.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx index 5962d40fe..283a49447 100644 --- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx +++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx @@ -23,7 +23,6 @@ export function JobEmployeeAssignments({ jobRO, body, refinish, - prep, csr, handleAdd,