Merged in release/2023-12-15 (pull request #1115)

Release/2023 12 15

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -108,6 +108,14 @@ export function JobsDetailHeaderActions({
         },
       },
     });
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.alertToggle(
+        !!job.production_vars && !!job.production_vars.alert
+          ? !job.production_vars.alert
+          : true
+      ),
+    });
   };
 
   const handleSuspend = (e) => {

client/src/components/production-list-columns/production-list-columns.alert.component.jsx

@@ -1,12 +1,23 @@
 import { ExclamationCircleFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
 import { Dropdown, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { useMutation } from "@apollo/client";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
-export default function ProductionListColumnAlert({ record }) {
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function ProductionListColumnAlert({ record, insertAuditTrail }) {
   const { t } = useTranslation();
 
   const [updateAlert] = useMutation(UPDATE_JOB);
@@ -27,6 +38,14 @@ export default function ProductionListColumnAlert({ record }) {
           },
         },
       },
+    });
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.alertToggle(
+        !!record.production_vars && !!record.production_vars.alert
+          ? !record.production_vars.alert
+          : true
+      ),
     }).then(() => {
       if (record.refetch) record.refetch();
     });
@@ -58,3 +77,8 @@ export default function ProductionListColumnAlert({ record }) {
     </Dropdown>
   );
 }
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListColumnAlert);

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -36,14 +36,22 @@ import JobsCloseLines from "../../components/jobs-close-lines/jobs-close-lines.c
 import LayoutFormRow from "../../components/layout-form-row/layout-form-row.component";
 import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
 });
 
-export function JobsCloseComponent({ job, bodyshop, jobRO }) {
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+
+export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const client = useApolloClient();
@@ -110,6 +118,10 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
       notification["success"]({
         message: t("jobs.successes.closed"),
       });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobinvoiced(),
+      });
       // history.push(`/manage/jobs/${job.id}`);
     } else {
       setLoading(false);
@@ -527,4 +539,4 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     </div>
   );
 }
-export default connect(mapStateToProps, null)(JobsCloseComponent);
+export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseComponent);

client/src/translations/en_us/common.json

@@ -103,6 +103,7 @@
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
 				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
+				"alerttoggle": "Alert Toggle set to {{status}}",
 				"appointmentcancel": "Appointment canceled. Lost Reason: {{lost_sale_reason}}.",
 				"appointmentinsert": "Appointment created. Appointment Date: {{start}}.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
@@ -111,6 +112,7 @@
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
+				"jobinvoiced": "Job has been invoiced.",
 				"jobconverted": "Job converted and assigned number {{ro_number}}.",
 				"jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
 				"jobimported": "Job imported.",

client/src/translations/es/common.json

@@ -103,6 +103,7 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"alerttoggle": "",
 				"appointmentcancel": "",
 				"appointmentinsert": "",
 				"billposted": "",
@@ -111,6 +112,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobinvoiced": "",
 				"jobconverted": "",
 				"jobfieldchanged": "",
 				"jobimported": "",

client/src/translations/fr/common.json

@@ -103,6 +103,7 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"alerttoggle": "",
 				"appointmentcancel": "",
 				"appointmentinsert": "",
 				"billposted": "",
@@ -111,6 +112,7 @@
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
+				"jobinvoiced": "",
 				"jobconverted": "",
 				"jobfieldchanged": "",
 				"jobimported": "",

client/src/utils/AuditTrailMappings.js

@@ -1,6 +1,7 @@
 import i18n from "i18next";
 
 const AuditTrailMapping = {
+  alertToggle: (status) => i18n.t("audit_trail.messages.alerttoggle", { status }),
   appointmentcancel: (lost_sale_reason) =>
     i18n.t("audit_trail.messages.appointmentcancel", { lost_sale_reason }),
   appointmentinsert: (start) =>
@@ -11,6 +12,8 @@ const AuditTrailMapping = {
     "ADMIN: " + i18n.t("audit_trail.messages.jobstatuschange", { status }),
   jobsupplement: () => i18n.t("audit_trail.messages.jobsupplement"),
   jobimported: () => i18n.t("audit_trail.messages.jobimported"),
+  jobinvoiced: () =>
+  i18n.t("audit_trail.messages.jobinvoiced"),
   jobconverted: (ro_number) =>
     i18n.t("audit_trail.messages.jobconverted", { ro_number }),
   jobfieldchange: (field, value) =>