IO-3607 Employee Drop Down Inactive filter

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/email-overlay/email-overlay.component.jsx

@@ -41,7 +41,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const emailsToMenu = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,
@@ -59,7 +59,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const menuCC = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email)
+        .filter((e) => e.user_email && e.active === true)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,

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

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

server/rr/rr-errors.js

@@ -4,7 +4,7 @@
  * @returns {number|null}
  */
 const parseVendorStatusCode = (err) => {
-  // Prefer explicit numeric props when available
+  // Prefer explicit numeric props when available.
   const codeProp = err?.code ?? err?.statusCode ?? err?.meta?.status?.StatusCode ?? err?.status?.StatusCode;
   const num = Number(codeProp);
   if (!Number.isNaN(num) && num > 0) return num;

server/rr/rr-register-socket-events.js

@@ -12,7 +12,7 @@ const { createRRCustomer } = require("./rr-customers");
 const { ensureRRServiceVehicle } = require("./rr-service-vehicles");
 const { classifyRRVendorError } = require("./rr-errors");
 const { markRRExportSuccess, insertRRFailedExportLog } = require("./rr-export-logs");
-const { withRRRequestXml } = require("./rr-log-xml");
+const { withRRRequestXml, extractRRXmlPair } = require("./rr-log-xml");
 const {
   makeVehicleSearchPayloadFromJob,
   ownersFromVinBlocks,
@@ -49,6 +49,21 @@ const resolveJobId = (explicit, payload, job) => explicit || payload?.jobId || j
  */
 const resolveVin = ({ tx, job }) => tx?.jobData?.vin || job?.v_vin || null;
 
+/**
+ * Add request/response XML to socket event payloads when available.
+ * @param rrObj
+ * @param payload
+ * @returns {*}
+ */
+const withRRXmlSocketPayload = (rrObj, payload = {}) => {
+  const { requestXml, responseXml } = extractRRXmlPair(rrObj);
+  return {
+    ...payload,
+    ...(requestXml ? { requestXml } : {}),
+    ...(responseXml ? { responseXml } : {})
+  };
+};
+
 /**
  * Sort vehicle owners first in the list, preserving original order otherwise.
  * @param list
@@ -474,7 +489,14 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       );
 
       try {
-        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: error.message });
+        socket.emit(
+          "export-failed",
+          withRRXmlSocketPayload(error, {
+            vendor: "rr",
+            jobId: rid,
+            error: error.message
+          })
+        );
       } catch {
         //
       }
@@ -870,9 +892,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
         });
 
         socket.emit("export-failed", {
-          vendor: "rr",
-          jobId: rid,
-          error: cls?.friendlyMessage || result?.error || "RR early RO creation failed",
+          ...withRRXmlSocketPayload(result, {
+            vendor: "rr",
+            jobId: rid,
+            error: cls?.friendlyMessage || result?.error || "RR early RO creation failed"
+          }),
           ...cls
         });
 
@@ -923,9 +947,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
 
       try {
         socket.emit("export-failed", {
-          vendor: "rr",
-          jobId: rid,
-          error: error.message,
+          ...withRRXmlSocketPayload(error, {
+            vendor: "rr",
+            jobId: rid,
+            error: error.message
+          }),
           ...cls
         });
         socket.emit("rr-user-notice", { jobId: rid, ...cls });
@@ -1173,7 +1199,14 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       );
 
       try {
-        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: error.message });
+        socket.emit(
+          "export-failed",
+          withRRXmlSocketPayload(error, {
+            vendor: "rr",
+            jobId: rid,
+            error: error.message
+          })
+        );
       } catch {
         //
       }
@@ -1538,9 +1571,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
         });
 
         socket.emit("export-failed", {
-          vendor: "rr",
-          jobId: rid,
-          error: cls?.friendlyMessage || result?.error || "RR export failed",
+          ...withRRXmlSocketPayload(result, {
+            vendor: "rr",
+            jobId: rid,
+            error: cls?.friendlyMessage || result?.error || "RR export failed"
+          }),
           ...cls
         });
 
@@ -1591,9 +1626,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
 
       try {
         socket.emit("export-failed", {
-          vendor: "rr",
-          jobId: rid,
-          error: error.message,
+          ...withRRXmlSocketPayload(error, {
+            vendor: "rr",
+            jobId: rid,
+            error: error.message
+          }),
           ...cls
         });
         socket.emit("rr-user-notice", { jobId: rid, ...cls });
@@ -1725,9 +1762,11 @@ const registerRREvents = ({ socket, redisHelpers }) => {
         });
 
         socket.emit("export-failed", {
-          vendor: "rr",
-          jobId: rid,
-          error: cls?.friendlyMessage || finalizeResult?.error || "RR finalize failed",
+          ...withRRXmlSocketPayload(finalizeResult, {
+            vendor: "rr",
+            jobId: rid,
+            error: cls?.friendlyMessage || finalizeResult?.error || "RR finalize failed"
+          }),
           ...cls
         });
         ack?.({ ok: false, error: cls.friendlyMessage || "RR finalize failed", classification: cls });
@@ -1770,7 +1809,17 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       });
 
       try {
-        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: error.message, ...cls });
+        socket.emit(
+          "export-failed",
+          {
+            ...withRRXmlSocketPayload(error, {
+              vendor: "rr",
+              jobId: rid,
+              error: error.message
+            }),
+            ...cls
+          }
+        );
       } catch {
         //
       }