Merge branch 'release/2024-12-06' into feature/IO-3020-IO-3036-imex-lite-rome-lite

.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/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/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

@@ -2397,6 +2397,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",
@@ -3060,6 +3061,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)",
@@ -3085,6 +3087,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

@@ -2397,6 +2397,7 @@
 				"selectexistingornew": ""
 			},
 			"fields": {
+        "accountingid": "",
 				"address": "Dirección",
 				"allow_text_message": "Permiso de texto?",
 				"name": "Nombre",
@@ -3060,6 +3061,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": "",
@@ -3085,6 +3087,7 @@
 				"timetickets": "",
 				"timetickets_employee": "",
 				"timetickets_summary": "",
+        "total_loss_jobs": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
 				"work_in_progress_committed_labour": "",

client/src/translations/fr/common.json

@@ -2397,6 +2397,7 @@
 				"selectexistingornew": ""
 			},
 			"fields": {
+        "accountingid": "",
 				"address": "Adresse",
 				"allow_text_message": "Autorisation de texte?",
 				"name": "Prénom",
@@ -3060,6 +3061,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": "",
@@ -3085,6 +3087,7 @@
 				"timetickets": "",
 				"timetickets_employee": "",
 				"timetickets_summary": "",
+        "total_loss_jobs": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
 				"work_in_progress_committed_labour": "",

client/src/utils/TemplateConstants.js

@@ -2182,6 +2182,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 ? { BillEmail: { 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 ? { BillEmail: { 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/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 = [];
+
+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
+  );
 }
 
-  // Override must be an object if it exists
-  if (override && !isObject(override)) {
-    res.status(400).send("Override must be an object");
-    return;
-  }
-
-  // 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);
+  return defaultsDeep(override || {}, defaultConfiguration);
 };
 
-  res.status(200).send(
-    (() => {
-      const canvas = createCanvas(width, height);
-      const ctx = canvas.getContext("2d");
-      new Chart(ctx, defaults());
-      return canvas.toDataURL();
-    })()
-  );
+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) => {
+  try {
+    const inlinedHtml = juice(html, {
+      applyAttributesTableElements: false,
+      preserveMediaQueries: false,
+      applyWidthAttributes: false
+    });
     res.send(inlinedHtml);
-    })
-    .catch((error) => {
+  } catch (error) {
     logger.log("email-inline-css-error", "ERROR", req.user.email, null, {
       error
     });
+    res.send(error.message);
+  }
 
-      res.send(error);
-    });
+  // 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;