IO-3010 Task Table UI refactor

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

.platform/nginx/conf.d/proxy.conf

@@ -1 +1,2 @@
-client_max_body_size 50M;
+client_max_body_size 50M;
+client_body_buffer_size 5M;

.vscode/launch.json

@@ -14,6 +14,21 @@
       "request": "launch",
       "url": "http://localhost:3000",
       "webRoot": "${workspaceRoot}/client/src"
+    },
+    {
+      "name": "Attach to Node.js in Docker",
+      "type": "node",
+      "request": "attach",
+      "address": "localhost",
+      "port": 9229,
+      "localRoot": "${workspaceFolder}",
+      "remoteRoot": "/app",
+      "protocol": "inspector",
+      "restart": true,
+      "sourceMaps": true,
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     }
   ]
 }

Dockerfile

@@ -41,7 +41,7 @@ RUN npm i --no-package-lock
 COPY . .
 
 # Expose the port your app runs on (adjust if necessary)
-EXPOSE 4000
+EXPOSE 4000 9229
 
 # Start the application
-CMD ["nodemon", "--legacy-watch", "server.js"]
+CMD ["nodemon", "--legacy-watch", "--inspect=0.0.0.0:9229", "server.js"]

_reference/localEmailViewer/.gitignore

@@ -0,0 +1 @@
+node_modules

_reference/localEmailViewer/README.md

@@ -0,0 +1,7 @@
+This will connect to your dockers local stack session and render the email in HTML.
+
+```shell
+node index.js
+```
+
+http://localhost:3334

_reference/localEmailViewer/index.js

@@ -0,0 +1,116 @@
+// index.js
+
+import express from 'express';
+import fetch from 'node-fetch';
+import {simpleParser} from 'mailparser';
+
+const app = express();
+const PORT = 3334;
+
+app.get('/', async (req, res) => {
+    try {
+        const response = await fetch('http://localhost:4566/_aws/ses');
+        if (!response.ok) {
+            throw new Error('Network response was not ok');
+        }
+        const data = await response.json();
+        const messagesHtml = await parseMessages(data.messages);
+        res.send(renderHtml(messagesHtml));
+    } catch (error) {
+        console.error('Error fetching messages:', error);
+        res.status(500).send('Error fetching messages');
+    }
+});
+
+async function parseMessages(messages) {
+    const parsedMessages = await Promise.all(
+        messages.map(async (message, index) => {
+            try {
+                const parsed = await simpleParser(message.RawData);
+                return `
+                    <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: lightgray">
+                     <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: white">
+                        <div class="mb-2">
+                            <span class="font-bold text-lg">Message ${index + 1}</span>
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-semibold">From:</span> ${message.Source}
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-semibold">Region:</span> ${message.Region}
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
+                        </div>
+                     </div>
+                        <div class="prose">
+                            ${parsed.html || parsed.textAsHtml || 'No HTML content available'}
+                        </div>
+                    </div>
+                `;
+            } catch (error) {
+                console.error('Error parsing email:', error);
+                return `
+                    <div class="bg-white shadow-md rounded-lg p-4 mb-6">
+                        <div class="mb-2">
+                            <span class="font-bold text-lg">Message ${index + 1}</span>
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-semibold">From:</span> ${message.Source}
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-semibold">Region:</span> ${message.Region}
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
+                        </div>
+                        <div class="text-red-500">
+                            Error parsing email content
+                        </div>
+                    </div>
+                `;
+            }
+        })
+    );
+    return parsedMessages.join('');
+}
+
+function renderHtml(messagesHtml) {
+    return `
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="UTF-8">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>Email Messages Viewer</title>
+            <script src="https://cdn.tailwindcss.com"></script>
+            <style>
+                body {
+                    background-color: #f3f4f6;
+                    font-family: Arial, sans-serif;
+                }
+                .container {
+                    max-width: 800px;
+                    margin: 50px auto;
+                    padding: 20px;
+                }
+                .prose {
+                    line-height: 1.6;
+                }
+            </style>
+        </head>
+        <body>
+            <div class="container bg-white shadow-lg rounded-lg p-6">
+                <h1 class="text-2xl font-bold text-center mb-6">Email Messages Viewer</h1>
+                <div id="messages-container">
+                    ${messagesHtml}
+                </div>
+            </div>
+        </body>
+        </html>
+    `;
+}
+
+app.listen(PORT, () => {
+    console.log(`Server is running on http://localhost:${PORT}`);
+});

_reference/localEmailViewer/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "localemailviewer",
+  "version": "1.0.0",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "express": "^4.21.1",
+    "mailparser": "^3.7.1",
+    "node-fetch": "^3.3.2"
+  }
+}

certs/id_rsa

@@ -0,0 +1,27 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAQEAvNl5fuVmLNv72BZNxnTqX5CHf5Xi8UxjYaYxHITSCx7blnhpVYLd
+qXvcOWXzbsfjch/den73QiW4n2FYz75oGMhUGlOYzdWKA9I9Sj09Qy1R06RhwDiZGd5qaM
+swEeXpkNmi2u4Qd2kJeDfUQUigjC09V81O/vrniGtQAJScfiG/itdm+Ufn09Z4MYk0HWjq
+iDokNEskoEPsibYIrb+Q6vdtuPkZO+wU/smXhPtgw5ST6oQdmm/gVNsRg5XNzxrire+z1G
+WatnnVL3hPnnfpnf8W589dyms7GGJwhPerSGTN1bn0T4+9C69Cd7LBJtxiuFdRmdlGLLLP
+RR48Rur71wAAA9AEfVsdBH1bHQAAAAdzc2gtcnNhAAABAQC82Xl+5WYs2/vYFk3GdOpfkI
+d/leLxTGNhpjEchNILHtuWeGlVgt2pe9w5ZfNux+NyH916fvdCJbifYVjPvmgYyFQaU5jN
+1YoD0j1KPT1DLVHTpGHAOJkZ3mpoyzAR5emQ2aLa7hB3aQl4N9RBSKCMLT1XzU7++ueIa1
+AAlJx+Ib+K12b5R+fT1ngxiTQdaOqIOiQ0SySgQ+yJtgitv5Dq9224+Rk77BT+yZeE+2DD
+lJPqhB2ab+BU2xGDlc3PGuKt77PUZZq2edUveE+ed+md/xbnz13KazsYYnCE96tIZM3Vuf
+RPj70Lr0J3ssEm3GK4V1GZ2UYsss9FHjxG6vvXAAAAAwEAAQAAAQAQTosSLQbMmtY9S3e9
+yjyusdExcCTfhyQRu4MEHmfws+JsNMuLqbgwOVTD1AzYJQR7x0qdmDcLjCxL/uDnV16vvS
+Sd/Vf1dhnryIyoS29tzI0DRG94ZKq7tBvmHp1w/jRT4KcSVnovhW9e5Rs74+SRFhr06PKI
+S+wQOIv48Nwue9+QUMsMCpWgKXHx7SHNTHvnAfqdhi9O29SWlMA+v+mELZ5Cl+HU0UTt2I
+A1BxOe1N8FjN7KE2viJexsl3is1PuqMkpLl/wyHBJTVzUadl6DRALJQIm7/YO5goE72YOV
+Lpo27do3zjhC87dlKdATvZUzfKV0LuUVdxq/PNDZMUbBAAAAgQDShAqDZiDrdTUaGXfUVm
+QzcnVNbh2/KgZh4uux9QNHST562W6cnN7qxoRwVrM4BCOk1Kl73QQZW4nDvXX3PVC5j038
+8AXkcBHS9j9f4h72ue7D2jqlbHFa7aGU9zYgk9mbBF+GX3tDntkAIQjLtwOLfj1iiJ/clX
+mHFUAY1V4L8AAAAIEA3E4t/v0yU5D9AOI0r17UNYqfeyDoKAEDR4QbbFjO1l0kLnEJy7Zx
+Mhj18GilYg2y0P0v8dSM/oWXS8Hua2t5i9Exlv6gHhGlQ80mwYcVGIxewZ/pPeCPw0U+kt
+EKUjt09m9Oe7+6xHQsTBj9hY8/vqPmQwRalZFcLdhHiDiVKTcAAACBANtykaPXdVzEFx7D
+UOlsjVL7zM0EVOFXf9JJQ6BhazhmsEI2PYt3IpgGMo8cXkoUofAOIYjf421AabN1BqSO5J
+XTMxM0ZV3JmLLi804Mu9h1iFrVTBdLYOMJdc2VCo1EwHWpo9SXOyjxce/znvcIOU04aZhu
+TaPg816X+E+gw5JhAAAAFGRhdmVARGF2ZVJpY2hlci1JTUVYAQIDBAUG
+-----END OPENSSH PRIVATE KEY-----

certs/id_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC82Xl+5WYs2/vYFk3GdOpfkId/leLxTGNhpjEchNILHtuWeGlVgt2pe9w5ZfNux+NyH916fvdCJbifYVjPvmgYyFQaU5jN1YoD0j1KPT1DLVHTpGHAOJkZ3mpoyzAR5emQ2aLa7hB3aQl4N9RBSKCMLT1XzU7++ueIa1AAlJx+Ib+K12b5R+fT1ngxiTQdaOqIOiQ0SySgQ+yJtgitv5Dq9224+Rk77BT+yZeE+2DDlJPqhB2ab+BU2xGDlc3PGuKt77PUZZq2edUveE+ed+md/xbnz13KazsYYnCE96tIZM3VufRPj70Lr0J3ssEm3GK4V1GZ2UYsss9FHjxG6vvX dave@DaveRicher-IMEX

client/src/App/App.container.jsx

@@ -2,8 +2,6 @@ import { ApolloProvider } from "@apollo/client";
 import { SplitFactoryProvider, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
-import dayjs from "../utils/day";
-import "dayjs/locale/en";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
@@ -19,8 +17,6 @@ if (import.meta.env.DEV) {
   Userpilot.initialize("NX-69145f08");
 }
 
-dayjs.locale("en");
-
 const config = {
   core: {
     authorizationKey: import.meta.env.VITE_APP_SPLIT_API,

client/src/components/contract-form/contract-form.component.jsx

@@ -1,15 +1,17 @@
 import { WarningFilled } from "@ant-design/icons";
 import { Form, Input, InputNumber, Space } from "antd";
-import dayjs from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 //import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
 import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
 import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
-import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
+import {
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
+  default as DateTimePicker,
+  default as FormDateTimePicker
+} from "../form-date-time-picker/form-date-time-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import InputPhone, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
@@ -18,10 +20,10 @@ import ContractFormJobPrefill from "./contract-form-job-prefill.component";
 export default function ContractFormComponent({ form, create = false, selectedJobState, selectedCar }) {
   const { t } = useTranslation();
   return (
-    <div>
+    <>
-      <FormFieldsChanged form={form} />
+      {!create && <FormFieldsChanged form={form} />}
       <LayoutFormRow>
-        {create ? null : (
+        {!create && (
           <Form.Item
             label={t("contracts.fields.status")}
             name="status"
@@ -50,7 +52,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
         <Form.Item label={t("contracts.fields.scheduledreturn")} name="scheduledreturn">
           <FormDateTimePicker />
         </Form.Item>
-        {create ? null : (
+        {!create && (
           <Form.Item label={t("contracts.fields.actualreturn")} name="actualreturn">
             <FormDateTimePicker />
           </Form.Item>
@@ -122,7 +124,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
             }}
           </Form.Item>
         )}
-        {create ? null : (
+        {!create && (
           <Form.Item label={t("contracts.fields.kmend")} name="kmend">
             <InputNumber />
           </Form.Item>
@@ -145,25 +147,21 @@ export default function ContractFormComponent({ form, create = false, selectedJo
         >
           <CourtesyCarFuelSlider />
         </Form.Item>
-        {create ? null : (
+        {!create && (
           <Form.Item label={t("contracts.fields.fuelin")} name="fuelin" span={8}>
             <CourtesyCarFuelSlider />
           </Form.Item>
         )}
       </LayoutFormRow>
-      <div>
-        <Space wrap>
-          {selectedJobState && (
-            <div>
-              <ContractFormJobPrefill jobId={selectedJobState && selectedJobState[0]} form={form} />
-            </div>
-          )}
-          {
-            //<ContractLicenseDecodeButton form={form} />
-          }
-        </Space>
-      </div>
       <LayoutFormRow header={t("contracts.labels.driverinformation")}>
+        <Space wrap>
+          {create && selectedJobState && (
+            <ContractFormJobPrefill jobId={selectedJobState && selectedJobState[0]} form={form} />
+          )}
+          {/* {<ContractLicenseDecodeButton form={form} />} */}
+        </Space>
+      </LayoutFormRow>
+      <LayoutFormRow noDivider={true}>
         <Form.Item
           label={t("contracts.fields.driver_dlnumber")}
           name="driver_dlnumber"
@@ -183,9 +181,8 @@ export default function ContractFormComponent({ form, create = false, selectedJo
             const dlExpiresBeforeReturn = dayjs(form.getFieldValue("driver_dlexpiry")).isBefore(
               dayjs(form.getFieldValue("scheduledreturn"))
             );
-
             return (
-              <div>
+              <>
                 <Form.Item
                   label={t("contracts.fields.driver_dlexpiry")}
                   name="driver_dlexpiry"
@@ -204,11 +201,10 @@ export default function ContractFormComponent({ form, create = false, selectedJo
                     <span>{t("contracts.labels.dlexpirebeforereturn")}</span>
                   </Space>
                 )}
-              </div>
+              </>
             );
           }}
         </Form.Item>
-
         <Form.Item label={t("contracts.fields.driver_dlst")} name="driver_dlst">
           <Input />
         </Form.Item>
@@ -315,6 +311,6 @@ export default function ContractFormComponent({ form, create = false, selectedJo
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-    </div>
+    </>
   );
 }

client/src/components/dms-log-events/dms-log-events.component.jsx

@@ -40,8 +40,6 @@ export function DmsLogEvents({ socket, logs, bodyshop }) {
 
 function LogLevelHierarchy(level) {
   switch (level) {
-    case "TRACE":
-      return "pink";
     case "DEBUG":
       return "orange";
     case "INFO":

client/src/components/eula/eula.component.jsx

@@ -8,7 +8,7 @@ import { INSERT_EULA_ACCEPTANCE } from "../../graphql/user.queries";
 import { useMutation } from "@apollo/client";
 import { acceptEula } from "../../redux/user/user.actions";
 import { useTranslation } from "react-i18next";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 
 import "./eula.styles.scss";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
@@ -208,7 +208,7 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
               {
                 required: true,
                 validator: (_, value) => {
-                  if (day(value).isSame(day(), "day")) {
+                  if (dayjs(value).isSame(dayjs(), "day")) {
                     return Promise.resolve();
                   }
                   return Promise.reject(new Error(t("eula.messages.date_accepted")));

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -4,19 +4,37 @@ import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import dayjs from "../../utils/day";
 import { fuzzyMatchDate } from "./formats.js";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { connect } from "react-redux";
 
-const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, onlyToday, isDateOnly = false, ...restProps }) => {
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const DateTimePicker = ({
+  value,
+  onChange,
+  onBlur,
+  id,
+  onlyFuture,
+  onlyToday,
+  isDateOnly = false,
+  bodyshop,
+  ...restProps
+}) => {
   const [isManualInput, setIsManualInput] = useState(false);
   const { t } = useTranslation();
 
   const handleChange = useCallback(
     (newDate) => {
+      if (!newDate) return;
       if (onChange) {
-        onChange(newDate || null);
+        onChange(bodyshop?.timezone ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
       }
       setIsManualInput(false);
     },
-    [onChange]
+    [onChange, bodyshop?.timezone]
   );
 
   const handleBlur = useCallback(
@@ -102,4 +120,4 @@ DateTimePicker.propTypes = {
   isDateOnly: PropTypes.bool
 };
 
-export default React.memo(DateTimePicker);
+export default connect(mapStateToProps, null)(DateTimePicker);

client/src/components/header/header.component.jsx

@@ -116,18 +116,15 @@ function Header({
 
   const { t } = useTranslation();
 
-  const deleteBetaCookie = () => {
+  // const deleteBetaCookie = () => {
-    const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
+  //   const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
-    if (cookieExists) {
+  //   if (cookieExists) {
-      const domain = window.location.hostname.split(".").slice(-2).join(".");
+  //     const domain = window.location.hostname.split(".").slice(-2).join(".");
-      document.cookie = `betaSwitchImex=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
+  //     document.cookie = `betaSwitchImex=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
-      console.log(`betaSwitchImex cookie deleted`);
+  //   }
-    } else {
+  // };
-      console.log(`betaSwitchImex cookie does not exist`);
+  //
-    }
+  // deleteBetaCookie();
-  };
-
-  deleteBetaCookie();
 
   const accountingChildren = [];
 

client/src/components/job-at-change/schedule-event.component.jsx

@@ -23,6 +23,7 @@ import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
 import { useMutation } from "@apollo/client";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -127,6 +128,9 @@ export function ScheduleEventComponent({
             {(event.job && event.job.alt_transport) || ""}
             <ScheduleAtChange job={event && event.job} />
           </DataLabel>
+          <DataLabel label={t("jobs.fields.comment")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
+            <ProductionListColumnComment record={event && event.job} />
+          </DataLabel>
           <ScheduleEventNote event={event} />
         </div>
       ) : (
@@ -316,6 +320,7 @@ export function ScheduleEventComponent({
       })`}
 
       {event.job && event.job.alt_transport && <div style={{ margin: ".1rem" }}>{event.job.alt_transport}</div>}
+      {event?.job?.comment && `C: ${event.job.comment}`}
     </Space>
   ) : (
     <div

client/src/components/job-lifecycle/job-lifecycle.component.jsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from "react";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import axios from "axios";
 import { Badge, Card, Space, Table, Tag } from "antd";
 import { gql, useQuery } from "@apollo/client";
@@ -72,7 +72,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
       dataIndex: "start",
       key: "start",
       render: (text) => DateTimeFormatterFunction(text),
-      sorter: (a, b) => day(a.start).unix() - day(b.start).unix()
+      sorter: (a, b) => dayjs(a.start).unix() - dayjs(b.start).unix()
     },
     {
       title: t("job_lifecycle.columns.relative_start"),
@@ -90,7 +90,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
           }
           return isEmpty(a.end) ? 1 : -1;
         }
-        return day(a.end).unix() - day(b.end).unix();
+        return dayjs(a.end).unix() - dayjs(b.end).unix();
       },
       render: (text) => (isEmpty(text) ? t("job_lifecycle.content.not_available") : DateTimeFormatterFunction(text))
     },

client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 
 import { useMutation } from "@apollo/client";
 import { Button, Form, notification, Popover, Select, Space } from "antd";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -48,7 +48,7 @@ export function JobLineDispatchButton({
       const result = await dispatchLines({
         variables: {
           partsDispatch: {
-            dispatched_at: day(),
+            dispatched_at: dayjs(),
             employeeid: values.employeeid,
             jobid: job.id,
             dispatched_by: currentUser.email,
@@ -138,7 +138,11 @@ export function JobLineDispatchButton({
 
   return (
     <Popover open={visible} content={popMenu}>
-      <Button disabled={selectedLines.length === 0 || jobRO || disabled} loading={loading} onClick={() => setVisible(true)}>
+      <Button
+        disabled={selectedLines.length === 0 || jobRO || disabled}
+        loading={loading}
+        onClick={() => setVisible(true)}
+      >
         {t("joblines.actions.dispatchparts", { count: selectedLines.length })}
       </Button>
     </Popover>

client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx

@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Col, notification, Row, Table } from "antd";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_PARTS_DISPATCH_LINE } from "../../graphql/parts-dispatch.queries";
@@ -11,7 +11,7 @@ export default function PartsDispatchExpander({ dispatch, job }) {
   const [updateDispatchLine] = useMutation(UPDATE_PARTS_DISPATCH_LINE);
 
   const handleAccept = async ({ partsDispatchLineId }) => {
-    const accepted_at = day();
+    const accepted_at = dayjs();
     const result = await updateDispatchLine({
       variables: { id: partsDispatchLineId, line: { accepted_at } },
       optimisticResponse: {

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -1,12 +1,14 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { useApolloClient } from "@apollo/client";
-import Board from "./trello-board/index";
-import { Button, notification, Skeleton, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
+import { useApolloClient } from "@apollo/client";
+import { Button, notification, Skeleton, Space } from "antd";
+import cloneDeep from "lodash/cloneDeep";
+import isEqual from "lodash/isEqual";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { generate_UPDATE_JOB_KANBAN } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -15,14 +17,13 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import IndefiniteLoading from "../indefinite-loading/indefinite-loading.component";
 import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
+import ProductionListPrint from "../production-list-table/production-list-print.component.jsx";
 import CardColorLegend from "./production-board-kanban-card-color-legend.component.jsx";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import ProductionBoardKanbanSettings from "./settings/production-board-kanban.settings.component.jsx";
-import cloneDeep from "lodash/cloneDeep";
-import isEqual from "lodash/isEqual";
 import { defaultFilters, mergeWithDefaults } from "./settings/defaultKanbanSettings.js";
-import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
+import ProductionBoardKanbanSettings from "./settings/production-board-kanban.settings.component.jsx";
+import Board from "./trello-board/index";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -214,6 +215,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
               bodyshop={bodyshop}
               data={data}
             />
+            <ProductionListPrint />
           </Space>
         }
       />

client/src/components/production-list-table/production-list-table.component.jsx

@@ -77,7 +77,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
 
   const matchingColumnConfig = useMemo(() => {
     return bodyshop?.production_config?.find((p) => p.name === defaultView);
-  }, [bodyshop.production_config]);
+  }, [bodyshop.production_config, defaultView]);
 
   useEffect(() => {
     const newColumns =

client/src/components/schedule-calendar-wrapper/localizer.js

@@ -120,14 +120,6 @@ var formats = {
 };
 
 const localizer = (dayjsLib) => {
-  // load dayjs plugins
-  dayjsLib.extend(isBetween);
-  dayjsLib.extend(isSameOrAfter);
-  dayjsLib.extend(isSameOrBefore);
-  dayjsLib.extend(localeData);
-  dayjsLib.extend(localizedFormat);
-  dayjsLib.extend(minMax);
-  dayjsLib.extend(utc);
   var locale = function locale(dj, c) {
     return c ? dj.locale(c) : dj;
   };
@@ -136,7 +128,8 @@ const localizer = (dayjsLib) => {
   // then use the timezone aware version
 
   //TODO This was the issue entirely...
-  //  var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
+  // var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
+
   var dayjs = dayjsLib;
 
   function getTimezoneOffset(date) {

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -20,6 +20,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   problemJobs: selectProblemJobs
 });
+
 const localizer = local(dayjs);
 
 export function ScheduleCalendarWrapperComponent({

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

@@ -1,10 +1,3 @@
-import { Button, Card, Space, Switch, Table } from "antd";
-import queryString from "query-string";
-import React, { useCallback, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { pageLimit } from "../../utils/config";
-import dayjs from "../../utils/day";
 import {
   CheckCircleFilled,
   CheckCircleOutlined,
@@ -15,9 +8,16 @@ import {
   PlusCircleFilled,
   SyncOutlined
 } from "@ant-design/icons";
-import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter.jsx";
+import { Button, Card, Space, Switch, Table } from "antd";
+import queryString from "query-string";
+import React, { useCallback, useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { pageLimit } from "../../utils/config";
+import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter.jsx";
+import dayjs from "../../utils/day";
 
 /**
  * Task List Component
@@ -140,6 +140,17 @@ function TaskListComponent({
     render: (text, record) => <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
   });
 
+  columns.push({
+    title: t("tasks.fields.created_by"),
+    dataIndex: "created_by",
+    key: "created_by",
+    width: "8%",
+    defaultSortOrder: "descend",
+    sorter: true,
+    sortOrder: sortcolumn === "created_by" && sortorder,
+    render: (text, record) => record.created_by
+  });
+
   if (!onlyMine) {
     columns.push({
       title: t("tasks.fields.assigned_to"),
@@ -155,65 +166,70 @@ function TaskListComponent({
     });
   }
 
-  if (showRo) {
+  columns.push({
-    columns.push({
+    title: t("tasks.fields.related_items"),
-      title: t("tasks.fields.job.ro_number"),
+    key: "related_items",
-      dataIndex: ["job", "ro_number"],
+    width: "12%",
-      key: "job.ro_number",
+    render: (text, record) => {
-      width: "8%",
+      const items = [];
-      render: (text, record) =>
+
-        record.job ? (
+      // Job
-          <Link to={`/manage/jobs/${record.job.id}?tab=tasks`}>{record.job.ro_number || t("general.labels.na")}</Link>
+      if (showRo && record.job) {
-        ) : (
+        items.push(
-          t("general.labels.na")
+          <Link key="job" to={`/manage/jobs/${record.job.id}?tab=tasks`}>
-        )
+            {t("tasks.fields.job.ro_number")}: {record.job.ro_number}
-    });
+          </Link>
-  }
+        );
+      }
+      if (showRo && !record.job) {
+        items.push(`${t("tasks.fields.job.ro_number")}: ${t("general.labels.na")}`);
+      }
+
+      // Jobline
+      if (record.jobline?.line_desc) {
+        items.push(
+          <span key="jobline">
+            {t("tasks.fields.jobline")}: {record.jobline.line_desc}
+          </span>
+        );
+      }
+
+      // Parts Order
+      if (record.parts_order) {
+        const { order_number, vendor } = record.parts_order;
+        const partsOrderText =
+          order_number && vendor?.name ? `${order_number} - ${vendor.name}` : t("general.labels.na");
+        items.push(
+          <Link
+            key="parts_order"
+            to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}
+          >
+            {t("tasks.fields.parts_order")}: {partsOrderText}
+          </Link>
+        );
+      }
+
+      // Bill
+      if (record.bill) {
+        const { invoice_number, vendor } = record.bill;
+        const billText = invoice_number && vendor?.name ? `${invoice_number} - ${vendor.name}` : t("general.labels.na");
+        items.push(
+          <Link key="bill" to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
+            {t("tasks.fields.bill")}: {billText}
+          </Link>
+        );
+      }
+
+      return items.length > 0 ? <Space direction="vertical">{items}</Space> : null;
+    }
+  });
 
   columns.push(
-    {
-      title: t("tasks.fields.jobline"),
-      dataIndex: ["jobline", "id"],
-      key: "jobline.id",
-      width: "8%",
-      render: (text, record) => record?.jobline?.line_desc || ""
-    },
-    {
-      title: t("tasks.fields.parts_order"),
-      dataIndex: ["parts_order", "id"],
-      key: "part_order.id",
-      width: "8%",
-      render: (text, record) =>
-        record.parts_order ? (
-          <Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
-            {record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
-              ? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
-              : t("general.labels.na")}
-          </Link>
-        ) : (
-          ""
-        )
-    },
-    {
-      title: t("tasks.fields.bill"),
-      dataIndex: ["bill", "id"],
-      key: "bill.id",
-      width: "10%",
-      render: (text, record) =>
-        record.bill ? (
-          <Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
-            {record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
-              ? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
-              : t("general.labels.na")}
-          </Link>
-        ) : (
-          ""
-        )
-    },
     {
       title: t("tasks.fields.title"),
       dataIndex: "title",
       key: "title",
+      minWidth: "20%",
       sorter: true,
       sortOrder: sortcolumn === "title" && sortorder
     },
@@ -247,7 +263,7 @@ function TaskListComponent({
     {
       title: t("tasks.fields.actions"),
       key: "toggleCompleted",
-      width: "5%",
+      width: "8%",
       render: (text, record) => (
         <Space direction="horizontal">
           <Button

client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx

@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -29,7 +29,7 @@ export function TimeTicketsCommit({ bodyshop, currentUser, timeticket, disabled,
         ? { commited_by: null, committed_at: null }
         : {
             commited_by: currentUser.email,
-            committed_at: day()
+            committed_at: dayjs()
           };
 
       const result = await updateTimeTicket({

client/src/components/time-tickets-commit/time-tickets-commit.component.jsx

@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -34,7 +34,7 @@ export function TimeTicketsCommit({
           timeticketIds: timetickets.map((ticket) => ticket.id),
           timeticket: {
             commited_by: currentUser.email,
-            committed_at: day()
+            committed_at: dayjs()
           }
         },
         update(cache) {
@@ -47,7 +47,7 @@ export function TimeTicketsCommit({
                     return {
                       ...ticket,
                       commited_by: currentUser.email,
-                      committed_at: day()
+                      committed_at: dayjs()
                     };
                   }
                   return ticket;

client/src/components/tt-approve-button/tt-approve-button.component.jsx

@@ -1,7 +1,7 @@
 import { useApolloClient } from "@apollo/client";
 import { Button, notification } from "antd";
 import _ from "lodash";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -49,7 +49,7 @@ export function TtApproveButton({
           })),
           approvalIds: selectedTickets,
           approvalUpdate: {
-            approved_at: day(),
+            approved_at: dayjs(),
             approved_by: currentUser.email
           }
         }

client/src/graphql/appointments.queries.js

@@ -48,6 +48,7 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         v_model_desc
         est_ct_fn
         est_ct_ln
+        comment
         labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
           aggregate {
             sum {

client/src/pages/dms-payables/dms-payables.container.jsx

@@ -123,7 +123,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                     socket.emit("set-log-level", value);
                   }}
                 >
-                  <Select.Option key="TRACE">TRACE</Select.Option>
                   <Select.Option key="DEBUG">DEBUG</Select.Option>
                   <Select.Option key="INFO">INFO</Select.Option>
                   <Select.Option key="WARNING">WARNING</Select.Option>

client/src/pages/dms/dms.container.jsx

@@ -173,7 +173,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                       socket.emit("set-log-level", value);
                     }}
                   >
-                    <Select.Option key="TRACE">TRACE</Select.Option>
                     <Select.Option key="DEBUG">DEBUG</Select.Option>
                     <Select.Option key="INFO">INFO</Select.Option>
                     <Select.Option key="WARNING">WARNING</Select.Option>

client/src/redux/user/user.sagas.js

@@ -28,7 +28,7 @@ import {
 } from "../../firebase/firebase.utils";
 import { QUERY_EULA } from "../../graphql/bodyshop.queries";
 import client from "../../utils/GraphQLClient";
-import day from "../../utils/day";
+import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import {
   checkInstanceId,
@@ -96,7 +96,7 @@ export function* isUserAuthenticated() {
     const eulaQuery = yield client.query({
       query: QUERY_EULA,
       variables: {
-        now: day()
+        now: dayjs()
       }
     });
 
@@ -314,8 +314,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
   try {
     const userEmail = yield select((state) => state.user.currentUser.email);
     try {
-      console.log("Setting shop timezone.");
+      dayjs.tz.setDefault(payload.timezone);
-      day.tz.setDefault(payload.timezone);
     } catch (error) {
       console.log(error);
     }

client/src/translations/en_us/common.json

@@ -3044,6 +3044,7 @@
         "production_by_target_date": "Production by Target Date",
         "production_by_technician": "Production by Technician",
         "production_by_technician_one": "Production filtered by Technician",
+        "production_not_production_status": "Production not in Production Status",
         "production_over_time": "Production Level over Time",
         "psr_by_make": "Percent of Sales by Vehicle Make",
         "purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
@@ -3186,6 +3187,7 @@
         "billid": "Bill",
         "completed": "Completed",
         "created_at": "Created At",
+        "created_by": "Created By",
         "description": "Description",
         "due_date": "Due Date",
         "job": {
@@ -3202,6 +3204,7 @@
           "medium": "Medium"
         },
         "priority": "Priority",
+        "related_items": "Related Items",
         "remind_at": "Remind At",
         "title": "Title"
       },

client/src/translations/es/common.json

@@ -3044,6 +3044,7 @@
         "production_by_target_date": "",
         "production_by_technician": "",
         "production_by_technician_one": "",
+        "production_not_production_status": "",
         "production_over_time": "",
         "psr_by_make": "",
         "purchase_return_ratio_grouped_by_vendor_detail": "",
@@ -3186,6 +3187,7 @@
         "billid": "",
         "completed": "",
         "created_at": "",
+        "created_by": "",
         "description": "",
         "due_date": "",
         "job": {
@@ -3202,6 +3204,7 @@
           "medium": ""
         },
         "priority": "",
+        "related_items": "",
         "remind_at": "",
         "title": ""
       },

client/src/utils/TemplateConstants.js

@@ -2333,6 +2333,14 @@ export const TemplateList = (type, context) => {
             key: "production_by_technician",
             //idtype: "vendor",
             disabled: false
+          },
+          production_not_production_status: {
+            title: i18n.t("reportcenter.templates.production_not_production_status"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.production_not_production_status"),
+            key: "production_not_production_status",
+            //idtype: "vendor",
+            disabled: false
           }
         }
       : {}),

client/src/utils/day.js

@@ -1,5 +1,6 @@
 import dayjs from "dayjs";
 
+import "dayjs/locale/en";
 import dayjsBusinessDays from "dayjs-business-days2";
 import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
 import updateLocale from "dayjs/plugin/updateLocale";
@@ -64,4 +65,6 @@ dayjs.extend(minMax);
 dayjs.extend(isBetween);
 dayjs.extend(dayjsBusinessDays);
 
+dayjs.locale("en");
+
 export default dayjs;

docker-compose.yml

@@ -74,7 +74,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      - SERVICES=ses
+      - SERVICES=ses,secretsmanager,cloudwatch,logs
       - DEBUG=0
       - AWS_ACCESS_KEY_ID=test
       - AWS_SECRET_ACCESS_KEY=test
@@ -101,6 +101,10 @@ services:
     depends_on:
       localstack:
         condition: service_healthy
+    volumes:
+      - './localstack:/tmp/localstack'
+      - './certs:/tmp/certs'
+
     environment:
       - AWS_ACCESS_KEY_ID=test
       - AWS_SECRET_ACCESS_KEY=test
@@ -110,6 +114,8 @@ services:
       "
         aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
         aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
+        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/id_rsa
+        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
       "
   # Node App: The Main IMEX API
   node-app:
@@ -134,6 +140,7 @@ services:
         condition: service_completed_successfully
     ports:
       - "4000:4000"
+      - "9229:9229"
     volumes:
       - .:/app
       - node-app-npm-cache:/app/node_modules

package.json

@@ -19,10 +19,11 @@
     "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\""
   },
   "dependencies": {
-    "@aws-sdk/client-elasticache": "^3.665.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.679.0",
-    "@aws-sdk/client-secrets-manager": "^3.654.0",
+    "@aws-sdk/client-elasticache": "^3.675.0",
-    "@aws-sdk/client-ses": "^3.654.0",
+    "@aws-sdk/client-secrets-manager": "^3.675.0",
-    "@aws-sdk/credential-provider-node": "^3.654.0",
+    "@aws-sdk/client-ses": "^3.675.0",
+    "@aws-sdk/credential-provider-node": "^3.675.0",
     "@opensearch-project/opensearch": "^2.12.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
@@ -32,40 +33,41 @@
     "bluebird": "^3.7.2",
     "body-parser": "^1.20.3",
     "canvas": "^2.11.2",
-    "chart.js": "^4.4.4",
+    "chart.js": "^4.4.5",
-    "cloudinary": "^2.5.0",
+    "cloudinary": "^2.5.1",
     "compression": "^1.7.4",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "cors": "2.8.5",
     "csrf": "^3.1.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
-    "express": "^4.21.0",
+    "express": "^4.21.1",
-    "firebase-admin": "^12.5.0",
+    "firebase-admin": "^12.6.0",
     "graphql": "^16.9.0",
     "graphql-request": "^6.1.0",
-    "graylog2": "^0.2.1",
     "inline-css": "^4.0.2",
     "intuit-oauth": "^4.1.2",
     "ioredis": "^5.4.1",
-    "json-2-csv": "^5.5.5",
+    "json-2-csv": "^5.5.6",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "moment-timezone": "^0.5.45",
+    "moment-timezone": "^0.5.46",
     "multer": "^1.4.5-lts.1",
     "node-mailjet": "^6.0.6",
     "node-persist": "^4.0.3",
     "nodemailer": "^6.9.15",
-    "phone": "^3.1.50",
+    "phone": "^3.1.51",
     "recursive-diff": "^1.0.9",
     "redis": "^4.7.0",
     "rimraf": "^6.0.1",
-    "soap": "^1.1.4",
+    "soap": "^1.1.5",
     "socket.io": "^4.8.0",
     "socket.io-adapter": "^2.5.5",
     "ssh2-sftp-client": "^10.0.3",
     "twilio": "^4.23.0",
     "uuid": "^10.0.0",
+    "winston": "^3.15.0",
+    "winston-cloudwatch": "^6.3.0",
     "xml2js": "^0.6.2",
     "xmlbuilder2": "^3.1.1"
   },

server.js

@@ -1,5 +1,10 @@
-const cors = require("cors");
+// Load environment variables THIS MUST BE AT THE TOP
 const path = require("path");
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
+
+const cors = require("cors");
 const http = require("http");
 const Redis = require("ioredis");
 const express = require("express");
@@ -18,11 +23,6 @@ const { redisSocketEvents } = require("./server/web-sockets/redisSocketEvents");
 const { ElastiCacheClient, DescribeCacheClustersCommand } = require("@aws-sdk/client-elasticache");
 const { default: InstanceManager } = require("./server/utils/instanceMgr");
 
-// Load environment variables
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-
 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
 const CLUSTER_RETRY_JITTER = 100;
@@ -153,18 +153,13 @@ const connectToRedisCluster = async () => {
   } else {
     // Use the Dockerized Redis cluster in development
     if (isEmpty(process.env?.REDIS_URL) || !isString(process.env?.REDIS_URL)) {
-      logger.log(`[${process.env.NODE_ENV}] No or Malformed REDIS_URL present.`, "ERROR", "redis", "api");
+      logger.log(`No or Malformed REDIS_URL present.`, "ERROR", "redis", "api");
       process.exit(1);
     }
     try {
       redisServers = JSON.parse(process.env.REDIS_URL);
     } catch (error) {
-      logger.log(
+      logger.log(`Failed to parse REDIS_URL: ${error.message}. Exiting...`, "ERROR", "redis", "api");
-        `[${process.env.NODE_ENV}] Failed to parse REDIS_URL: ${error.message}. Exiting...`,
-        "ERROR",
-        "redis",
-        "api"
-      );
       process.exit(1);
     }
   }
@@ -172,12 +167,7 @@ const connectToRedisCluster = async () => {
   const clusterRetryStrategy = (times) => {
     const delay =
       Math.min(CLUSTER_RETRY_BASE_DELAY + times * 50, CLUSTER_RETRY_MAX_DELAY) + Math.random() * CLUSTER_RETRY_JITTER;
-    logger.log(
+    logger.log(`Redis cluster not yet ready. Retrying in ${delay.toFixed(2)}ms`, "WARN", "redis", "api");
-      `[${process.env.NODE_ENV}] Redis cluster not yet ready. Retrying in ${delay.toFixed(2)}ms`,
-      "ERROR",
-      "redis",
-      "api"
-    );
     return delay;
   };
 
@@ -194,12 +184,12 @@ const connectToRedisCluster = async () => {
 
   return new Promise((resolve, reject) => {
     redisCluster.on("ready", () => {
-      logger.log(`[${process.env.NODE_ENV}] Redis cluster connection established.`, "INFO", "redis", "api");
+      logger.log(`Redis cluster connection established.`, "INFO", "redis", "api");
       resolve(redisCluster);
     });
 
     redisCluster.on("error", (err) => {
-      logger.log(`[${process.env.NODE_ENV}] Redis cluster connection failed: ${err.message}`, "ERROR", "redis", "api");
+      logger.log(`Redis cluster connection failed: ${err.message}`, "ERROR", "redis", "api");
       reject(err);
     });
   });
@@ -215,7 +205,7 @@ const applySocketIO = async ({ server, app }) => {
 
   // Handle errors
   redisCluster.on("error", (err) => {
-    logger.log(`[${process.env.NODE_ENV}] Redis ERROR`, "ERROR", "redis", "api");
+    logger.log(`Redis ERROR`, "ERROR", "redis", "api");
   });
 
   const pubClient = redisCluster;
@@ -249,7 +239,7 @@ const applySocketIO = async ({ server, app }) => {
   });
 
   if (isString(process.env.REDIS_ADMIN_PASS) && !isEmpty(process.env.REDIS_ADMIN_PASS)) {
-    logger.log(`[${process.env.NODE_ENV}] Initializing Redis Admin UI....`, "INFO", "redis", "api");
+    logger.log(`Initializing Redis Admin UI....`, "INFO", "redis", "api");
     instrument(ioRedis, {
       auth: {
         type: "basic",
@@ -312,9 +302,9 @@ const main = async () => {
 
   try {
     await server.listen(port);
-    logger.log(`[${process.env.NODE_ENV}] Server started on port ${port}`, "INFO", "api");
+    logger.log(`Server started on port ${port}`, "INFO", "api");
   } catch (error) {
-    logger.log(`[${process.env.NODE_ENV}] Server failed to start on port ${port}`, "ERROR", "api", error);
+    logger.log(`Server failed to start on port ${port}`, "ERROR", "api", error);
   }
 };
 

server/accounting/pbs/pbs-ap-allocations.js

@@ -24,9 +24,9 @@ axios.interceptors.request.use((x) => {
   const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
     x.url
   } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
-  console.log(printable);
+  //console.log(printable);
 
-  CdkBase.createJsonEvent(socket, "TRACE", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
 
   return x;
 });
@@ -35,8 +35,8 @@ axios.interceptors.response.use((x) => {
   const socket = x.config.socket;
 
   const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
-  console.log(printable);
+  //console.log(printable);
-  CdkBase.createJsonEvent(socket, "TRACE", `Raw Response: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
 
   return x;
 });
@@ -181,7 +181,7 @@ async function QueryBillData(socket, billids) {
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.GET_PBS_AP_ALLOCATIONS, { billids: billids });
-  CdkBase.createLogEvent(socket, "TRACE", `Bill data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "SILLY", `Bill data query result ${JSON.stringify(result, null, 2)}`);
 
   return result;
 }

server/accounting/pbs/pbs-job-export.js

@@ -26,9 +26,9 @@ axios.interceptors.request.use((x) => {
   const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
     x.url
   } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
-  console.log(printable);
+  //console.log(printable);
 
-  CdkBase.createJsonEvent(socket, "TRACE", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
 
   return x;
 });
@@ -37,8 +37,8 @@ axios.interceptors.response.use((x) => {
   const socket = x.config.socket;
 
   const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
-  console.log(printable);
+  //console.log(printable);
-  CdkBase.createJsonEvent(socket, "TRACE", `Raw Response: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
 
   return x;
 });
@@ -118,7 +118,7 @@ async function CheckForErrors(socket, response) {
     CdkBase.createLogEvent(socket, "DEBUG", `Successful response from DMS. ${response.Message || ""}`);
   } else {
     CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
-    CdkBase.createLogEvent(socket, "TRACE", `Error received from DMS: ${JSON.stringify(response)}`);
+    CdkBase.createLogEvent(socket, "SILLY", `Error received from DMS: ${JSON.stringify(response)}`);
   }
 }
 
@@ -130,7 +130,7 @@ async function QueryJobData(socket, jobid) {
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
-  CdkBase.createLogEvent(socket, "TRACE", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 

server/accounting/qb-receivables-lines.js

@@ -63,7 +63,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
       );
 
       if (!account) {
-        logger.log("qbxml-receivables-no-account", "warn", null, jobline.id, null);
+        logger.log("qbxml-receivables-no-account", "warn", null, jobline.id);
         throw new Error(
           `A matching account does not exist for the part allocation. Center: ${jobline.profitcenter_part}`
         );
@@ -207,7 +207,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
   });
 
   if (!hasMapaLine && jobs_by_pk.job_totals.rates.mapa.total.amount > 0) {
-    // console.log("Adding MAPA Line Manually.");
+    // //console.log("Adding MAPA Line Manually.");
     const mapaAccountName = responsibilityCenters.defaults.profits.MAPA;
 
     const mapaAccount = responsibilityCenters.profits.find((c) => c.name === mapaAccountName);
@@ -272,12 +272,12 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
         });
       }
     } else {
-      //console.log("NO MAPA ACCOUNT FOUND!!");
+      ////console.log("NO MAPA ACCOUNT FOUND!!");
     }
   }
 
   if (!hasMashLine && jobs_by_pk.job_totals.rates.mash.total.amount > 0) {
-    // console.log("Adding MASH Line Manually.");
+    // //console.log("Adding MASH Line Manually.");
 
     const mashAccountName = responsibilityCenters.defaults.profits.MASH;
 
@@ -341,7 +341,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
         });
       }
     } else {
-      //  console.log("NO MASH ACCOUNT FOUND!!");
+      //  //console.log("NO MASH ACCOUNT FOUND!!");
     }
   }
 
@@ -795,7 +795,7 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
         : taxCodes[taxAccountCode];
     for (let tyCounter = 1; tyCounter <= 5; tyCounter++) {
       const taxAmount = Dinero(job_totals.totals.us_sales_tax_breakdown[`ty${tyCounter}Tax`]);
-      console.log(`Tax ${tyCounter}`, taxAmount.toFormat());
+      //console.log(`Tax ${tyCounter}`, taxAmount.toFormat());
       if (taxAmount.getAmount() > 0) {
         if (qbo) {
           InvoiceLineAdd.push({

server/accounting/qbo/qbo-payables.js

@@ -45,7 +45,7 @@ exports.default = async (req, res) => {
     const BearerToken = req.BearerToken;
     const client = req.userGraphQLClient;
 
-    logger.log("qbo-payable-create", "DEBUG", req.user.email, billsToQuery);
+    logger.log("qbo-payable-create", "DEBUG", req.user.email, null, { billsToQuery });
 
     const result = await client
       .setHeaders({ Authorization: BearerToken })
@@ -91,6 +91,12 @@ exports.default = async (req, res) => {
 
         ret.push({ billid: bill.id, success: true });
       } catch (error) {
+        logger.log("qbo-paybles-create-error", "ERROR", req.user.email, null, {
+          error:
+            (error && error.authResponse && error.authResponse.body) ||
+            error.response?.data?.Fault?.Error.map((e) => e.Detail).join(", ") ||
+            (error && error.message)
+        });
         ret.push({
           billid: bill.id,
           success: false,
@@ -121,8 +127,8 @@ exports.default = async (req, res) => {
 
     res.status(200).json(ret);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
-    logger.log("qbo-payable-create-error", "ERROR", req.user.email, {
+    logger.log("qbo-payable-create-error", "ERROR", req.user.email, null, {
       error: error.message,
       stack: error.stack
     });

server/accounting/qbo/qbo-payments.js

@@ -49,7 +49,7 @@ exports.default = async (req, res) => {
     const BearerToken = req.BearerToken;
     const client = req.userGraphQLClient;
 
-    logger.log("qbo-payment-create", "DEBUG", req.user.email, paymentsToQuery);
+    logger.log("qbo-payment-create", "DEBUG", req.user.email, null, { paymentsToQuery });
 
     const result = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_PAYMENTS_FOR_EXPORT, {
       payments: paymentsToQuery
@@ -152,7 +152,7 @@ exports.default = async (req, res) => {
 
         ret.push({ paymentid: payment.id, success: true });
       } catch (error) {
-        logger.log("qbo-payment-create-error", "ERROR", req.user.email, {
+        logger.log("qbo-payment-create-error", "ERROR", req.user.email, null, {
           error: (error && error.authResponse && error.authResponse.body) || (error && error.message)
         });
         //Add the export log error.
@@ -182,8 +182,8 @@ exports.default = async (req, res) => {
 
     res.status(200).json(ret);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
-    logger.log("qbo-payment-create-error", "ERROR", req.user.email, {
+    logger.log("qbo-payment-create-error", "ERROR", req.user.email, null, {
       error: error.message,
       stack: error.stack
     });

server/accounting/qbo/qbo-receivables.js

@@ -185,7 +185,7 @@ exports.default = async (req, res) => {
             error?.response?.data ||
             error?.message
         });
-        console.log(error);
+        //console.log(error);
         logger.log("qbo-receivable-create-error", "ERROR", req.user.email, {
           error: error.message,
           stack: error.stack
@@ -211,7 +211,7 @@ exports.default = async (req, res) => {
 
     res.status(200).json(ret);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
     logger.log("qbo-receivable-create-error", "ERROR", req.user.email, {
       error: error.message,
       stack: error.stack

server/accounting/qbxml/qbxml-payables.js

@@ -42,9 +42,10 @@ exports.default = async (req, res) => {
     //For each invoice.
     res.status(200).json(QbXmlToExecute);
   } catch (error) {
-    logger.log("qbxml-payable-error", "ERROR", req.user.email, req.body.billsToQuery, {
+    logger.log("qbxml-payable-error", "ERROR", req?.user?.email, null, {
-      error: error.message,
+      billsToQuery: req?.body?.billsToQuery,
-      stack: error.stack
+      error: error?.message,
+      stack: error?.stack
     });
     res.status(400).send(JSON.stringify(error));
   }

server/accounting/qbxml/qbxml-payments.js

@@ -21,7 +21,9 @@ exports.default = async (req, res) => {
   const client = req.userGraphQLClient;
 
   try {
-    logger.log("qbxml-payments-create", "DEBUG", req.user.email, req.body.paymentsToQuery, null);
+    logger.log("qbxml-payments-create", "DEBUG", req?.user?.email, null, {
+      paymentsToQuery: req.body?.paymentsToQuery
+    });
 
     const result = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_PAYMENTS_FOR_EXPORT, {
       payments: paymentsToQuery
@@ -62,7 +64,8 @@ exports.default = async (req, res) => {
 
     res.status(200).json(QbXmlToExecute);
   } catch (error) {
-    logger.log("qbxml-payments-error", "error", req.user.email, req.body.paymentsToQuery, {
+    logger.log("qbxml-payments-error", "error", req?.user?.email, null, {
+      paymentsToQuery: req.body?.paymentsToQuery,
       error: error.message,
       stack: error.stack
     });

server/accounting/qbxml/qbxml-receivables.js

@@ -23,7 +23,9 @@ exports.default = async (req, res) => {
   const client = req.userGraphQLClient;
 
   try {
-    logger.log("qbxml-receivables-create", "DEBUG", req.user.email, req.body.jobIds, null);
+    logger.log("qbxml-receivables-create", "DEBUG", req?.user?.email, null, {
+      jobIds: req?.body?.jobIds
+    });
 
     const result = await client
       .setHeaders({ Authorization: BearerToken })
@@ -74,7 +76,8 @@ exports.default = async (req, res) => {
 
     res.status(200).json(QbXmlToExecute);
   } catch (error) {
-    logger.log("qbxml-receivables-error", "error", req.user.email, req.body.jobIds, {
+    logger.log("qbxml-receivables-error", "error", req?.user?.email, null, {
+      jobIds: req.body?.jobIds,
       error: error.message,
       stack: error.stack
     });

server/admin/adminops.js

@@ -9,7 +9,7 @@ require("dotenv").config({
 const client = require("../graphql-client/graphql-client").client;
 
 exports.createAssociation = async (req, res) => {
-  logger.log("admin-create-association", "ADMIN", req.user.email, null, {
+  logger.log("admin-create-association", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });
@@ -31,7 +31,7 @@ exports.createAssociation = async (req, res) => {
   res.json(result);
 };
 exports.createShop = async (req, res) => {
-  logger.log("admin-create-shop", "ADMIN", req.user.email, null, {
+  logger.log("admin-create-shop", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });
@@ -64,7 +64,7 @@ exports.createShop = async (req, res) => {
   }
 };
 exports.updateCounter = async (req, res) => {
-  logger.log("admin-update-counter", "ADMIN", req.user.email, null, {
+  logger.log("admin-update-counter", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });
@@ -91,7 +91,7 @@ exports.updateCounter = async (req, res) => {
   }
 };
 exports.updateShop = async (req, res) => {
-  logger.log("admin-update-shop", "ADMIN", req.user.email, null, {
+  logger.log("admin-update-shop", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });

server/cdk/cdk-calculate-allocations.js

@@ -22,7 +22,7 @@ exports.defaultRoute = async function (req, res) {
     const jobData = await QueryJobData(req, req.BearerToken, req.body.jobid);
     return res.status(200).json({ data: calculateAllocations(req, jobData) });
   } catch (error) {
-    console.log(error);
+    ////console.log(error);
     CdkBase.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
     res.status(500).json({ error: `Error encountered in CdkCalculateAllocations. ${error}` });
   }
@@ -33,7 +33,7 @@ exports.default = async function (socket, jobid) {
     const jobData = await QueryJobData(socket, "Bearer " + socket.handshake.auth.token, jobid);
     return calculateAllocations(socket, jobData);
   } catch (error) {
-    console.log(error);
+    ////console.log(error);
     CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
   }
 };
@@ -42,7 +42,7 @@ async function QueryJobData(connectionData, token, jobid) {
   CdkBase.createLogEvent(connectionData, "DEBUG", `Querying job data for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
   const result = await client.setHeaders({ Authorization: token }).request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
-  CdkBase.createLogEvent(connectionData, "TRACE", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(connectionData, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 
@@ -212,7 +212,7 @@ function calculateAllocations(connectionData, job) {
   });
 
   if (!hasMapaLine && job.job_totals.rates.mapa.total.amount > 0) {
-    // console.log("Adding MAPA Line Manually.");
+    // //console.log("Adding MAPA Line Manually.");
     const mapaAccountName = selectedDmsAllocationConfig.profits.MAPA;
 
     const mapaAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === mapaAccountName);
@@ -224,7 +224,7 @@ function calculateAllocations(connectionData, job) {
         Dinero(job.job_totals.rates.mapa.total)
       );
     } else {
-      //console.log("NO MAPA ACCOUNT FOUND!!");
+      ////console.log("NO MAPA ACCOUNT FOUND!!");
     }
   }
 
@@ -373,13 +373,19 @@ function calculateAllocations(connectionData, job) {
     });
     //profile level adjustments for labor and materials
     Object.keys(job.job_totals.rates).forEach((key) => {
-      if (job.job_totals.rates[key] && job.job_totals.rates[key].adjustment && Dinero(job.job_totals.rates[key].adjustment).isZero() === false) {
+      if (
+        job.job_totals.rates[key] &&
+        job.job_totals.rates[key].adjustment &&
+        Dinero(job.job_totals.rates[key].adjustment).isZero() === false
+      ) {
         const accountName = selectedDmsAllocationConfig.profits[key.toUpperCase()];
         const otherAccount = bodyshop.md_responsibility_centers.profits.find((c) => c.name === accountName);
         if (otherAccount) {
           if (!profitCenterHash[accountName]) profitCenterHash[accountName] = Dinero();
 
-          profitCenterHash[accountName] = profitCenterHash[accountName].add(Dinero(job.job_totals.rates[key].adjustments));
+          profitCenterHash[accountName] = profitCenterHash[accountName].add(
+            Dinero(job.job_totals.rates[key].adjustments)
+          );
         } else {
           CdkBase.createLogEvent(
             connectionData,

server/cdk/cdk-get-makes.js

@@ -39,8 +39,8 @@ exports.default = async function ReloadCdkMakes(req, res) {
     const deleteResult = await client
       .setHeaders({ Authorization: BearerToken })
       .request(queries.DELETE_ALL_DMS_VEHICLES, {});
-    console.log("🚀  ~ file: cdk-get-makes.js  ~ line 53  ~ deleteResult", deleteResult);
 
+    // logger.logger.debug("🚀  ~ file: cdk-get-makes.js  ~ line 53  ~ deleteResult", { deleteResult });
     //Insert the new ones.
 
     const insertResult = await client.setHeaders({ Authorization: BearerToken }).request(queries.INSERT_DMS_VEHICLES, {
@@ -59,6 +59,7 @@ exports.default = async function ReloadCdkMakes(req, res) {
       cdk_dealerid,
       count: newList.length
     });
+
     res.sendStatus(200);
   } catch (error) {
     logger.log("cdk-replace-makes-models-error", "ERROR", req.user.email, null, {

server/cdk/cdk-job-export.js

@@ -151,7 +151,7 @@ async function QueryJobData(socket, jobid) {
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.QUERY_JOBS_FOR_CDK_EXPORT, { id: jobid });
-  CdkBase.createLogEvent(socket, "TRACE", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 
@@ -171,7 +171,7 @@ async function CalculateDmsVid(socket, JobData) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientVehicleInsertUpdate.getVehIdsAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
@@ -214,7 +214,7 @@ async function QueryDmsVehicleById(socket, JobData, DMSVid) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientVehicleInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.readAsync response.`);
@@ -246,7 +246,7 @@ async function QueryDmsCustomerById(socket, JobData, CustomerId) {
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.readAsync response.`);
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientCustomerInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
@@ -295,7 +295,7 @@ async function QueryDmsCustomerByName(socket, JobData) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientCustomerSearch.executeSearchBulkAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerSearch);
@@ -337,7 +337,7 @@ async function GenerateDmsCustomerNumber(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientCustomerInsertUpdate.getCustomerNumberAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
@@ -425,7 +425,7 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.insertAsync response.`);
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientCustomerInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
@@ -505,7 +505,7 @@ async function InsertDmsVehicle(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientVehicleInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.insertAsync response.`);
@@ -611,7 +611,7 @@ async function UpdateDmsVehicle(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "DEBUG",
       `soapClientVehicleInsertUpdate.updateAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.updateAsync response.`);
@@ -650,7 +650,7 @@ async function InsertServiceVehicleHistory(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`);
@@ -690,7 +690,7 @@ async function InsertDmsStartWip(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientAccountingGLInsertUpdate.doStartWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doStartWIPAsync response.`);
@@ -721,7 +721,7 @@ async function InsertDmsBatchWip(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync response.`);
@@ -885,7 +885,7 @@ async function PostDmsBatchWip(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
@@ -914,7 +914,7 @@ async function QueryDmsErrWip(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "DEBUG",
       `soapClientAccountingGLInsertUpdate.doErrWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doErrWIPAsync response.`);
@@ -945,7 +945,7 @@ async function DeleteDmsWip(socket) {
 
     CdkBase.createLogEvent(
       socket,
-      "TRACE",
+      "SILLY",
       `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);

server/data/arms.js

@@ -820,7 +820,7 @@ exports.default = async (req, res) => {
         job: JSON.stringify({ id: job.id, ro_number: job.ro_number }),
         error: error.message || JSON.stringify(error)
       });
-      console.log(error);
+      //console.log(error);
     }
   } catch (error) {
     logger.log("arms-failed-job", "ERROR", "api", job.shopid, {
@@ -886,7 +886,10 @@ exports.default = async (req, res) => {
           const [result, rawResponse, , rawRequest] = entegralResponse;
         } catch (error) {
           fs.writeFileSync(`./logs/${xmlObj.filename}`, xmlObj.xml);
-          console.log(error);
+          //console.log(error);
+          logger.log("arms-error-shop", "ERROR", "api", bodyshop.id, {
+            error
+          });
         }
       } catch (error) {
         //Error at the shop level.

server/data/autohouse.js

@@ -206,9 +206,6 @@ const CreateRepairOrderTag = (job, errorCallback) => {
 
   const repairCosts = CreateCosts(job);
 
-  if (job.ro_number === "QBD209") {
-    console.log("Stop here");
-  }
   //Calculate detail only lines.
   const detailAdjustments = job.joblines
     .filter((jl) => jl.ah_detail_line && jl.mod_lbr_ty)

server/data/chatter.js

@@ -154,7 +154,7 @@ exports.default = async (req, res) => {
 async function getPrivateKey() {
   // Connect to AWS Secrets Manager
   const client = new SecretsManagerClient({ region: "ca-central-1" });
-  const command = new GetSecretValueCommand({ SecretId: CHATTER_PRIVATE_KEY });
+  const command = new GetSecretValueCommand({ SecretId: "CHATTER_PRIVATE_KEY" });
 
   logger.log("chatter-get-private-key", "DEBUG", "api", null, null);
   try {

server/email/mailer.js

@@ -3,6 +3,7 @@ const { defaultProvider } = require("@aws-sdk/credential-provider-node");
 const { default: InstanceManager } = require("../utils/instanceMgr");
 const aws = require("@aws-sdk/client-ses");
 const nodemailer = require("nodemailer");
+const logger = require("../utils/logger");
 
 const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
 
@@ -19,7 +20,7 @@ const sesConfig = {
 
 if (isLocal) {
   sesConfig.endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:4566`;
-  console.log(`SES Mailer set to LocalStack end point: ${sesConfig.endpoint}`);
+  logger.logger.debug(`SES Mailer set to LocalStack end point: ${sesConfig.endpoint}`);
 }
 
 const ses = new aws.SES(sesConfig);

server/email/sendemail.js

@@ -21,7 +21,7 @@ const getImage = async (imageUrl) => {
 // Log the email in the database
 const logEmail = async (req, email) => {
   try {
-    const insertresult = await client.request(queries.INSERT_EMAIL_AUDIT, {
+    await client.request(queries.INSERT_EMAIL_AUDIT, {
       email: {
         to: email.to,
         cc: email.cc,
@@ -34,13 +34,13 @@ const logEmail = async (req, email) => {
         status: "Sent"
       }
     });
-    console.log(insertresult);
   } catch (error) {
-    logger.log("email-log-error", "error", req.user.email, null, {
+    logger.log("email-log-error", "error", req?.user?.email, null, {
       from: `${req.body.from.name} <${req.body.from.address}>`,
-      to: req.body.to,
+      to: req?.body?.to,
-      cc: req.body.cc,
+      cc: req?.body?.cc,
-      subject: req.body.subject
+      subject: req?.body?.subject,
+      email
       // info,
     });
   }
@@ -70,12 +70,11 @@ const sendServerEmail = async ({ subject, text }) => {
         }
       },
       (err, info) => {
-        console.log(err || info);
+        logger.log("server-email-failure", err ? "error" : "debug", null, null, { message: err || info });
       }
     );
   } catch (error) {
-    console.log(error);
+    logger.log("server-email-failure", "error", null, null, { error });
-    logger.log("server-email-failure", "error", null, null, error);
   }
 };
 
@@ -88,8 +87,7 @@ const sendProManagerWelcomeEmail = async ({ to, subject, html }) => {
       html
     });
   } catch (error) {
-    console.log(error);
+    logger.log("server-email-failure", "error", null, null, { error });
-    logger.log("server-email-failure", "error", null, null, error);
   }
 };
 
@@ -108,12 +106,12 @@ const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachmen
         attachments: attachments || null
       },
       (err, info) => {
-        console.log(err || info);
+        // (message, type, user, record, meta
+        logger.log("server-email", err ? "error" : "debug", null, null, { message: err || info });
       }
     );
   } catch (error) {
-    console.log(error);
+    logger.log("server-email-failure", "error", null, null, { error });
-    logger.log("server-email-failure", "error", null, null, error);
   }
 };
 
@@ -184,9 +182,8 @@ const sendEmail = async (req, res) => {
       }
     },
     (err, info) => {
-      console.log(err || info);
       if (info) {
-        logger.log("send-email-success", "DEBUG", req.user.email, null, {
+        logger.log("send-email-success", "DEBUG", req?.user?.email, null, {
           from: `${req.body.from.name} <${req.body.from.address}>`,
           replyTo: req.body.ReplyTo.Email,
           to: req.body.to,
@@ -205,7 +202,7 @@ const sendEmail = async (req, res) => {
           success: true //response: info
         });
       } else {
-        logger.log("send-email-failure", "ERROR", req.user.email, null, {
+        logger.log("send-email-failure", "ERROR", req?.user?.email, null, {
           from: `${req.body.from.name} <${req.body.from.address}>`,
           replyTo: req.body.ReplyTo.Email,
           to: req.body.to,
@@ -290,7 +287,9 @@ ${body.bounce?.bouncedRecipients.map(
         `
         },
         (err, info) => {
-          console.log("***", err || info);
+          logger.log("sns-error", err ? "error" : "debug", "api", null, {
+            message: err ? JSON.stringify(error) : info
+          });
         }
       );
     }

server/email/tasksEmails.js

@@ -18,10 +18,10 @@ const tasksEmailQueue = taskEmailQueue();
 const tasksEmailQueueCleanup = async () => {
   try {
     // Example async operation
-    console.log("Performing Tasks Email Reminder process cleanup...");
+    // console.log("Performing Tasks Email Reminder process cleanup...");
     await new Promise((resolve) => tasksEmailQueue.destroy(() => resolve()));
   } catch (err) {
-    console.error("Tasks Email Reminder process cleanup failed:", err);
+    // console.error("Tasks Email Reminder process cleanup failed:", err);
   }
 };
 
@@ -77,6 +77,7 @@ const formatPriority = (priority) => {
  * @param priority
  * @param description
  * @param dueDate
+ * @param createdBy
  * @param bodyshop
  * @param job
  * @param taskId
@@ -96,11 +97,11 @@ const getEndpoints = (bodyshop) =>
           : "https://romeonline.io"
   });
 
-const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId, dateLine) => {
+const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId, dateLine, createdBy) => {
   const endPoints = getEndpoints(bodyshop);
   return {
     header: title,
-    subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)}`,
+    subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)} | Created By: ${createdBy || "N/A"}`,
     body: `Reference: ${job.ro_number || "N/A"} | ${job.ownr_co_nm ? job.ownr_co_nm : `${job.ownr_fn || ""} ${job.ownr_ln || ""}`.trim()} | ${`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim()}<br>${description ? description.concat("<br>") : ""}<a href="${endPoints}/manage/tasks/alltasks?taskid=${taskId}">View this task.</a>`,
     dateLine
   };
@@ -181,7 +182,8 @@ const taskAssignedEmail = async (req, res) => {
         tasks_by_pk.bodyshop,
         tasks_by_pk.job,
         newTask.id,
-        dateLine
+        dateLine,
+        newTask.created_by
       )
     ),
     null,
@@ -268,7 +270,8 @@ const tasksRemindEmail = async (req, res) => {
             onlyTask.bodyshop,
             onlyTask.job,
             onlyTask.id,
-            dateLine
+            dateLine,
+            onlyTask.created_by
           )
         );
       }

server/email/tasksEmailsQueue.js

@@ -10,8 +10,9 @@ const logger = require("../utils/logger");
 const taskEmailQueue = () =>
   new Queue(
     (taskIds, cb) => {
-      console.log("Processing reminds for taskIds: ", taskIds.join(", "));
+      logger.log("Processing reminds for taskIds: ", "silly", null, null, {
-
+        taskIds: taskIds?.join(", ")
+      });
       // Set the remind_at_sent to the current time.
       const now = moment().toISOString();
 

server/firebase/firebase-handler.js

@@ -16,7 +16,7 @@ admin.initializeApp({
 });
 
 const createUser = async (req, res) => {
-  logger.log("admin-create-user", "ADMIN", req.user.email, null, {
+  logger.log("admin-create-user", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });
@@ -97,7 +97,7 @@ const sendPromanagerWelcomeEmail = (req, res) => {
 
       // Validate email before proceeding
       if (!dbUser.validemail) {
-        logger.log("admin-send-welcome-email-skip", "ADMIN", req.user.email, null, {
+        logger.log("admin-send-welcome-email-skip", "debug", req.user.email, null, {
           message: "User email is not valid, skipping email.",
           email
         });
@@ -107,7 +107,7 @@ const sendPromanagerWelcomeEmail = (req, res) => {
       // Check if the user's company is ProManager
       const convenientCompany = dbUser.associations?.[0]?.bodyshop?.convenient_company;
       if (convenientCompany !== "promanager") {
-        logger.log("admin-send-welcome-email-skip", "ADMIN", req.user.email, null, {
+        logger.log("admin-send-welcome-email-skip", "debug", req.user.email, null, {
           message: 'convenient_company is not "promanager", skipping email.',
           convenientCompany
         });
@@ -141,7 +141,7 @@ const sendPromanagerWelcomeEmail = (req, res) => {
     })
     .then(() => {
       // Log success and return response
-      logger.log("admin-send-welcome-email", "ADMIN", req.user.email, null, {
+      logger.log("admin-send-welcome-email", "debug", req.user.email, null, {
         request: req.body,
         ioadmin: true,
         emailSentTo: email
@@ -161,7 +161,7 @@ const sendPromanagerWelcomeEmail = (req, res) => {
 };
 
 const updateUser = (req, res) => {
-  logger.log("admin-update-user", "ADMIN", req.user.email, null, {
+  logger.log("admin-update-user", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });
@@ -184,7 +184,7 @@ const updateUser = (req, res) => {
     .then((userRecord) => {
       // See the UserRecord reference doc for the contents of userRecord.
 
-      logger.log("admin-update-user-success", "ADMIN", req.user.email, null, {
+      logger.log("admin-update-user-success", "debug", req.user.email, null, {
         userRecord,
         ioadmin: true
       });
@@ -199,7 +199,7 @@ const updateUser = (req, res) => {
 };
 
 const getUser = (req, res) => {
-  logger.log("admin-get-user", "ADMIN", req.user.email, null, {
+  logger.log("admin-get-user", "debug", req.user.email, null, {
     request: req.body,
     ioadmin: true
   });
@@ -269,10 +269,14 @@ const sendNotification = async (req, res) => {
       })
       .then((response) => {
         // Response is a message ID string.
-        console.log("Successfully sent message:", response);
+        logger.log("Successfully sent message:", "debug", req?.user?.email, null, {
+          response
+        });
       })
       .catch((error) => {
-        console.log("Error sending message:", error);
+        logger.log("Successfully sent message:", "error", req?.user?.email, null, {
+          error
+        });
       });
 
     res.sendStatus(200);
@@ -321,7 +325,7 @@ module.exports = {
 //     admin.auth().setCustomUserClaims(uid, {
 //       ioadmin: true,
 //       "https://hasura.io/jwt/claims": {
-//         "x-hasura-default-role": "admin",
+//         "x-hasura-default-role": "debug",
 //         "x-hasura-allowed-roles": ["admin"],
 //         "x-hasura-user-id": uid,
 //       },

server/graphql-client/queries.js

@@ -2506,6 +2506,7 @@ exports.QUERY_TASK_BY_ID = `
 query QUERY_TASK_BY_ID($id: uuid!) {
   tasks_by_pk(id: $id) {
     id
+    created_by
     assigned_to_employee{
       id
       user_email

server/intellipay/intellipay.js

@@ -78,7 +78,7 @@ exports.lightbox_credentials = async (req, res) => {
 
     res.send(response.data);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
     logger.log("intellipay-lightbox-credentials-error", "ERROR", req.user?.email, null, {
       error: JSON.stringify(error)
     });
@@ -109,7 +109,7 @@ exports.payment_refund = async (req, res) => {
 
     res.send(response.data);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
     logger.log("intellipay-refund-error", "ERROR", req.user?.email, null, {
       error: JSON.stringify(error)
     });
@@ -143,7 +143,7 @@ exports.generate_payment_url = async (req, res) => {
 
     res.send(response.data);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
     logger.log("intellipay-payment-url-error", "ERROR", req.user?.email, null, {
       error: JSON.stringify(error)
     });

server/ioevent/ioevent.js

@@ -28,14 +28,14 @@ exports.default = async (req, res) => {
     //   }
     // });
 
-    ioRedis.to(getBodyshopRoom(bodyshopid)).emit("bodyshop-message", {
+    // ioRedis.to(getBodyshopRoom(bodyshopid)).emit("bodyshop-message", {
-      operationName,
+    //   operationName,
-      useremail
+    //   useremail
-    });
+    // });
 
     res.sendStatus(200);
   } catch (error) {
-    logger.log("ioevent-error", "trace", user, null, {
+    logger.log("ioevent-error", "silly", user, null, {
       operationname: operationName,
       time,
       dbevent,

server/job/job-costing.js

@@ -19,7 +19,8 @@ async function JobCosting(req, res) {
   const BearerToken = req.BearerToken;
   const client = req.userGraphQLClient;
 
-  logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
+  //Uncomment for further testing
+  // logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
 
   try {
     const resp = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_JOB_COSTING_DETAILS, {
@@ -46,7 +47,10 @@ async function JobCostingMulti(req, res) {
   const BearerToken = req.BearerToken;
   const client = req.userGraphQLClient;
 
-  logger.log("job-costing-multi-start", "DEBUG", req.user.email, jobids, null);
+  //Uncomment for further testing
+  // logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, {
+  //   jobids
+  // });
 
   try {
     const resp = await client
@@ -244,7 +248,8 @@ async function JobCostingMulti(req, res) {
       data: ret
     });
   } catch (error) {
-    logger.log("job-costing-multi-error", "ERROR", req.user.email, [jobids], {
+    logger.log("job-costing-multi-error", "ERROR", req?.user?.email, null, {
+      jobids,
       message: error.message,
       stack: error.stack
     });
@@ -282,7 +287,13 @@ function GenerateCostingData(job) {
         if (val.mod_lbr_ty) {
           const laborProfitCenter = val.profitcenter_labor || defaultProfits[val.mod_lbr_ty] || "Unknown";
 
-          if (laborProfitCenter === "Unknown") console.log("Unknown type", val.line_desc, val.mod_lbr_ty);
+          //Uncomment for further testing
+          // if (laborProfitCenter === "Unknown") {
+          //   logger.log("job-costing unknown type", "debug", null, null, {
+          //     line_desc: val.line_desc,
+          //     mod_lbr_ty: val.mod_lbr_ty
+          //   });
+          // }
 
           const rateName = `rate_${(val.mod_lbr_ty || "").toLowerCase()}`;
 
@@ -349,10 +360,22 @@ function GenerateCostingData(job) {
         if (val.part_type && val.part_type !== "PAE" && val.part_type !== "PAS" && val.part_type !== "PASL") {
           const partsProfitCenter = val.profitcenter_part || defaultProfits[val.part_type] || "Unknown";
 
-          if (partsProfitCenter === "Unknown") console.log("Unknown type", val.line_desc, val.part_type);
+          //Uncomment for further testing
+          // if (partsProfitCenter === "Unknown" || !partsProfitCenter) {
+          //   logger.log(
+          //     partsProfitCenter === "Unknown"
+          //       ? "job-costing unknown type"
+          //       : "Unknown cost/profit center mapping for parts.",
+          //     "debug",
+          //     null,
+          //     null,
+          //     {
+          //       line_desc: val.line_desc,
+          //       part_type: val.part_type
+          //     }
+          //   );
+          // }
 
-          if (!partsProfitCenter)
-            console.log("Unknown cost/profit center mapping for parts.", val.line_desc, val.part_type);
           let partsAmount = Dinero({
             amount: val.act_price_before_ppc
               ? Math.round(val.act_price_before_ppc * 100)
@@ -409,10 +432,22 @@ function GenerateCostingData(job) {
         if (val.part_type && val.part_type !== "PAE" && (val.part_type === "PAS" || val.part_type === "PASL")) {
           const partsProfitCenter = val.profitcenter_part || defaultProfits[val.part_type] || "Unknown";
 
-          if (partsProfitCenter === "Unknown") console.log("Unknown type", val.line_desc, val.part_type);
+          //Uncomment for further testing
+          // if (partsProfitCenter === "Unknown" || !partsProfitCenter) {
+          //   logger.log(
+          //     partsProfitCenter === "Unknown"
+          //       ? "job-costing unknown type"
+          //       : "job-costing Unknown cost/profit center mapping for sublet",
+          //     "debug",
+          //     null,
+          //     null,
+          //     {
+          //       line_desc: val.line_desc,
+          //       part_type: val.part_type
+          //     }
+          //   );
+          // }
 
-          if (!partsProfitCenter)
-            console.log("Unknown cost/profit center mapping for sublet.", val.line_desc, val.part_type);
           const partsAmount = Dinero({
             amount: Math.round((val.act_price || 0) * 100)
           })
@@ -443,9 +478,14 @@ function GenerateCostingData(job) {
           //If so, use it, otherwise try to use the same from the auto-allocate logic in IO app jobs-close-auto-allocate.
           const partsProfitCenter = val.profitcenter_part || getAdditionalCostCenter(val, defaultProfits) || "Unknown";
 
-          if (partsProfitCenter === "Unknown") {
+          //Uncomment for further testing
-            console.log("Unknown type", val.line_desc, val.part_type);
+          // if (partsProfitCenter === "Unknown") {
-          }
+          //   logger.log("job-costing unknown type", "debug", null, null, {
+          //     line_desc: val.line_desc,
+          //     part_type: val.part_type
+          //   });
+          // }
+
           const partsAmount = Dinero({
             amount: Math.round((val.act_price || 0) * 100)
           })
@@ -476,7 +516,7 @@ function GenerateCostingData(job) {
   if (!hasMapaLine) {
     if (!jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]])
       jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = Dinero();
-    
+
     jobLineTotalsByProfitCenter.additional[defaultProfits["MAPA"]] = jobLineTotalsByProfitCenter.additional[
       defaultProfits["MAPA"]
     ].add(

server/job/job-totals-USA.js

@@ -26,7 +26,7 @@ exports.totalsSsu = async function (req, res) {
   const BearerToken = req.BearerToken;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, id, null);
+  logger.log("job-totals-ssu-USA", "DEBUG", req?.user?.email, id);
 
   try {
     const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -47,7 +47,7 @@ exports.totalsSsu = async function (req, res) {
 
     res.status(200).send();
   } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, id, {
+    logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
       jobid: id,
       error
     });
@@ -84,12 +84,10 @@ async function Totals(req, res) {
   const logger = req.logger;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals-USA", "DEBUG", req.user.email, job.id, {
+  logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, job.id, {
     jobid: job.id
   });
 
-  logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, id, null);
-
   await AutoAddAtsIfRequired({ job, client });
 
   try {
@@ -866,8 +864,8 @@ function CalculateTaxesTotals(job, otherTotals) {
     }
   });
 
-  console.log("*** Taxable Amounts***");
+  // console.log("*** Taxable Amounts***");
-  console.table(JSON.parse(JSON.stringify(taxableAmounts)));
+  // console.table(JSON.parse(JSON.stringify(taxableAmounts)));
 
   //For the taxable amounts, figure out which tax type applies.
   //Then sum up the total of that tax type and then calculate the thresholds.
@@ -961,7 +959,9 @@ function CalculateTaxesTotals(job, otherTotals) {
         }
       }
     } catch (error) {
-      console.error("Key with issue", key);
+      logger.log("job-totals-USA Key with issue", "error", null, null, {
+        key
+      });
     }
   });
 
@@ -979,8 +979,8 @@ function CalculateTaxesTotals(job, otherTotals) {
   }
 
   const remainingTaxableAmounts = taxableAmountsByTier;
-  console.log("*** Taxable Amounts by Tier***");
+  // console.log("*** Taxable Amounts by Tier***");
-  console.table(JSON.parse(JSON.stringify(taxableAmountsByTier)));
+  // console.table(JSON.parse(JSON.stringify(taxableAmountsByTier)));
 
   Object.keys(taxableAmountsByTier).forEach((taxTierKey) => {
     try {
@@ -1026,12 +1026,14 @@ function CalculateTaxesTotals(job, otherTotals) {
         totalTaxByTier[taxTierKey] = totalTaxByTier[taxTierKey].add(taxAmountToAdd);
       }
     } catch (error) {
-      console.error("PFP Calculation error", error);
+      logger.log("job-totals-USA - PFP Calculation Error", "error", null, null, {
+        error
+      });
     }
   });
 
-  console.log("*** Total Tax by Tier Amounts***");
+  // console.log("*** Total Tax by Tier Amounts***");
-  console.table(JSON.parse(JSON.stringify(totalTaxByTier)));
+  // console.table(JSON.parse(JSON.stringify(totalTaxByTier)));
 
   stateTax = stateTax
     .add(totalTaxByTier.ty1Tax)

server/job/job-totals.js

@@ -182,7 +182,7 @@ async function AutoAddAtsIfRequired({ job, client }) {
       job.joblines[atsLineIndex].act_price = atsAmount;
     }
 
-    console.log(job.jobLines);
+    //console.log(job.jobLines);
   }
 }
 

server/job/job-updated.js

@@ -15,7 +15,7 @@ const jobUpdated = async (req, res) => {
     });
   }
 
-  logger.log("job-update", "INFO", req.user?.email, null, {
+  logger.log("job-update", "DEBUG", req.user?.email, null, {
     message: `Job updated event received from Hasura`,
     jobid: req?.body?.event?.data?.new?.id
   });

server/middleware/validateFirebaseIdTokenMiddleware.js

@@ -16,7 +16,11 @@ const validateFirebaseIdTokenMiddleware = async (req, res, next) => {
     (!req.headers.authorization || !req.headers.authorization.startsWith("Bearer ")) &&
     !(req.cookies && req.cookies.__session)
   ) {
-    console.error("Unauthorized attempt. No authorization provided.");
+    logger.log("api-authorization-call", "warn", req?.user?.email, null, {
+      type: "unauthorized",
+      path: req.path,
+      body: req.body
+    });
     return res.status(403).send("Unauthorized");
   }
 
@@ -32,10 +36,10 @@ const validateFirebaseIdTokenMiddleware = async (req, res, next) => {
     idToken = req.cookies.__session;
   } else {
     // No cookie
-    console.error("Unauthorized attempt. No cookie provided.");
+    logger.log("api-unauthorized-call", "warn", null, null, {
-    logger.log("api-unauthorized-call", "WARN", null, null, {
+      type: "unauthorized",
-      req,
+      path: req.path,
-      type: "no-cookie"
+      body: req.body
     });
 
     return res.status(403).send("Unauthorized");
@@ -47,11 +51,11 @@ const validateFirebaseIdTokenMiddleware = async (req, res, next) => {
     req.user = decodedIdToken;
     next();
   } catch (error) {
-    logger.log("api-unauthorized-call", "WARN", null, null, {
+    logger.log("api-unauthorized-call", "warn", null, null, {
       path: req.path,
       body: req.body,
 
-      type: "unauthroized",
+      type: "unauthorized",
       ...error
     });
 

server/mixdata/mixdata.js

@@ -9,11 +9,9 @@ require("dotenv").config({
 });
 
 exports.mixdataUpload = async (req, res) => {
-  const { bodyshopid } = req.body;
-
   const client = req.userGraphQLClient;
 
-  logger.log("job-mixdata-upload", "DEBUG", req.user.email, null, null);
+  logger.log("job-mixdata-upload", "DEBUG", req?.user?.email, null, null);
 
   try {
     for (const element of req.files) {
@@ -23,7 +21,7 @@ exports.mixdataUpload = async (req, res) => {
         explicitArray: false
       });
 
-      logger.log("job-mixdata-parse", "DEBUG", req.user.email, inboundRequest);
+      logger.log("job-mixdata-parse", "DEBUG", req?.user?.email, null, { inboundRequest });
 
       const ScaleType = DetermineScaleType(inboundRequest);
       const RoNumbersFromInboundRequest = GetListOfRos(inboundRequest, ScaleType);
@@ -70,7 +68,7 @@ function DetermineScaleType(inboundRequest) {
   const ret = { type: "", verson: 0 };
 
   //PPG Mix Data
-  if (inboundRequest.PPG && inboundRequest.PPG.Header.Protocol.Name === "PPG") {
+  if (inboundRequest?.PPG?.Header?.Protocol?.Name === "PPG") {
     return {
       type: inboundRequest.PPG.Header.Protocol.Name,
       company: "PPG",
@@ -80,13 +78,13 @@ function DetermineScaleType(inboundRequest) {
 }
 
 function GetListOfRos(inboundRequest, ScaleType) {
-  if (ScaleType.company === "PPG" && ScaleType.version === "1.3.0") {
+  if (ScaleType?.company === "PPG" && ScaleType?.version === "1.3.0") {
     return inboundRequest.PPG.MixDataInterface.ROData.RepairOrders.RO.map((r) => r.RONumber);
   }
 }
 
 function GenerateMixDataArray(inboundRequest, ScaleType, jobHash) {
-  if (ScaleType.company === "PPG" && ScaleType.version === "1.3.0") {
+  if (ScaleType?.company === "PPG" && ScaleType?.version === "1.3.0") {
     return inboundRequest.PPG.MixDataInterface.ROData.RepairOrders.RO.map((r) => {
       return {
         jobid: jobHash[r.RONumber]?.jobid,

server/opensearch/os-handler.js

@@ -148,7 +148,7 @@ async function OpenSearchUpdateHandler(req, res) {
       };
 
       const response = await osClient.index(payload);
-      console.log(response.body);
+      //console.log(response.body);
       res.status(200).json(response.body);
     }
   } catch (error) {
@@ -255,7 +255,7 @@ async function OpenSearchSearchHandler(req, res) {
 
     res.json(body);
   } catch (error) {
-    console.log(error);
+    //console.log(error);
     logger.log("os-search-error", "ERROR", req.user.email, null, {
       error: JSON.stringify(error)
     });

server/payroll/pay-all.js

@@ -45,12 +45,12 @@ exports.payall = async function (req, res) {
       const path = diffParser(diff);
 
       if (diff.op === "add") {
-        console.log(Object.keys(diff.val));
+        // console.log(Object.keys(diff.val));
         if (typeof diff.val === "object" && Object.keys(diff.val).length > 1) {
           //Multiple values to add.
           Object.keys(diff.val).forEach((key) => {
-            console.log("Hours", diff.val[key][Object.keys(diff.val[key])[0]]);
+            // console.log("Hours", diff.val[key][Object.keys(diff.val[key])[0]]);
-            console.log("Rate", Object.keys(diff.val[key])[0]);
+            // console.log("Rate", Object.keys(diff.val[key])[0]);
             ticketsToInsert.push({
               task_name: "Pay All",
               jobid: job.id,

server/render/canvas-handler.js

@@ -1,18 +1,19 @@
 const { createCanvas } = require("canvas");
 const Chart = require("chart.js/auto");
+const logger = require("../utils/logger");
 
 const { backgroundColors, borderColors } = require("./canvas-colors");
 const { isObject, defaultsDeep, isNumber } = require("lodash");
 
 exports.canvastest = function (req, res) {
-  console.log("Incoming test request.", req);
+  //console.log("Incoming test request.", req);
   res.status(200).send("OK");
 };
 
 exports.canvas = function (req, res) {
   const { w, h, values, keys, override } = req.body;
-  console.log("Incoming Canvas Request:", w, h, values, keys, override);
+  //console.log("Incoming Canvas Request:", w, h, values, keys, override);
-
+  logger.log("inbound-canvas-creation", "debug", "jsr", null, { w, h, values, keys, override });
   // Gate required values
   if (!values || !keys) {
     res.status(400).send("Missing required data");

server/scheduling/scheduling-job.js

@@ -49,7 +49,7 @@ exports.job = async (req, res) => {
       if (bucketId) {
         load.productionTotal[bucketId].count = load.productionTotal[bucketId].count + 1;
       } else {
-        console.log("Uh oh, this job doesn't fit in a bucket!", item);
+        // console.log("Uh oh, this job doesn't fit in a bucket!", item);
       }
     });
 
@@ -254,7 +254,7 @@ const CalculateLoad = (currentLoad, buckets, jobsIn, jobsOut) => {
     if (bucketId) {
       newLoad[bucketId].count = newLoad[bucketId].count + 1;
     } else {
-      console.log("[Util Arr Job]Uh oh, this job doesn't fit in a bucket!", job);
+      // console.log("[Util Arr Job]Uh oh, this job doesn't fit in a bucket!", job);
     }
   });
 
@@ -263,10 +263,10 @@ const CalculateLoad = (currentLoad, buckets, jobsIn, jobsOut) => {
     if (bucketId) {
       newLoad[bucketId].count = newLoad[bucketId].count - 1;
       if (newLoad[bucketId].count < 0) {
-        console.log("***ERROR: NEGATIVE LOAD Bucket =>", bucketId, job);
+        // console.log("***ERROR: NEGATIVE LOAD Bucket =>", bucketId, job);
       }
     } else {
-      console.log("[Util Out Job]Uh oh, this job doesn't fit in a bucket!", job);
+      // console.log("[Util Out Job]Uh oh, this job doesn't fit in a bucket!", job);
     }
   });
 

server/sms/receive.js

@@ -47,7 +47,7 @@ exports.receive = async (req, res) => {
         //Found a bodyshop - should always happen.
         if (response.bodyshops[0].conversations.length === 0) {
           //No conversation Found, create one.
-          console.log("[SMS Receive] No conversation found. Creating one.");
+          //console.log("[SMS Receive] No conversation found. Creating one.");
           newMessage.conversation = {
             data: {
               bodyshopid: response.bodyshops[0].id,
@@ -56,7 +56,7 @@ exports.receive = async (req, res) => {
           };
         } else if (response.bodyshops[0].conversations.length === 1) {
           //Just add it to the conversation
-          console.log("[SMS Receive] Conversation found. Added ID.");
+          //console.log("[SMS Receive] Conversation found. Added ID.");
           newMessage.conversationid = response.bodyshops[0].conversations[0].id;
         } else {
           //We should never get here.
@@ -123,7 +123,14 @@ exports.receive = async (req, res) => {
         }
       }
     } catch (e1) {
-      console.log("e1", e1);
+      logger.log("sms-inbound-error", "ERROR", "api", null, {
+        msid: req.body.SmsMessageSid,
+        text: req.body.Body,
+        image: !!req.body.MediaUrl0,
+        image_path: generateMediaArray(req.body),
+        messagingServiceSid: req.body.MessagingServiceSid,
+        error: e1
+      });
       res.sendStatus(500).json(e1);
     }
   }

server/stripe/payment.js

@@ -39,7 +39,7 @@ const processor = async (req, res) => {
         }
       });
   } catch (error) {
-    console.log("error", error);
+    // console.log("error", error);
     res.status(400).send(error);
   }
 };

server/tasks/tasks.js

@@ -6,10 +6,11 @@ const client = require("../graphql-client/graphql-client").client;
 const emailer = require("../email/sendemail");
 const moment = require("moment-timezone");
 const converter = require("json-2-csv");
+const logger = require("../utils/logger");
 
 exports.taskHandler = async (req, res) => {
   try {
-    const { bodyshopid, query, variables, text, to, subject, timezone } = req.body;
+    const { query, variables, text, to, subject, timezone } = req.body;
 
     //Check the variables to see if they are an object.
     Object.keys(variables).forEach((key) => {
@@ -32,8 +33,10 @@ exports.taskHandler = async (req, res) => {
         text,
         attachments: [{ filename: "query.csv", content: csv }]
       })
-      .catch((err) => {
+      .catch((error) => {
-        console.error("Errors sending CSV Email.");
+        logger.log("Tasks - Error sending CSV EMAIL", "error", req?.user?.email, null, {
+          error
+        });
       });
 
     return res.status(200).send(csv);

server/utils/logger.js

@@ -1,25 +1,139 @@
-const graylog2 = require("graylog2");
+// Load environment variables THIS MUST BE AT THE TOP
-
+const path = require("path");
-const logger = new graylog2.graylog({
+require("dotenv").config({
-  servers: [{ host: "logs.bodyshop.app", port: 12201 }]
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 
-function log(message, type, user, record, object) {
+const InstanceManager = require("../utils/instanceMgr").default;
-  if (type !== "ioevent")
+const winston = require("winston");
-    console.log(message, {
+const WinstonCloudWatch = require("winston-cloudwatch");
-      type,
+const { isString, isEmpty } = require("lodash");
-      env: process.env.NODE_ENV || "development",
+const { networkInterfaces, hostname } = require("node:os");
-      user,
-      record,
-      ...object
-    });
-  logger.log(message, message, {
-    type,
-    env: process.env.NODE_ENV || "development",
-    user,
-    record,
-    ...object
-  });
-}
 
-module.exports = { log };
+const createLogger = () => {
+  try {
+    const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
+    const logGroupName = isLocal ? "development" : process.env.CLOUDWATCH_LOG_GROUP;
+
+    const winstonCloudwatchTransportDefaults = {
+      logGroupName: logGroupName,
+      awsOptions: {
+        region: InstanceManager({
+          imex: "ca-central-1",
+          rome: "us-east-2"
+        })
+      },
+      jsonMessage: true
+    };
+
+    if (isLocal) {
+      winstonCloudwatchTransportDefaults.awsOptions.endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:4566`;
+    }
+
+    const levelFilter = (levels) => {
+      return winston.format((info) => {
+        if (Array.isArray(levels)) {
+          return levels.includes(info.level) ? info : false;
+        } else {
+          return info.level === levels ? info : false;
+        }
+      })();
+    };
+
+    const getHostNameOrIP = () => {
+      // Try to get the hostname first
+      const hostName = hostname();
+      if (hostName) return hostName;
+
+      const interfaces = networkInterfaces();
+      for (const name of Object.keys(interfaces)) {
+        for (const iface of interfaces[name]) {
+          if (iface.family === "IPv4" && !iface.internal) {
+            return iface.address;
+          }
+        }
+      }
+
+      return "127.0.0.1";
+    };
+    const createProductionTransport = (level, logStreamName, filters) => {
+      return new WinstonCloudWatch({
+        level,
+        logStreamName: logStreamName || level,
+        format: levelFilter(filters || level),
+        ...winstonCloudwatchTransportDefaults
+      });
+    };
+
+    const internalHostname = process.env.HOSTNAME || getHostNameOrIP();
+
+    const getDevelopmentTransports = () => [
+      new winston.transports.Console({
+        level: "silly",
+        format: winston.format.combine(
+          winston.format.colorize(),
+          winston.format.timestamp(),
+          winston.format.printf(({ level, message, timestamp, user, record, meta }) => {
+            const hostnameColor = `\x1b[34m${internalHostname}\x1b[0m`; // Blue
+            const timestampColor = `\x1b[36m${timestamp}\x1b[0m`; // Cyan
+            const labelColor = "\x1b[33m"; // Yellow
+            const separatorColor = "\x1b[35m|\x1b[0m"; // Magenta for separators
+
+            return `${timestampColor} [${hostnameColor}] [${level}]: ${message} ${
+              user ? `${separatorColor} ${labelColor}user:\x1b[0m ${JSON.stringify(user)}` : ""
+            } ${record ? `${separatorColor} ${labelColor}record:\x1b[0m ${JSON.stringify(record)}` : ""}${
+              meta
+                ? `\n${separatorColor} ${labelColor}meta:\x1b[0m ${JSON.stringify(meta, null, 2)} ${separatorColor}`
+                : ""
+            }`;
+          })
+        )
+      })
+    ];
+
+    const getProductionTransports = () => [
+      createProductionTransport("error"),
+      createProductionTransport("warn"),
+      createProductionTransport("info"),
+      createProductionTransport("silly", "debug", ["http", "verbose", "debug", "silly"])
+    ];
+
+    const winstonLogger = winston.createLogger({
+      format: winston.format.json(),
+      transports:
+        process.env.NODE_ENV === "production"
+          ? getProductionTransports()
+          : [...getDevelopmentTransports(), ...getProductionTransports()]
+    });
+
+    if (isLocal) {
+      winstonLogger.debug(
+        `CloudWatch set to LocalStack end point: ${winstonCloudwatchTransportDefaults.awsOptions.endpoint}`
+      );
+    }
+
+    const log = (message, type, user, record, meta) => {
+      winstonLogger.log({
+        level: type.toLowerCase(),
+        message,
+        user,
+        record,
+        hostname: internalHostname,
+        meta
+      });
+    };
+
+    return {
+      log,
+      logger: winstonLogger
+    };
+  } catch (e) {
+    console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || "");
+    return {
+      log: console.log,
+      logger: console.log
+    };
+  }
+};
+
+module.exports = createLogger();

server/web-sockets/redisSocketEvents.js

@@ -8,7 +8,6 @@ const redisSocketEvents = ({
 }) => {
   // Logging helper functions
   const createLogEvent = (socket, level, message) => {
-    console.log(`[IOREDIS LOG EVENT] - ${socket?.user?.email} - ${socket.id} - ${message}`);
     logger.log("ioredis-log-event", level, socket?.user?.email, null, { wsmessage: message });
   };
 
@@ -33,7 +32,6 @@ const redisSocketEvents = ({
         next(new Error("Authentication error - no authorization token."));
       }
     } catch (error) {
-      console.log("Uncaught connection error:::", error);
       logger.log("websocket-connection-error", "error", null, null, {
         ...error
       });
@@ -43,7 +41,8 @@ const redisSocketEvents = ({
 
   // Register Socket Events
   const registerSocketEvents = (socket) => {
-    createLogEvent(socket, "DEBUG", `Registering RedisIO Socket Events.`);
+    // Uncomment for further testing
+    // createLogEvent(socket, "debug", `Registering RedisIO Socket Events.`);
 
     // Token Update Events
     const registerUpdateEvents = (socket) => {
@@ -56,18 +55,19 @@ const redisSocketEvents = ({
           // If We ever want to persist user Data across workers
           // await setSessionData(socket.id, "user", user);
 
-          createLogEvent(socket, "INFO", "Token updated successfully");
+          // Uncomment for further testing
+          // createLogEvent(socket, "debug", "Token updated successfully");
 
           socket.emit("token-updated", { success: true });
         } catch (error) {
           if (error.code === "auth/id-token-expired") {
-            createLogEvent(socket, "WARNING", "Stale token received, waiting for new token");
+            createLogEvent(socket, "warn", "Stale token received, waiting for new token");
             socket.emit("token-updated", {
               success: false,
               error: "Stale token."
             });
           } else {
-            createLogEvent(socket, "ERROR", `Token update failed: ${error.message}`);
+            createLogEvent(socket, "error", `Token update failed: ${error.message}`);
             socket.emit("token-updated", { success: false, error: error.message });
             // For any other errors, optionally disconnect the socket
             socket.disconnect();
@@ -82,9 +82,9 @@ const redisSocketEvents = ({
         try {
           const room = getBodyshopRoom(bodyshopUUID);
           socket.join(room);
-          createLogEvent(socket, "DEBUG", `Client joined bodyshop room: ${room}`);
+          // createLogEvent(socket, "debug", `Client joined bodyshop room: ${room}`);
         } catch (error) {
-          createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
+          createLogEvent(socket, "error", `Error joining room: ${error}`);
         }
       };
 
@@ -92,9 +92,9 @@ const redisSocketEvents = ({
         try {
           const room = getBodyshopRoom(bodyshopUUID);
           socket.leave(room);
-          createLogEvent(socket, "DEBUG", `Client left bodyshop room: ${room}`);
+          createLogEvent(socket, "debug", `Client left bodyshop room: ${room}`);
         } catch (error) {
-          createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
+          createLogEvent(socket, "error", `Error joining room: ${error}`);
         }
       };
 
@@ -102,9 +102,10 @@ const redisSocketEvents = ({
         try {
           const room = getBodyshopRoom(bodyshopUUID);
           io.to(room).emit("bodyshop-message", message);
-          createLogEvent(socket, "DEBUG", `Broadcast message to bodyshop ${room}`);
+          // We do not need this as these can be debugged live
+          // createLogEvent(socket, "debug", `Broadcast message to bodyshop ${room}`);
         } catch (error) {
-          createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
+          createLogEvent(socket, "error", `Error getting room: ${error}`);
         }
       };
 
@@ -115,7 +116,9 @@ const redisSocketEvents = ({
     // Disconnect Events
     const registerDisconnectEvents = (socket) => {
       const disconnect = () => {
-        createLogEvent(socket, "DEBUG", `User disconnected.`);
+        // Uncomment for further testing
+        // createLogEvent(socket, "debug", `User disconnected.`);
+
         const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
         for (const room of rooms) {
           socket.leave(room);

server/web-sockets/web-socket.js

@@ -31,7 +31,7 @@ io.use(function (socket, next) {
       next(new Error("Authentication error - no authorization token."));
     }
   } catch (error) {
-    console.log("Uncaught connection error:::", error);
+    //console.log("Uncaught connection error:::", error);
     logger.log("websocket-connection-error", "error", null, null, {
       token: socket.handshake.auth.token,
       ...error
@@ -41,7 +41,7 @@ io.use(function (socket, next) {
 });
 
 io.on("connection", (socket) => {
-  socket.log_level = "TRACE";
+  socket.log_level = "DEBUG";
   createLogEvent(socket, "DEBUG", `Connected and Authenticated.`);
 
   socket.on("set-log-level", (level) => {
@@ -75,7 +75,7 @@ io.on("connection", (socket) => {
   socket.on("cdk-calculate-allocations", async (jobid, callback) => {
     const allocations = await CdkCalculateAllocations(socket, jobid);
     createLogEvent(socket, "DEBUG", `Allocations calculated.`);
-    createLogEvent(socket, "TRACE", `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`);
+    createLogEvent(socket, "SILLY", `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`);
 
     callback(allocations);
   });
@@ -85,7 +85,7 @@ io.on("connection", (socket) => {
   socket.on("pbs-calculate-allocations", async (jobid, callback) => {
     const allocations = await CdkCalculateAllocations(socket, jobid);
     createLogEvent(socket, "DEBUG", `Allocations calculated.`);
-    createLogEvent(socket, "TRACE", `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`);
+    createLogEvent(socket, "SILLY", `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`);
 
     callback(allocations);
   });
@@ -103,7 +103,7 @@ io.on("connection", (socket) => {
   socket.on("pbs-calculate-allocations-ap", async (billids, callback) => {
     const allocations = await PbsCalculateAllocationsAp(socket, billids);
     createLogEvent(socket, "DEBUG", `AP Allocations calculated.`);
-    createLogEvent(socket, "TRACE", `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`);
+    createLogEvent(socket, "DEBUG", `Allocations calculated. ${JSON.stringify(allocations, null, 2)}`);
     socket.apAllocations = allocations;
     callback(allocations);
   });
@@ -122,7 +122,7 @@ io.on("connection", (socket) => {
 
 function createLogEvent(socket, level, message) {
   if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
-    console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
+    // console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
     socket.emit("log-event", {
       timestamp: new Date(),
       level,
@@ -148,7 +148,7 @@ function createLogEvent(socket, level, message) {
 
 function createJsonEvent(socket, level, message, json) {
   if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy(level)) {
-    console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
+    //console.log(`[WS LOG EVENT] ${level} - ${new Date()} - ${socket.user.email} - ${socket.id} - ${message}`);
     socket.emit("log-event", {
       timestamp: new Date(),
       level,
@@ -173,17 +173,17 @@ function createJsonEvent(socket, level, message, json) {
 }
 
 function createXmlEvent(socket, xml, message, isError = false) {
-  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy("TRACE")) {
+  if (LogLevelHierarchy(socket.log_level) >= LogLevelHierarchy("SILLY")) {
     socket.emit("log-event", {
       timestamp: new Date(),
-      level: isError ? "ERROR" : "TRACE",
+      level: isError ? "ERROR" : "SILLY",
       message: `${message}: ${xml}`
     });
   }
 
   logger.log(
     isError ? "ws-log-event-xml-error" : "ws-log-event-xml",
-    isError ? "ERROR" : "TRACE",
+    isError ? "ERROR" : "SILLY",
     socket.user.email,
     socket.recordid,
     {
@@ -195,7 +195,7 @@ function createXmlEvent(socket, xml, message, isError = false) {
   if (socket.logEvents && isArray(socket.logEvents)) {
     socket.logEvents.push({
       timestamp: new Date(),
-      level: isError ? "ERROR" : "TRACE",
+      level: isError ? "ERROR" : "SILLY",
       message,
       xml
     });
@@ -206,7 +206,7 @@ function LogLevelHierarchy(level) {
   switch (level) {
     case "XML":
       return 5;
-    case "TRACE":
+    case "SILLY":
       return 5;
     case "DEBUG":
       return 4;