Merge branch 'master-beta' into master-AIO

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -39,8 +39,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,}) {
@@ -194,10 +194,11 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             });
             //Job has been inserted. Clean up the available jobs record.
 
-            insertAuditTrail({
-                jobid: r.data.insert_jobs.returning[0].id,
-                operation: AuditTrailMapping.jobimported(),
-            });
+      insertAuditTrail({
+        jobid: r.data.insert_jobs.returning[0].id,
+        operation: AuditTrailMapping.jobimported(),
+        type: "jobimported",
+      });
 
             await deleteJob({
                 variables: {id: estData.id},
@@ -324,24 +325,25 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
                 setInsertLoading(false);
             });
 
-            await insertNote({
-                variables: {
-                    noteInput: [
-                        {
-                            jobid: selectedJob,
-                            created_by: currentUser.email,
-                            audit: true,
-                            text: t("jobs.labels.supplementnote"),
-                        },
-                    ],
-                },
-            });
-            insertAuditTrail({
-                jobid: selectedJob,
-                operation: AuditTrailMapping.jobsupplement(),
-            });
-        }
-    };
+      await insertNote({
+        variables: {
+          noteInput: [
+            {
+              jobid: selectedJob,
+              created_by: currentUser.email,
+              audit: true,
+              text: t("jobs.labels.supplementnote"),
+            },
+          ],
+        },
+      });
+      insertAuditTrail({
+        jobid: selectedJob,
+        operation: AuditTrailMapping.jobsupplement(),
+        type: "jobsupplement",
+      });
+    }
+  };
 
     const owner =
         estDataRaw.data &&