IO-3318 Close Job Page UI Bugs

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

.platform/nginx/nginx.conf

@@ -1,45 +0,0 @@
-#Elastic Beanstalk Nginx Configuration File
-
-user                    nginx;
-error_log               /var/log/nginx/error.log warn;
-pid                     /var/run/nginx.pid;
-worker_processes        auto;
-worker_rlimit_nofile    200000;
-
-events {
-    worker_connections  2048;
-}
-
-http {
-    server_tokens off;
-
-    include	  /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    include	  conf.d/*.conf;
-
-    map $http_upgrade $connection_upgrade {
-        default     "upgrade";
-    }
-
-    server {
-	listen        80 default_server;
-        access_log    /var/log/nginx/access.log main;
-
-        client_max_body_size 50M;
-        client_body_buffer_size 5M;
-        client_header_timeout 60;
-        client_body_timeout   60;
-        keepalive_timeout     60;
-        gzip                  off;
-        gzip_comp_level       4;
-        gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml>
-
-        # Include the Elastic Beanstalk generated locations
-        include conf.d/elasticbeanstalk/*.conf;
-    }
-}

client/src/components/form-items-formatted/labor-type-form-item.component.jsx

@@ -1,7 +1,7 @@
-import React, { forwardRef } from "react";
+import { forwardRef } from "react";
 import { useTranslation } from "react-i18next";
 
-const LaborTypeFormItem = ({ value, onChange }, ref) => {
+const LaborTypeFormItem = ({ value }) => {
   const { t } = useTranslation();
 
   if (!value) return null;

client/src/components/form-items-formatted/part-type-form-item.component.jsx

@@ -1,11 +1,13 @@
-import React, { forwardRef } from "react";
+import { forwardRef } from "react";
 import { useTranslation } from "react-i18next";
 
-const PartTypeFormItem = ({ value, onChange }, ref) => {
+const PartTypeFormItem = ({ value }) => {
   const { t } = useTranslation();
 
   if (!value) return null;
 
-  return <div>{t(`joblines.fields.part_types.${value}`)}</div>;
+  return (
+    <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{t(`joblines.fields.part_types.${value}`)}</div>
+  );
 };
 export default forwardRef(PartTypeFormItem);

client/src/components/form-items-formatted/read-only-form-item.component.jsx

@@ -1,6 +1,5 @@
 import Dinero from "dinero.js";
-import React, { forwardRef } from "react";
-
+import { forwardRef } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -8,23 +7,24 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-const ReadOnlyFormItem = ({ bodyshop, value, type = "text", onChange }, ref) => {
+const ReadOnlyFormItem = ({ bodyshop, value, type = "text" }) => {
   if (!value) return null;
   switch (type) {
-    case "employee":
+    case "employee": {
       const emp = bodyshop.employees.find((e) => e.id === value);
       return `${emp?.first_name} ${emp?.last_name}`;
+    }
 
     case "text":
-      return <div>{value}</div>;
+      return <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{value}</div>;
     case "currency":
       return <div>{Dinero({ amount: Math.round(value * 100) }).toFormat()}</div>;
     default:
-      return <div>{value}</div>;
+      return <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{value}</div>;
   }
 };
 

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -1,5 +1,5 @@
+import { WarningOutlined } from "@ant-design/icons";
 import { Form, Select, Space, Tooltip } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -8,14 +8,13 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component";
 import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component";
 import ReadOnlyFormItem from "../form-items-formatted/read-only-form-item.component";
-import { WarningOutlined } from "@ant-design/icons";
 import "./jobs-close-lines.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -24,7 +23,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
   return (
     <div>
       <Form.List name={["joblines"]}>
-        {(fields, { add, remove, move }) => {
+        {(fields) => {
           return (
             <table className="jobs-close-table">
               <thead>

client/src/contexts/SocketIO/socketProvider.jsx

@@ -32,7 +32,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   const socketRef = useRef(null);
   const [clientId, setClientId] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
-  const [socketInitialized, setSocketInitialized] = useState(false);
   const notification = useNotification();
   const userAssociationId = bodyshop?.associations?.[0]?.id;
   const { t } = useTranslation();
@@ -148,13 +147,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     onError: (err) => console.error("MARK_ALL_NOTIFICATIONS_READ error:", err)
   });
 
-  const checkAndReconnect = () => {
-    if (socketRef.current && !socketRef.current.connected) {
-      console.log("Attempting manual reconnect due to event trigger");
-      socketRef.current.connect();
-    }
-  };
-
   useEffect(() => {
     const initializeSocket = async (token) => {
       if (!bodyshop || !bodyshop.id || socketRef.current) return;
@@ -166,14 +158,13 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         auth: { token, bodyshopId: bodyshop.id },
         reconnectionAttempts: Infinity,
         reconnectionDelay: 2000,
-        reconnectionDelayMax: 60000,
-        randomizationFactor: 0.5,
-        transports: ["websocket", "polling"], // Add this to prefer WebSocket with polling fallback
-        rememberUpgrade: true
+        reconnectionDelayMax: 60000
+        // randomizationFactor: 0.5,
+        // transports: ["websocket", "polling"], // Add this to prefer WebSocket with polling fallback
+        // rememberUpgrade: true
       });
 
       socketRef.current = socketInstance;
-      setSocketInitialized(true);
 
       const handleBodyshopMessage = (message) => {
         if (!message || !message.type) return;
@@ -261,7 +252,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
             break;
         }
       };
-      
+
       const handleConnect = () => {
         socketInstance.emit("join-bodyshop-room", bodyshop.id);
         setClientId(socketInstance.id);
@@ -558,57 +549,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     t
   ]);
 
-  useEffect(() => {
-    if (!socketInitialized) return;
-
-    const onVisibilityChange = () => {
-      if (document.visibilityState === "visible") {
-        checkAndReconnect();
-      }
-    };
-
-    const onFocus = () => {
-      checkAndReconnect();
-    };
-
-    const onOnline = () => {
-      checkAndReconnect();
-    };
-
-    const onPageShow = (event) => {
-      if (event.persisted) {
-        checkAndReconnect();
-      }
-    };
-
-    document.addEventListener("visibilitychange", onVisibilityChange);
-    window.addEventListener("focus", onFocus);
-    window.addEventListener("online", onOnline);
-    window.addEventListener("pageshow", onPageShow);
-
-    // Sleep/wake detection using timer
-    let lastTime = Date.now();
-    const intervalMs = 1000; // Check every second
-    const thresholdMs = 2000; // If more than 2 seconds elapsed, assume sleep/wake
-
-    const sleepCheckInterval = setInterval(() => {
-      const currentTime = Date.now();
-      if (currentTime > lastTime + intervalMs + thresholdMs) {
-        console.log("Detected potential wake from sleep/hibernate");
-        checkAndReconnect();
-      }
-      lastTime = currentTime;
-    }, intervalMs);
-
-    return () => {
-      document.removeEventListener("visibilitychange", onVisibilityChange);
-      window.removeEventListener("focus", onFocus);
-      window.removeEventListener("online", onOnline);
-      window.removeEventListener("pageshow", onPageShow);
-      clearInterval(sleepCheckInterval);
-    };
-  }, [socketInitialized]);
-
   return (
     <SocketContext.Provider
       value={{

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -271,7 +271,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
               {
                 required: true
               },
-              ({ getFieldValue }) => ({
+              () => ({
                 validator(_, value) {
                   if (!bodyshop.cdk_dealerid) return Promise.resolve();
                   if (!value || dayjs(value).isSameOrAfter(dayjs(), "day")) {
@@ -280,7 +280,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                   return Promise.reject(new Error(t("jobs.labels.dms.invoicedatefuture")));
                 }
               }),
-              ({ getFieldValue }) => ({
+              () => ({
                 validator(_, value) {
                   if (ClosingPeriod.treatment === "on" && bodyshop.accountingconfig.ClosingPeriod) {
                     if (
@@ -369,8 +369,8 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                 <Form.List
                   name={["qb_multiple_payers"]}
                   rules={[
-                    ({ getFieldValue }) => ({
-                      validator(_, value) {
+                    () => ({
+                      validator() {
                         let totalAllocated = Dinero();
 
                         const payers = form.getFieldValue("qb_multiple_payers");
@@ -492,7 +492,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                         <Statistic
                           title={t("jobs.labels.pimraryamountpayable")}
                           valueStyle={{
-                            color: discrep.getAmount() > 0 ? "green" : "red"
+                            color: discrep.getAmount() >= 0 ? "green" : "red"
                           }}
                           value={discrep.toFormat()}
                         />