IO-3059 Kaizen Datapump Additional Shop

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

.platform/hooks/predeploy/01-install-dd.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+DD_API_KEY=58d91898a70c6fd659f6eea768a57976 DD_SITE="us3.datadoghq.com" bash -c "$(curl -L https://install.datadoghq.com/scripts/install_script_agent7.sh)"
+
+echo "Datadog agent installed."

Dockerfile

@@ -7,7 +7,6 @@ RUN dnf install -y git \
     && dnf install -y nodejs \
     && dnf clean all
 
-
 # Install dependencies required by node-canvas
 RUN dnf install -y \
     gcc \
@@ -19,9 +18,22 @@ RUN dnf install -y \
     libpng-devel \
     make \
     python3 \
+    fontconfig \
+    freetype \
     python3-pip \
+    wget \
+    unzip \
     && dnf clean all
 
+# Install Montserrat fonts
+RUN cd /tmp \
+    && wget https://images.imex.online/fonts/montserrat.zip -O montserrat.zip \
+    && unzip montserrat.zip -d montserrat \
+    && mv montserrat/montserrat/*.ttf /usr/share/fonts \
+    && fc-cache -fv \
+    && rm -rf /tmp/montserrat /tmp/montserrat.zip \
+    && echo "Montserrat fonts installed and cached successfully."
+
 # Set the working directory
 WORKDIR /app
 

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -334,29 +334,75 @@ export const registerMessagingHandlers = ({ socket, client }) => {
           break;
 
         case "tag-added":
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              job_conversations: (existing = []) => [...existing, ...job_conversations]
+          // Ensure `job_conversations` is properly formatted
+          const formattedJobConversations = job_conversations.map((jc) => ({
+            __typename: "job_conversations",
+            jobid: jc.jobid || jc.job?.id,
+            conversationid: conversationId,
+            job: jc.job || {
+              __typename: "jobs",
+              id: data.selectedJob.id,
+              ro_number: data.selectedJob.ro_number,
+              ownr_co_nm: data.selectedJob.ownr_co_nm,
+              ownr_fn: data.selectedJob.ownr_fn,
+              ownr_ln: data.selectedJob.ownr_ln
             }
-          });
-          break;
+          }));
 
-        case "tag-removed":
           client.cache.modify({
             id: client.cache.identify({ __typename: "conversations", id: conversationId }),
             fields: {
-              job_conversations: (existing = [], { readField }) => {
-                return existing.filter((jobRef) => {
-                  // Read the `jobid` field safely, even if the structure is normalized
-                  const jobId = readField("jobid", jobRef);
-                  return jobId !== fields.jobId;
+              job_conversations: (existing = []) => {
+                // Ensure no duplicates based on both `conversationid` and `jobid`
+                const existingLinks = new Set(
+                  existing.map((jc) => {
+                    const jobId = client.cache.readFragment({
+                      id: client.cache.identify(jc),
+                      fragment: gql`
+                        fragment JobConversationLinkAdded on job_conversations {
+                          jobid
+                          conversationid
+                        }
+                      `
+                    })?.jobid;
+                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
+                  })
+                );
+
+                const newItems = formattedJobConversations.filter((jc) => {
+                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
+                  return !existingLinks.has(uniqueLink);
                 });
+
+                return [...existing, ...newItems];
               }
             }
           });
+
           break;
 
+        case "tag-removed":
+          try {
+            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
+
+            // Evict the specific cache entry for job_conversations
+            client.cache.evict({
+              id: conversationCacheId,
+              fieldName: "job_conversations"
+            });
+
+            // Garbage collect evicted entries
+            client.cache.gc();
+
+            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
+              conversationId,
+              type
+            });
+          } catch (error) {
+            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
+          }
+
+          break;
         default:
           logLocal("handleConversationChanged - Unhandled type", { type });
           client.cache.modify({

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Virtuoso } from "react-virtuoso";
 import { renderMessage } from "./renderMessage";
 import "./chat-message-list.styles.scss";
@@ -16,7 +16,7 @@ export default function ChatMessageListComponent({ messages }) {
     loadedImagesRef.current = 0;
   };
 
-  const preloadImages = (imagePaths, onComplete) => {
+  const preloadImages = useCallback((imagePaths, onComplete) => {
     resetImageLoadState();
 
     if (imagePaths.length === 0) {
@@ -34,7 +34,7 @@ export default function ChatMessageListComponent({ messages }) {
         }
       };
     });
-  };
+  }, []);
 
   // Ensure all images are loaded on initial render
   useEffect(() => {
@@ -51,7 +51,7 @@ export default function ChatMessageListComponent({ messages }) {
         });
       }
     });
-  }, [messages]);
+  }, [messages, preloadImages]);
 
   // Handle scrolling when new messages are added
   useEffect(() => {
@@ -69,7 +69,7 @@ export default function ChatMessageListComponent({ messages }) {
         });
       }
     });
-  }, [messages, atBottom]);
+  }, [messages, atBottom, preloadImages]);
 
   return (
     <div className="chat">

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,11 +1,11 @@
 import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
-import { useApolloClient, useLazyQuery } from "@apollo/client";
+import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
 import React, { useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { CONVERSATION_LIST_QUERY } from "../../graphql/conversations.queries";
+import { CONVERSATION_LIST_QUERY, UNREAD_CONVERSATION_COUNT } from "../../graphql/conversations.queries";
 import { toggleChatVisible } from "../../redux/messaging/messaging.actions";
 import { selectChatVisible, selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import ChatConversationListComponent from "../chat-conversation-list/chat-conversation-list.component";
@@ -38,6 +38,14 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
     ...(pollInterval > 0 ? { pollInterval } : {})
   });
 
+  // Query for unread count when chat is not visible
+  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    skip: chatVisible, // Skip when chat is visible
+    ...(pollInterval > 0 ? { pollInterval } : {})
+  });
+
   // Socket connection status
   useEffect(() => {
     const handleSocketStatus = () => {
@@ -77,23 +85,29 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
 
   // Get unread count from the cache
   const unreadCount = (() => {
-    try {
-      const cachedData = client.readQuery({
-        query: CONVERSATION_LIST_QUERY,
-        variables: { offset: 0 }
-      });
+    if (chatVisible) {
+      try {
+        const cachedData = client.readQuery({
+          query: CONVERSATION_LIST_QUERY,
+          variables: { offset: 0 }
+        });
 
-      if (!cachedData?.conversations) return 0;
+        if (!cachedData?.conversations) return 0;
 
-      // Aggregate unread message count
-      return cachedData.conversations.reduce((total, conversation) => {
-        const unread = conversation.messages_aggregate?.aggregate?.count || 0;
-        return total + unread;
-      }, 0);
-    } catch (error) {
-      console.warn("Unread count not found in cache:", error);
-      return 0; // Fallback if not in cache
+        // Aggregate unread message count
+        return cachedData.conversations.reduce((total, conversation) => {
+          const unread = conversation.messages_aggregate?.aggregate?.count || 0;
+          return total + unread;
+        }, 0);
+      } catch (error) {
+        console.warn("Unread count not found in cache:", error);
+        return 0; // Fallback if not in cache
+      }
+    } else if (unreadData?.messages_aggregate?.aggregate?.count) {
+      // Use the unread count from the query result
+      return unreadData.messages_aggregate.aggregate.count;
     }
+    return 0;
   })();
 
   return (

client/src/components/chat-tag-ro/chat-tag-ro.container.jsx

@@ -52,20 +52,26 @@ export function ChatTagRoContainer({ conversation, bodyshop }) {
       // Find the job details from the search data
       const selectedJob = data?.search_jobs.find((job) => job.id === option.key);
       if (!selectedJob) return;
-      const newJobConversation = {
-        __typename: "job_conversations",
-        jobid: selectedJob.id,
-        conversationid: conversation.id,
-        job: {
-          __typename: "jobs",
-          ...selectedJob
-        }
-      };
       socket.emit("conversation-modified", {
         conversationId: conversation.id,
         bodyshopId: bodyshop.id,
         type: "tag-added",
-        job_conversations: [newJobConversation]
+        selectedJob,
+        job_conversations: [
+          {
+            __typename: "job_conversations",
+            jobid: selectedJob.id,
+            conversationid: conversation.id,
+            job: {
+              __typename: "jobs",
+              id: selectedJob.id,
+              ro_number: selectedJob.ro_number,
+              ownr_co_nm: selectedJob.ownr_co_nm,
+              ownr_fn: selectedJob.ownr_fn,
+              ownr_ln: selectedJob.ownr_ln
+            }
+          }
+        ]
       });
     }
 

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

@@ -1,6 +1,6 @@
 import { gql, useApolloClient, useLazyQuery, useMutation, useQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Col, Row, notification } from "antd";
+import { Col, Row, notification } from "antd"; //import { Button, Col, Row, notification } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
@@ -408,8 +408,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
         updateSchComp={updateSchComp}
         setSchComp={setSchComp}
       />
-      {
-        {/* currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
+      {/* {
+        currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
         <Button
           onClick={async () => {
             for (const record of data.available_jobs) {
@@ -425,8 +425,8 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
         >
           Add all jobs as new.
         </Button>
-      ) : null */}
-      }
+      ) : null
+      } */}
       <Row gutter={[16, 16]}>
         <Col span={24}>
           <JobsAvailableTableComponent

client/src/components/owner-detail-form/owner-detail-form.component.jsx

@@ -25,6 +25,9 @@ export default function OwnerDetailFormComponent({ form, loading }) {
         <Form.Item label={t("owners.fields.ownr_co_nm")} name="ownr_co_nm">
           <Input />
         </Form.Item>
+        <Form.Item label={t("owners.fields.accountingid")} name="accountingid">
+          <Input disabled/>
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("owners.forms.address")}>
         <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -283,7 +283,12 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                     },
                     {
                       validator: (_, value) => {
-                        if (value && value[0] && value[1] && process.env.NODE_ENV === "production") {
+                        if (
+                          (!import.meta.env.VITE_APP_IS_TEST && import.meta.env.PROD) &&
+                          value &&
+                          value[0] &&
+                          value[1]
+                        ) {
                           const diffInDays = (value[1] - value[0]) / (1000 * 3600 * 24);
                           if (diffInDays > 92) {
                             return Promise.reject(t("general.validation.dateRangeExceeded"));

client/src/graphql/owners.queries.js

@@ -48,6 +48,7 @@ export const QUERY_OWNER_BY_ID = gql`
   query QUERY_OWNER_BY_ID($id: uuid!) {
     owners_by_pk(id: $id) {
       id
+      accountingid
       allow_text_message
       ownr_addr1
       ownr_addr2

client/src/translations/en_us/common.json

@@ -2394,6 +2394,7 @@
         "selectexistingornew": "Select an existing owner record or create a new one. "
       },
       "fields": {
+        "accountingid": "Accounting ID",
         "address": "Address",
         "allow_text_message": "Permission to Text?",
         "name": "Name",
@@ -3057,6 +3058,7 @@
         "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_excel": "Purchase & Return Ratio - Excel",
         "purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
         "purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",
         "purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
@@ -3082,6 +3084,7 @@
         "timetickets": "Time Tickets",
         "timetickets_employee": "Employee Time Tickets",
         "timetickets_summary": "Time Tickets Summary",
+        "total_loss_jobs": "Jobs Marked as Total Loss",
         "unclaimed_hrs": "Unflagged Hours",
         "void_ros": "Void ROs",
         "work_in_progress_committed_labour": "Work in Progress - Committed Labor",

client/src/translations/es/common.json

@@ -2394,6 +2394,7 @@
         "selectexistingornew": ""
       },
       "fields": {
+        "accountingid": "",
         "address": "Dirección",
         "allow_text_message": "Permiso de texto?",
         "name": "Nombre",
@@ -3057,6 +3058,7 @@
         "production_not_production_status": "",
         "production_over_time": "",
         "psr_by_make": "",
+        "purchase_return_ratio_excel": "",
         "purchase_return_ratio_grouped_by_vendor_detail": "",
         "purchase_return_ratio_grouped_by_vendor_summary": "",
         "purchases_by_cost_center_detail": "",
@@ -3082,6 +3084,7 @@
         "timetickets": "",
         "timetickets_employee": "",
         "timetickets_summary": "",
+        "total_loss_jobs": "",
         "unclaimed_hrs": "",
         "void_ros": "",
         "work_in_progress_committed_labour": "",

client/src/translations/fr/common.json

@@ -2394,6 +2394,7 @@
         "selectexistingornew": ""
       },
       "fields": {
+        "accountingid": "",
         "address": "Adresse",
         "allow_text_message": "Autorisation de texte?",
         "name": "Prénom",
@@ -3057,6 +3058,7 @@
         "production_not_production_status": "",
         "production_over_time": "",
         "psr_by_make": "",
+        "purchase_return_ratio_excel": "",
         "purchase_return_ratio_grouped_by_vendor_detail": "",
         "purchase_return_ratio_grouped_by_vendor_summary": "",
         "purchases_by_cost_center_detail": "",
@@ -3082,6 +3084,7 @@
         "timetickets": "",
         "timetickets_employee": "",
         "timetickets_summary": "",
+        "total_loss_jobs": "",
         "unclaimed_hrs": "",
         "void_ros": "",
         "work_in_progress_committed_labour": "",

client/src/utils/GraphQLClient.js

@@ -3,7 +3,7 @@ import { setContext } from "@apollo/client/link/context";
 import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
 import { RetryLink } from "@apollo/client/link/retry";
 import { WebSocketLink } from "@apollo/client/link/ws";
-import { getMainDefinition, offsetLimitPagination } from "@apollo/client/utilities";
+import { getMainDefinition } from "@apollo/client/utilities";
 //import { split } from "apollo-link";
 import apolloLogger from "apollo-link-logger";
 //import axios from "axios";
@@ -143,36 +143,7 @@ middlewares.push(
   new SentryLink().concat(roundTripLink.concat(retryLink.concat(errorLink.concat(authLink.concat(link)))))
 );
 
-const cache = new InMemoryCache({
-  typePolicies: {
-    conversations: {
-      fields: {
-        job_conversations: {
-          merge(existing = [], incoming = [], { readField }) {
-            const merged = new Map();
-
-            // Add existing data to the map
-            existing.forEach((jobConversation) => {
-              // Use `readField` to get the unique `jobid`, fallback to `__ref`
-              const jobId = readField("jobid", jobConversation) || jobConversation.__ref;
-              if (jobId) merged.set(jobId, jobConversation);
-            });
-
-            // Add or replace with incoming data
-            incoming.forEach((jobConversation) => {
-              // Use `readField` to get the unique `jobid`, fallback to `__ref`
-              const jobId = readField("jobid", jobConversation) || jobConversation.__ref;
-              if (jobId) merged.set(jobId, jobConversation);
-            });
-
-            // Return the merged data as an array
-            return Array.from(merged.values());
-          }
-        }
-      }
-    }
-  }
-});
+const cache = new InMemoryCache({});
 const client = new ApolloClient({
   link: ApolloLink.from(middlewares),
   cache,

client/src/utils/TemplateConstants.js

@@ -2184,6 +2184,30 @@ export const TemplateList = (type, context) => {
             },
             group: "payroll",
             adp_payroll: true
+          },
+          purchase_return_ratio_excel: {
+            title: i18n.t("reportcenter.templates.purchase_return_ratio_excel"),
+            subject: i18n.t("reportcenter.templates.purchase_return_ratio_excel"),
+            key: "purchase_return_ratio_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date")
+            },
+            group: "purchases"
+          },
+          total_loss_jobs: {
+            title: i18n.t("reportcenter.templates.total_loss_jobs"),
+            subject: i18n.t("reportcenter.templates.total_loss_jobs"),
+            key: "total_loss_jobs",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs"
           }
         }
       : {}),

package.json

@@ -41,6 +41,7 @@
     "cors": "2.8.5",
     "crisp-status-reporter": "^1.2.2",
     "csrf": "^3.1.0",
+    "dd-trace": "^5.28.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
@@ -51,6 +52,7 @@
     "intuit-oauth": "^4.1.3",
     "ioredis": "^5.4.1",
     "json-2-csv": "^5.5.6",
+    "juice": "^11.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.46",
@@ -62,6 +64,7 @@
     "recursive-diff": "^1.0.9",
     "redis": "^4.7.0",
     "rimraf": "^6.0.1",
+    "skia-canvas": "^2.0.0",
     "soap": "^1.1.6",
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",

server.js

@@ -4,6 +4,14 @@ require("dotenv").config({
   path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 
+if (process.env.NODE_ENV) {
+  const tracer = require("dd-trace").init({
+    profiling: true,
+    env: process.env.NODE_ENV,
+    service: "bodyshop-api"
+  });
+}
+
 const cors = require("cors");
 const http = require("http");
 const Redis = require("ioredis");

server/accounting/qbo/qbo-receivables.js

@@ -328,6 +328,7 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       PostalCode: job.ownr_zip,
       CountrySubDivisionCode: job.ownr_st
     },
+    ...(job.ownr_ea ? { PrimaryEmailAddr: { Address: job.ownr_ea.trim() } } : {}),
     ...(isThreeTier
       ? {
           Job: true,
@@ -395,7 +396,7 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
       PostalCode: job.ownr_zip,
       CountrySubDivisionCode: job.ownr_st
     },
-
+    ...(job.ownr_ea ? { PrimaryEmailAddr: { Address: job.ownr_ea.trim() } } : {}),
     Job: true,
     ParentRef: {
       value: parentTierRef.Id
@@ -556,7 +557,8 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
       Line3: `${job.ownr_city || ""}, ${job.ownr_st || ""} ${job.ownr_zip || ""}`.trim(),
       Line2: job.ownr_addr1 || "",
       Line1: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`
-    }
+    },
+    ...(job.ownr_ea ? { BillEmail: { Address: job.ownr_ea.trim() } } : {})
   };
 
   logger.log("qbo-receivable-objectlog", "DEBUG", req.user.email, job.id, {
@@ -673,7 +675,8 @@ async function InsertInvoiceMultiPayerInvoice(
       Line3: `${job.ownr_city || ""}, ${job.ownr_st || ""} ${job.ownr_zip || ""}`.trim(),
       Line2: job.ownr_addr1 || "",
       Line1: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`
-    }
+    },
+    ...(job.ownr_ea ? { BillEmail: { Address: job.ownr_ea.trim() } } : {})
   };
 
   logger.log("qbo-receivable-objectlog", "DEBUG", req.user.email, job.id, {

server/data/kaizen.js

@@ -16,7 +16,7 @@ const { sendServerEmail } = require("../email/sendemail");
 const DineroFormat = "0,0.00";
 const DateFormat = "MM/DD/YYYY";
 
-const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];
+const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW", "DEERFOOT"];
 
 const ftpSetup = {
   host: process.env.KAIZEN_HOST,

server/intellipay/intellipay.js

@@ -14,7 +14,7 @@ require("dotenv").config({
   path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 
-const domain = process.env.NODE_ENV ? "secure" : "secure";
+const domain = process.env.NODE_ENV ? "secure" : "test";
 
 const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
 const { InstanceRegion } = require("../utils/instanceMgr");

server/job/job-costing.js

@@ -857,8 +857,8 @@ function GenerateCostingData(job) {
     summaryData.totalSales = summaryData.totalSales.add(Adjustment);
     //Add to lines.
     costCenterData.push({
-      id: "Adj",
-      cost_center: "Adjustment",
+      id: "AdjEst",
+      cost_center: "Adjustment (Est. Match)",
       sale_labor: Dinero().toFormat(),
       sale_labor_dinero: Dinero(),
       sale_parts: Dinero().toFormat(),

server/job/job-totals-USA.js

@@ -73,7 +73,16 @@ async function TotalsServerSide(req, res) {
       job.cieca_ttl.data.n_ttl_amt === job.cieca_ttl.data.g_ttl_amt //It looks like sometimes, gross and net are the same, but they shouldn't be.
         ? job.cieca_ttl.data.n_ttl_amt - job.cieca_ttl.data.g_tax
         : job.cieca_ttl.data.g_ttl_amt - job.cieca_ttl.data.g_tax; //If they are, adjust the gross total down by the tax amount.
-    const ttlDifference = emsTotal - ret.totals.subtotal.getAmount() / 100;
+    const ttlDifference =
+      emsTotal -
+      ret.totals.subtotal
+        .add(
+          Dinero({
+            amount: Math.round((job.adjustment_bottom_line || 0) * 100)
+          }).multiply(-1) //Add back in the adjustment to the subtotal. We don't want to scrub it twice.
+        )
+        .getAmount() /
+        100;
 
     if (Math.abs(ttlDifference) > 0.0) {
       //If difference is greater than a pennny, we need to adjust it.

server/middleware/validateCanvasInputMiddleware.js

@@ -0,0 +1,32 @@
+const { isObject } = require("lodash");
+
+const validateCanvasInputMiddleware = (req, res, next) => {
+  const { values, keys, override, w, h } = req.body;
+
+  if (!Array.isArray(values) || !Array.isArray(keys)) {
+    return res.status(400).send("Invalid input: 'values' and 'keys' must be arrays.");
+  }
+
+  if (values.some((value) => typeof value !== "number")) {
+    return res.status(400).send("Invalid input: 'values' must be an array of numbers.");
+  }
+
+  if (keys.some((key) => typeof key !== "string")) {
+    return res.status(400).send("Invalid input: 'keys' must be an array of strings.");
+  }
+
+  if (override && !isObject(override)) {
+    return res.status(400).send("Override must be an object");
+  }
+
+  if (w && (!Number.isFinite(w) || w <= 0)) {
+    return res.status(400).send("Width must be a positive number");
+  }
+  if (h && (!Number.isFinite(h) || h <= 0)) {
+    return res.status(400).send("Height must be a positive number");
+  }
+
+  next(); // Proceed to the next middleware or route handler
+};
+
+module.exports = validateCanvasInputMiddleware;

server/render/canvas-handler.js

@@ -1,43 +1,31 @@
 const { createCanvas } = require("canvas");
+const { Canvas, FontLibrary } = require("skia-canvas");
 const Chart = require("chart.js/auto");
-const logger = require("../utils/logger");
 
 const { backgroundColors, borderColors } = require("./canvas-colors");
-const { isObject, defaultsDeep, isNumber } = require("lodash");
+const { defaultsDeep, isNumber } = require("lodash");
 
-exports.canvastest = function (req, res) {
-  //console.log("Incoming test request.", req);
-  res.status(200).send("OK");
-};
+const CANVAS_QUEUE_LIMIT = 100;
 
-exports.canvas = function (req, res) {
-  const { w, h, values, keys, override } = req.body;
-  //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");
-    return;
-  }
+let isProcessing = false;
+const requestQueue = [];
 
-  // Override must be an object if it exists
-  if (override && !isObject(override)) {
-    res.status(400).send("Override must be an object");
-    return;
-  }
+try {
+  FontLibrary.use("Montserrat", [
+    "/usr/share/fonts/Montserrat-Regular.ttf",
+    "/usr/share/fonts/Montserrat-Bold.ttf",
+    "/usr/share/fonts/Montserrat-Italic.ttf"
+  ]);
+} catch (error) {
+  console.error(
+    "Error loading fonts Skia Canvas Fonts, please be sure to install Montserrat font package",
+    error.message
+  );
+}
 
-  // Set the default Width and Height
-  let [width, height] = [500, 275];
-
-  // Allow for custom width and height
-  if (isNumber(w)) {
-    width = w;
-  }
-  if (isNumber(h)) {
-    height = h;
-  }
-
-  const configuration = {
+// Utility to create a chart configuration
+const getChartConfiguration = (keys, values, override) => {
+  const defaultConfiguration = {
     type: "doughnut",
     data: {
       labels: keys,
@@ -53,6 +41,7 @@ exports.canvas = function (req, res) {
     options: {
       devicePixelRatio: 4,
       responsive: false,
+      animation: false,
       maintainAspectRatio: true,
       circumference: 180,
       rotation: -90,
@@ -73,21 +62,88 @@ exports.canvas = function (req, res) {
     }
   };
 
-  // If we have a valid override object, merge it with the default configuration object.
-  // This allows for you to override the default configuration with a custom one.
-  const defaults = () => {
-    if (!override || !isObject(override)) {
-      return configuration;
-    }
-    return defaultsDeep(override, configuration);
-  };
-
-  res.status(200).send(
-    (() => {
-      const canvas = createCanvas(width, height);
-      const ctx = canvas.getContext("2d");
-      new Chart(ctx, defaults());
-      return canvas.toDataURL();
-    })()
-  );
+  return defaultsDeep(override || {}, defaultConfiguration);
+};
+
+const processCanvasRequest = async (req, res, isSkia = false) => {
+  const { logger } = req;
+  const { w, h, values, keys, override } = req.body;
+
+  logger.log("inbound-canvas-creation", "debug", "jsr", null, { w, h, values, keys, override });
+
+  // Default width and height
+  const width = isNumber(w) && w > 0 ? w : 500;
+  const height = isNumber(h) && h > 0 ? h : 275;
+
+  const configuration = getChartConfiguration(keys, values, override);
+
+  // Placeholders to allow fine control over GAC
+  let canvas = null;
+  let ctx = null;
+  let chart = null;
+  let chartImage = null;
+
+  try {
+    // Create the canvas
+    canvas = isSkia ? new Canvas(width, height) : createCanvas(width, height);
+    ctx = canvas.getContext("2d");
+
+    // Render the chart
+    chart = new Chart(ctx, configuration);
+
+    // Generate and send the image
+    chartImage = isSkia ? (await canvas.toBuffer("image/png")).toString("base64") : canvas.toDataURL();
+
+    res.status(200).send(isSkia ? `data:image/png;base64,${chartImage}` : chartImage);
+  } catch (error) {
+    // Log the error and send the response
+    logger.log("canvas-error", "error", "jsr", null, { error: error.message });
+    res.status(500).send("Failed to generate canvas.");
+  } finally {
+    // Cleanup resources
+    if (chart) {
+      chart.destroy();
+    }
+    ctx = null; // Explicitly nullify for garbage collection
+    canvas = null; // Explicitly nullify for garbage collection
+    chartImage = null;
+  }
+};
+
+const enqueueRequest = (req, res, isSkia) => {
+  if (requestQueue.length >= CANVAS_QUEUE_LIMIT) {
+    res.status(503).send("Server is busy. Please try again later.");
+    return false;
+  }
+  requestQueue.push({ req, res, isSkia });
+  req.logger.log("inbound-canvas-creation-queue", "debug", "jsr", null, { queue: requestQueue.length });
+  return true;
+};
+
+const processNextInQueue = async () => {
+  while (requestQueue.length > 0) {
+    const { req, res, isSkia } = requestQueue.shift();
+    try {
+      await processCanvasRequest(req, res, isSkia);
+    } catch (err) {
+      console.error("canvas-queue-error", "error", "jsr", null, { error: err.message });
+    }
+  }
+  isProcessing = false;
+};
+
+exports.canvastest = function (req, res) {
+  res.status(200).send("OK");
+};
+
+exports.canvas = async (req, res) => {
+  if (isProcessing || !enqueueRequest(req, res, false)) return;
+  isProcessing = true;
+  processNextInQueue().catch((err) => console.error("canvas-processing-error", { error: err.message }));
+};
+
+exports.canvasSkia = async (req, res) => {
+  if (isProcessing || !enqueueRequest(req, res, true)) return;
+  isProcessing = true;
+  processNextInQueue().catch((err) => console.error("canvas-processing-error", { error: err.message }));
 };

server/render/inlinecss.js

@@ -3,24 +3,36 @@ require("dotenv").config({
   path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 const logger = require("../utils/logger");
-const inlineCssTool = require("inline-css");
+//const inlineCssTool = require("inline-css");
+const juice = require("juice");
 
-exports.inlinecss = (req, res) => {
+exports.inlinecss = async (req, res) => {
   //Perform request validation
-
   logger.log("email-inline-css", "DEBUG", req.user.email, null, null);
 
   const { html, url } = req.body;
-
-  inlineCssTool(html, { url: url })
-    .then((inlinedHtml) => {
-      res.send(inlinedHtml);
-    })
-    .catch((error) => {
-      logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
-        error
-      });
-
-      res.send(error);
+  try {
+    const inlinedHtml = juice(html, {
+      applyAttributesTableElements: false,
+      preserveMediaQueries: false,
+      applyWidthAttributes: false
     });
+    res.send(inlinedHtml);
+  } catch (error) {
+    logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
+      error
+    });
+    res.send(error.message);
+  }
+
+  // inlineCssTool(html, { url: url })
+  //   .then((inlinedHtml) => {
+  //     res.send(inlinedHtml);
+  //   })
+  //   .catch((error) => {
+  //     logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
+  //       error
+  //     });
+
+  //   });
 };

server/routes/renderRoutes.js

@@ -2,10 +2,12 @@ const express = require("express");
 const router = express.Router();
 const { inlinecss } = require("../render/inlinecss");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const { canvas } = require("../render/canvas-handler");
+const { canvas, canvasSkia } = require("../render/canvas-handler");
+const validateCanvasInputMiddleware = require("../middleware/validateCanvasInputMiddleware");
 
 // Define the route for inline CSS rendering
 router.post("/inlinecss", validateFirebaseIdTokenMiddleware, inlinecss);
-router.post("/canvas", validateFirebaseIdTokenMiddleware, canvas);
+router.post("/canvas", [validateFirebaseIdTokenMiddleware, validateCanvasInputMiddleware], canvas);
+router.post("/canvas-skia", [validateFirebaseIdTokenMiddleware, validateCanvasInputMiddleware], canvasSkia);
 
 module.exports = router;