- Tasks Audit Trail Additions

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/task-list/task-list.container.jsx

@@ -11,6 +11,9 @@ import React, {useEffect} from "react";
 import TaskListComponent from "./task-list.component.jsx";
 import {notification} from "antd";
 import {useTranslation} from "react-i18next";
+import {useDispatch} from "react-redux";
+import {insertAuditTrail} from "../../redux/application/application.actions.js";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 
 export default function TaskListContainer({
                                             bodyshop,
@@ -25,6 +28,7 @@ export default function TaskListContainer({
   const {t} = useTranslation();
   const searchParams = queryString.parse(useLocation().search);
   const {page, sortcolumn, sortorder, deleted, completed, mine} = searchParams;
+  const dispatch = useDispatch();
   const {loading, error, data, refetch} = useQuery(
     query,
     {
@@ -80,16 +84,30 @@ export default function TaskListContainer({
   const toggleCompletedStatus = async (id, currentStatus) => {
     const completed_at = !currentStatus ? new Date().toISOString() : null;
     try {
-      await toggleTaskCompleted({
+      const toggledTask = await toggleTaskCompleted({
         variables: {
           id: id,
           completed: !currentStatus,
           completed_at: completed_at
         }
       });
-      // refetch().catch((e) => {
-      //   console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
-      // });
+
+      if (!toggledTask.errors) {
+        dispatch(
+          insertAuditTrail({
+            jobid: toggledTask.data.update_tasks_by_pk.jobid,
+            operation: toggledTask?.data?.update_tasks_by_pk?.completed ? AuditTrailMapping.tasksCompleted(
+              toggledTask.data.update_tasks_by_pk.title,
+              currentUser.email
+            ) : AuditTrailMapping.tasksUncompleted(
+              toggledTask.data.update_tasks_by_pk.title,
+              currentUser.email
+            ),
+            type: toggledTask?.data?.update_tasks_by_pk?.completed ? "tasksCompleted" : "tasksUncompleted"
+          })
+        )
+      }
+      
       window.dispatchEvent(new CustomEvent('taskUpdated', {
         detail: {message: 'A task has been completed.'},
       }));
@@ -114,26 +132,42 @@ export default function TaskListContainer({
    * @param currentStatus
    * @returns {Promise<void>}
    */
+
   const toggleDeletedStatus = async (id, currentStatus) => {
     const deleted_at = !currentStatus ? new Date().toISOString() : null;
     try {
-      await toggleTaskDeleted({
+      const toggledTask = await toggleTaskDeleted({
         variables: {
           id: id,
           deleted: !currentStatus,
           deleted_at: deleted_at
         }
       });
+      if (!toggledTask.errors) {
+        dispatch(
+          insertAuditTrail({
+            jobid: toggledTask.data.update_tasks_by_pk.jobid,
+            operation: toggledTask?.data?.update_tasks_by_pk?.deleted ? AuditTrailMapping.tasksDeleted(
+              toggledTask.data.update_tasks_by_pk.title,
+              currentUser.email
+            ) : AuditTrailMapping.tasksUndeleted(
+              toggledTask.data.update_tasks_by_pk.title,
+              currentUser.email
+            ),
+            type: toggledTask?.data?.update_tasks_by_pk?.deleted ? "tasksDeleted" : "tasksUndeleted"
+          })
+        )
+      }
+
+
       window.dispatchEvent(new CustomEvent('taskUpdated', {
         detail: {message: 'A task has been deleted.'},
       }));
-      // refetch().catch((e) => {
-      //   console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
-      // });
       notification["success"]({
         message: t("tasks.successes.deleted"),
       });
     } catch (err) {
+      console.dir(err);
       notification["error"]({
         message: t("tasks.failures.deleted"),
       });

client/src/components/task-upsert-modal/task-upsert-modal.container.jsx

@@ -18,6 +18,8 @@ import {replaceUndefinedWithNull} from "../../utils/undefinedtonull.js";
 import {useNavigate} from "react-router-dom";
 import axios from "axios";
 import dayjs from '../../utils/day';
+import {insertAuditTrail} from "../../redux/application/application.actions.js";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -26,6 +28,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("taskUpsert")),
+  insertAuditTrail: ({ jobid, billid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation, type }))
 });
 
 export function TaskUpsertModalContainer({
@@ -33,6 +37,7 @@ export function TaskUpsertModalContainer({
                                            currentUser,
                                            taskUpsert,
                                            toggleModalVisible,
+                                            insertAuditTrail
                                          }) {
   const {t} = useTranslation();
   const history = useNavigate();
@@ -123,14 +128,28 @@ export function TaskUpsertModalContainer({
   const handleExistingTask = async (values) => {
     const isAssignedToDirty = values.assigned_to !== existingTask.assigned_to;
 
-    await updateTask({
+    const taskData = await updateTask({
       variables: {
         taskId: existingTask.id,
         task: replaceUndefinedWithNull(values)
       },
     });
+    
+    if (!taskData.errors) {
+      const oldTask  = taskData?.data?.update_tasks?.returning[0];
 
+      insertAuditTrail({
+        jobid: oldTask.jobid,
+        operation: AuditTrailMapping.tasksUpdated(
+          oldTask.title,
+          currentUser.email
+        ),
+        type: "tasksUpdated"
+      });
+    }
+    
     if (isAssignedToDirty) {
+      // TODO This is being moved serverside
       axios.post("/sendemail", {
         from: {
           name: bodyshop.shopname,
@@ -163,7 +182,7 @@ export function TaskUpsertModalContainer({
   };
 
   const handleNewTask = async (values) => {
-    const newTaskID = (await insertTask({
+    const newTaskData = await insertTask({
       variables: {
         taskInput: [
           {
@@ -173,30 +192,29 @@ export function TaskUpsertModalContainer({
           },
         ],
       },
-      // TODO: Consult Patrick, because this fails on relationship data, and an event emitter is just much easier to use
-      // update(cache) {
-      //   cache.modify({
-      //     fields: {
-      //       tasks(existingTasks) {
-      //         return [{
-      //           ...values,
-      //           jobid: selectedJobId || values.jobid,
-      //           created_by: currentUser.email,
-      //           bodyshopid: bodyshop.id
-      //         }, ...existingTasks]
-      //       },
-      //     },
-      //   });
-      // },
-    })).data.insert_tasks.returning[0].id;
-
+    });
+    
+    const newTask  = newTaskData?.data?.insert_tasks?.returning[0];
+    const newTaskID = newTask?.id;
+    
+    if (!newTaskData.errors) {
+      insertAuditTrail({
+        jobid: newTask.jobid,
+        operation: AuditTrailMapping.tasksCreated(
+          newTask.title,
+          currentUser.email
+        ),
+        type: "tasksCreated"
+      });
+    }
+    
     if (refetch) await refetch();
 
     form.resetFields();
-
     toggleModalVisible();
-
+    
     // send notification to the assigned user
+    // TODO: This is being moved serverside
     axios.post("/sendemail", {
       from: {
         name: bodyshop.shopname,