Merge branch 'master-beta' into master-AIO

client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx

@@ -9,7 +9,9 @@ import {createStructuredSelector} from "reselect";
 import {auth, logImEXEvent} from "../../firebase/firebase.utils";
 import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
 import {UPDATE_JOB} from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
@@ -17,6 +19,11 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
+});
+
 function updateJobCache(items) {
     client.cache.modify({
         id: "ROOT_QUERY",
@@ -37,9 +44,10 @@ export function JobsCloseExportButton({
                                           disabled,
                                           setSelectedJobs,
                                           refetch,
+                                          insertAuditTrail,
                                       }) {
     const history = useNavigate();
-    const {t} = useTranslation();
+    const { t } = useTranslation();
     const [updateJob] = useMutation(UPDATE_JOB);
     const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
     const [loading, setLoading] = useState(false);
@@ -178,6 +186,10 @@ export function JobsCloseExportButton({
                         key: "jobsuccessexport",
                         message: t("jobs.successes.exported"),
                     });
+                    insertAuditTrail({
+                        jobid: jobId,
+                        operation: AuditTrailMapping.jobexported(),
+                    type: "jobexported",});
                     updateJobCache(
                         jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
                     );
@@ -189,12 +201,20 @@ export function JobsCloseExportButton({
                     });
                 }
             }
-            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+            if (
+                bodyshop.accountingconfig &&
+                bodyshop.accountingconfig.qbo &&
+                successfulTransactions.length > 0
+            ) {
                 notification.open({
                     type: "success",
                     key: "jobsuccessexport",
                     message: t("jobs.successes.exported"),
                 });
+                insertAuditTrail({
+                    jobid: jobId,
+                    operation: AuditTrailMapping.jobexported(),type: "jobexported",
+                });
                 updateJobCache([
                     ...new Set(
                         successfulTransactions.map(
@@ -224,4 +244,7 @@ export function JobsCloseExportButton({
     );
 }
 
-export default connect(mapStateToProps, null)(JobsCloseExportButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsCloseExportButton);