feature/IO-3048-Fix-Job-Bug-Messaging - Unread count

Signed-off-by: Dave Richer <dave@imexsystems.ca>

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

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.