IO-3239 Additional logging fixes.

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

@@ -15,7 +15,6 @@ import {
   HomeFilled,
   ImportOutlined,
   LineChartOutlined,
-  OneToOneOutlined,
   PaperClipOutlined,
   PhoneOutlined,
   PlusCircleOutlined,
@@ -25,7 +24,6 @@ import {
   TeamOutlined,
   ToolFilled,
   UnorderedListOutlined,
-  UsergroupAddOutlined,
   UserOutlined
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
@@ -42,7 +40,6 @@ import { RiSurveyLine } from "react-icons/ri";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -50,10 +47,11 @@ import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import day from "../../utils/day.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import { useIsEmployee } from "../../utils/useIsEmployee.js";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapper from "../lock-wrapper/lock-wrapper.component";
 import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 
 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -644,32 +642,17 @@ function Header({
           label: t("menus.header.help"),
           onClick: () => window.open("https://help.imex.online/", "_blank")
         },
-        {
-          key: "remoteassist",
-          id: "header-remote-assist",
-          icon: <OneToOneOutlined />,
-          label: t("menus.header.remoteassist"),
-          children: [
-            ...(InstanceRenderManager({ imex: true, rome: true })
-              ? [
-                  {
-                    key: "rescue",
-                    id: "header-rescue",
-                    icon: <PlusCircleOutlined />,
-                    label: t("menus.header.rescueme"),
-                    onClick: () => window.open("https://imexrescue.com/", "_blank")
-                  }
-                ]
-              : []),
-            {
-              key: "rescue",
-              id: "header-rescue-zoho",
-              icon: <UsergroupAddOutlined />,
-              label: t("menus.header.rescuemezoho"),
-              onClick: () => window.open("https://join.zoho.com/", "_blank")
-            }
-          ]
-        },
+        ...(InstanceRenderManager({ imex: true, rome: false })
+          ? [
+              {
+                key: "rescue",
+                id: "header-rescue",
+                icon: <CarFilled />,
+                label: t("menus.header.rescueme"),
+                onClick: () => window.open("https://imexrescue.com/", "_blank")
+              }
+            ]
+          : []),
         {
           key: "shiftclock",
           id: "header-shiftclock",

client/src/components/production-board-kanban/trello-board/controllers/Board.jsx

@@ -20,7 +20,7 @@ const Board = ({ id, className, orientation, cardSettings, ...additionalProps })
       default:
         return cardSizesVertical.small;
     }
-  }, [cardSettings?.cardSize]);
+  }, [cardSettings]);
 
   return (
     <>

client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx

@@ -101,33 +101,11 @@ const BoardContainer = ({
     async ({ draggableId, type, source, reason, mode, destination, combine }) => {
       setIsDragging(false);
 
-      // Validate drag type and source
-      if (type !== "lane" || !source) {
-        // Invalid drag type or missing source, attempt to revert if possible
-        if (source) {
-          dispatch(
-            actions.moveCardAcrossLanes({
-              fromLaneId: source.droppableId,
-              toLaneId: source.droppableId,
-              cardId: draggableId,
-              index: source.index
-            })
-          );
-        }
-        setIsProcessing(false);
-        try {
-          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-        } catch (err) {
-          console.error("Error in onLaneDrag for invalid drag type or source", err);
-        }
-        return;
-      }
+      // Only update drag time if it's a valid drop with a different destination
+      if (type === "lane" && source && destination && !isEqual(source, destination)) {
+        setDragTime(source.droppableId);
+        setIsProcessing(true);
 
-      setDragTime(source.droppableId);
-      setIsProcessing(true);
-
-      // Handle valid drop to a different lane or position
-      if (destination && !isEqual(source, destination)) {
         dispatch(
           actions.moveCardAcrossLanes({
             fromLaneId: source.droppableId,
@@ -136,33 +114,14 @@ const BoardContainer = ({
             index: destination.index
           })
         );
-      } else {
-        // Same-lane drop or no destination, revert to original position
-        dispatch(
-          actions.moveCardAcrossLanes({
-            fromLaneId: source.droppableId,
-            toLaneId: source.droppableId,
-            cardId: draggableId,
-            index: source.index
-          })
-        );
-      }
 
-      try {
-        await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-      } catch (err) {
-        console.error("Error in onLaneDrag", err);
-        // Ensure revert on error
-        dispatch(
-          actions.moveCardAcrossLanes({
-            fromLaneId: source.droppableId,
-            toLaneId: source.droppableId,
-            cardId: draggableId,
-            index: source.index
-          })
-        );
-      } finally {
-        setIsProcessing(false);
+        try {
+          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+        } catch (err) {
+          console.error("Error in onLaneDrag", err);
+        } finally {
+          setIsProcessing(false);
+        }
       }
     },
     [dispatch, onDragEnd, setDragTime]

client/src/components/production-board-kanban/trello-board/controllers/Lane.jsx

@@ -133,9 +133,7 @@ const Lane = ({
           Item: ItemComponent
         },
         itemContent: (index, item) => <ItemWrapper>{renderDraggable(index, item)}</ItemWrapper>,
-        overscan: { main: 10, reverse: 10 },
-        // Ensure a minimum height for empty lanes to allow dropping
-        style: renderedCards.length === 0 ? { minHeight: "5px" } : {}
+        overscan: { main: 10, reverse: 10 }
       };
 
       const horizontalProps = {
@@ -151,6 +149,8 @@ const Lane = ({
 
       const componentProps = orientation === "vertical" ? verticalProps : horizontalProps;
 
+      // If the lane is collapsed, we want to render a div instead of the virtualized list, and we want to set the height to the max height of the lane so that
+      // the lane doesn't shrink when collapsed (in horizontal mode)
       const finalComponentProps = collapsed
         ? orientation === "horizontal"
           ? {
@@ -161,8 +161,9 @@ const Lane = ({
           : {}
         : componentProps;
 
-      // Always render placeholder for empty lanes in vertical mode to ensure droppable area
-      const shouldRenderPlaceholder = orientation === "vertical" ? collapsed || renderedCards.length === 0 : collapsed;
+      // If the lane is horizontal and collapsed, we want to render a placeholder so that the lane doesn't shrink to 0 height and grows when
+      // a card is dragged over it
+      const shouldRenderPlaceholder = orientation !== "horizontal" && (collapsed || renderedCards.length === 0);
 
       return (
         <HeightMemoryWrapper
@@ -177,8 +178,8 @@ const Lane = ({
           override={orientation !== "horizontal" && (collapsed || !renderedCards.length)}
         >
           <div
-            ref={laneRef}
-            style={{ height: "100%", width: "100%" }}
+            ref={laneRef} // Ensure laneRef is set here
+            style={{ height: "100%", width: "100%" }} // Make it scrollable
             className={`react-trello-lane ${collapsed ? "lane-collapsed" : ""}`}
           >
             <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...provided.droppableProps.style }}>

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

@@ -335,12 +335,20 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
-      window.$crisp.push(["set", "user:company", [payload.shopname]]);
-      window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
-      if (authRecord[0] && authRecord[0].user.validemail) {
-        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-      }
-
+      InstanceRenderManager({
+        executeFunction: true,
+        args: [],
+        imex: () => {
+          window.$crisp.push(["set", "user:company", [payload.shopname]]);
+          window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
+          if (authRecord[0] && authRecord[0].user.validemail) {
+            window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
+          }
+        },
+        rome: () => {
+          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
+        }
+      });
       payload.features?.allAccess === true
         ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
         : (() => {
@@ -351,14 +359,6 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
             );
             window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
           })();
-
-      InstanceRenderManager({
-        executeFunction: true,
-        args: [],
-        rome: () => {
-          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
-        }
-      });
     } catch (error) {
       console.warn("Couldnt find $crisp.", error.message);
     }

client/src/translations/en_us/common.json

@@ -2302,10 +2302,8 @@
         "productionlist": "Production Board - List",
         "readyjobs": "Ready Jobs",
         "recent": "Recent Items",
-        "remoteassist": "Remote Assist",
         "reportcenter": "Report Center",
-        "rescueme": "Rescue Me!",
-        "rescuemezoho": "Remote Me In!",
+        "rescueme": "Rescue me!",
         "schedule": "Schedule",
         "scoreboard": "Scoreboard",
         "search": {

client/src/translations/es/common.json

@@ -2301,10 +2301,8 @@
         "productionlist": "",
         "readyjobs": "",
         "recent": "",
-        "remoteassist": "",
         "reportcenter": "",
         "rescueme": "",
-        "rescuemezoho": "",
         "schedule": "Programar",
         "scoreboard": "",
         "search": {
@@ -2500,8 +2498,7 @@
       },
       "tooltips": {
         "job-watchers": "",
-        "not-employee": "",
-        "not-employee-notifications": ""
+        "not-employee": ""
       }
     },
     "owner": {

client/src/translations/fr/common.json

@@ -2301,10 +2301,8 @@
         "productionlist": "",
         "readyjobs": "",
         "recent": "",
-        "remoteassist": "",
         "reportcenter": "",
         "rescueme": "",
-        "rescuemezoho": "",
         "schedule": "Programme",
         "scoreboard": "",
         "search": {
@@ -2500,8 +2498,7 @@
       },
       "tooltips": {
         "job-watchers": "",
-        "not-employee": "",
-        "not-employee-notifications": ""
+        "not-employee": ""
       }
     },
     "owner": {

server/accounting/qbo/qbo-receivables.js

@@ -478,7 +478,7 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
 
 exports.InsertJob = InsertJob;
 
-async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
+async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) {
   const items = await oauthClient.makeApiCall({
     url: urlBuilder(qbo_realmId, "query", `select * From Item where active=true maxresults 1000`),
     method: "POST",
@@ -492,6 +492,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
     name: "QueryItems",
     status: items.response?.status,
     bodyshopid,
+    jobid: jobid,
     email: req.user.email
   })
   setNewRefreshToken(req.user.email, items);
@@ -508,6 +509,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
     name: "QueryTaxCodes",
     status: taxCodes.response?.status,
     bodyshopid,
+    jobid: jobid,
     email: req.user.email
   })
   const classes = await oauthClient.makeApiCall({
@@ -523,6 +525,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
     name: "QueryClasses",
     status: classes.response?.status,
     bodyshopid,
+    jobid: jobid,
     email: req.user.email
   })
   const taxCodeMapping = {};
@@ -559,7 +562,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
 }
 
 async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, parentTierRef) {
-  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, job.shopid);
+  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, job.shopid, job.id);
   const InvoiceLineAdd = CreateInvoiceLines({
     bodyshop,
     jobs_by_pk: job,
@@ -653,7 +656,7 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
       platform: "QBO",
       method: "POST",
       name: "InsertInvoice",
-      status: result.status,
+      status: result.response?.status,
       bodyshopid: job.shopid,
       jobid: job.id,
       email: req.user.email
@@ -778,7 +781,7 @@ async function InsertInvoiceMultiPayerInvoice(
       platform: "QBO",
       method: "POST",
       name: "InsertInvoice",
-      status: result.response.status,
+      status: result.response?.status,
       bodyshopid: job.shopid,
       jobid: job.id,
       email: req.user.email

server/utils/logger.js

@@ -206,7 +206,7 @@ const createLogger = () => {
             jobid,
             paymentid,
             billid,
-            status: status.toString() ?? "0",
+            status: status?.toString() ?? "0",
             bodyshopid,
             email
           }