IO-2742-redis - Merge Release / Up deps (prior to parking)

Signed-off-by: Dave Richer <dave@imexsystems.ca>
Merge remote-tracking branch 'origin/release/2024-09-27' into feature/IO-2742-redis
2024-09-24 14:44:22 -04:00 · 2024-09-24 14:21:51 -04:00 · 2024-09-24 14:20:09 -04:00 · 2024-09-16 11:48:17 -04:00 · 2024-09-12 11:53:29 -04:00 · 2024-09-11 20:52:49 -04:00
169 changed files with 7651 additions and 11729 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,24 +0,0 @@
-# Directories to exclude
-.circleci
-.idea
-.platform
-.vscode
-_reference
-client
-redis/dockerdata
-hasura
-node_modules
-# Files to exclude
-.ebignore
-.editorconfig
-.eslintrc.json
-.gitignore
-.prettierrc.js
-Dockerfile
-README.MD
-bodyshop_translations.babel
-docker-compose.yml
-ecosystem.config.js
-
-# Optional: Exclude logs and temporary files
-*.log
--- a/.localstack/.gitkeep
+++ b/.localstack/.gitkeep
--- a/.platform/hooks/predeploy/00-install-fonts.sh
+++ b/.platform/hooks/predeploy/00-install-fonts.sh
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Install required packages
-dnf install -y fontconfig freetype
-
-# Move to the /tmp directory for temporary download and extraction
-cd /tmp
-
-# Download the Montserrat font zip file
-wget https://images.imex.online/fonts/montserrat.zip -O montserrat.zip
-
-# Unzip the downloaded font file
-unzip montserrat.zip -d montserrat
-
-# Move the font files to the system fonts directory
-mv montserrat/montserrat/*.ttf /usr/share/fonts
-
-# Rebuild the font cache
-fc-cache -fv
-
-# Clean up
-rm -rf /tmp/montserrat /tmp/montserrat.zip
-
-echo "Montserrat fonts installed and cached successfully."
--- a/.platform/nginx/conf.d/proxy.conf
+++ b/.platform/nginx/conf.d/proxy.conf
@@ -1,2 +1 @@
-client_max_body_size 50M;
-client_body_buffer_size 5M;
+client_max_body_size 50M;
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,21 +14,6 @@
      "request": "launch",
      "url": "http://localhost:3000",
      "webRoot": "${workspaceRoot}/client/src"
-    },
-    {
-      "name": "Attach to Node.js in Docker",
-      "type": "node",
-      "request": "attach",
-      "address": "localhost",
-      "port": 9229,
-      "localRoot": "${workspaceFolder}",
-      "remoteRoot": "/app",
-      "protocol": "inspector",
-      "restart": true,
-      "sourceMaps": true,
-      "skipFiles": [
-        "<node_internals>/**"
-      ]
    }
  ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,35 +8,5 @@
      "pattern": "**/IMEX.xml",
      "systemId": "logs/IMEX.xsd"
    }
-  ],
-  "cSpell.words": [
-    "antd",
-    "appointmentconfirmation",
-    "appt",
-    "autohouse",
-    "autohouseid",
-    "billlines",
-    "bodyshop",
-    "bodyshopid",
-    "bodyshops",
-    "CIECA",
-    "claimscorp",
-    "claimscorpid",
-    "Dinero",
-    "driveable",
-    "IMEX",
-    "imexshopid",
-    "jobid",
-    "joblines",
-    "Kaizen",
-    "labhrs",
-    "larhrs",
-    "mixdata",
-    "ownr",
-    "promanager",
-    "shopname",
-    "smartscheduling",
-    "timetickets",
-    "touchtime"
  ]
 }
--- a/47
+++ b/47
@@ -1,47 +0,0 @@
-# Use Amazon Linux 2023 as the base image
-FROM amazonlinux:2023
-
-# Install Git and Node.js (Amazon Linux 2023 uses the DNF package manager)
-RUN dnf install -y git \
-    && curl -sL https://rpm.nodesource.com/setup_20.x | bash - \
-    && dnf install -y nodejs \
-    && dnf clean all
-
-
-# Install dependencies required by node-canvas
-RUN dnf install -y \
-    gcc \
-    gcc-c++ \
-    cairo-devel \
-    pango-devel \
-    libjpeg-turbo-devel \
-    giflib-devel \
-    libpng-devel \
-    make \
-    python3 \
-    python3-pip \
-    && dnf clean all
-
-# Set the working directory
-WORKDIR /app
-
-# This is because our test route uses a git commit hash
-RUN git config --global --add safe.directory /app
-
-# Copy package.json and package-lock.json
-COPY package.json ./
-
-# Install Nodemon
-RUN npm install -g nodemon
-
-# Install dependencies
-RUN npm i --no-package-lock
-
-# Copy the rest of your application code
-COPY . .
-
-# Expose the port your app runs on (adjust if necessary)
-EXPOSE 4000 9229
-
-# Start the application
-CMD ["nodemon", "--legacy-watch", "--inspect=0.0.0.0:9229", "server.js"]
--- a/_reference/SQL/AuditTriggerFunctions.sql
+++ b/_reference/SQL/AuditTriggerFunctions.sql
--- a/_reference/JSON/BodyshopFeatures.json
+++ b/_reference/JSON/BodyshopFeatures.json
--- a/_reference/JSON/CiecaOpCodesReference.json
+++ b/_reference/JSON/CiecaOpCodesReference.json
--- a/_reference/Documents/DeploymentChecklist.md
+++ b/_reference/Documents/DeploymentChecklist.md
--- a/_reference/Documents/dockerreadme.md
+++ b/_reference/Documents/dockerreadme.md
@@ -1,64 +0,0 @@
-# Setting up External Networking and Static IP for WSL2 using Hyper-V
-
-This guide will walk you through the steps to configure your WSL2 (Windows Subsystem for Linux) instance to use an external Hyper-V virtual switch, enabling it to connect directly to your local network. Additionally, you'll learn how to assign a static IP address to your WSL2 instance.
-
-## Prerequisites
-
-1. **Windows 11**
-2. **Docker Desktop For Windows (Latest Version)
-
-# Docker Setup
-Inside the root of the project exists the `docker-compose.yaml` file, you can simply run
-`docker-compose up` to launch the backend.
-
-Things to note:
- When installing NPM packages, you will need to rebuild the `node-app` container 
- Making changes to the server files will restart the `node-app`
-
-# Local Stack 
- LocalStack Front end (Optional) - https://apps.microsoft.com/detail/9ntrnft9zws2?hl=en-us&gl=US
- http://localhost:4566/_aws/ses will allow you to see emails sent
-
-# Docker Commands
-
-##  General `docker-compose` Commands:
-1. Bring up the services, force a rebuild of all services, and do not use the cache: `docker-compose up --build --no-cache`
-2. Start Containers in Detached Mode: This will run the containers in the background (detached mode): `docker-compose up -d`
-3. Stop and Remove Containers: Stops and removes the containers gracefully: `docker-compose down`
-4. Stop containers without removing them: `docker-compose stop`
-5. Remove Containers, Volumes, and Networks: `docker-compose down --volumes`
-6. Force rebuild of containers: `docker-compose build --no-cache`
-7. View running Containers:  `docker-compose ps`
-8. View a specific containers logs: `docker-compose logs <container-name>`
-9. Scale services (multiple instances of a service): `docker-compose up --scale <container-name>=<instances number> -d`
-10. Watch a specific containers logs in realtime with timestamps: `docker-compose logs -f --timestamps <container-name>`
-
-## Volume Management Commands
-1. List  Docker volumes: `docker volume ls`
-2. Remove Unused volumes `docker volume prune`
-3. Remove specific volumes `docker volume rm <volume-name>`
-4. Inspect a volume: `docker volume inspect <volume-name>`
-
-## Container Image Management Commands:
-1. List running containers: `docker ps`
-2. List all containers: `docker os -a`
-3. Remove Stopped containers: `docker container prune`
-4. Remove a specific container: `docker container rm <container-name>`
-5. Remove a specific image: `docker rmi <image-name>:<version>`
-6. Remove all unused images: `docker image prune -a`
-
-## Network Management Commands:
-1. List networks: `docker network ls`
-2. Inspect a specific network: `docker network inspect <network-name>`
-3. Remove a specific network: `docker network rm <network-name>`
-4. Remove unused networks: `docker network prune`
-
-## Debugging and maintenance:
-1. Enter a Running container: `docker exec -it <container name> /bin/bash` (could also be `/bin/sh` or for example `redis-cli` on a redis node)
-2. View container resource usage: `docker stats`
-3. Check Disk space used by Docker: `docker system df`
-4. Remove all unused Data (Nuclear option): `docker system prune`
-
-## Specific examples
-1. To simulate a Clean state, one should run `docker system prune` followed by `docker volume prune -a`
-2. You can run `docker-compose up` without the `-d` option, and you will get what is identical to the experience you were used to, this includes being able to control-c and bring the entire stack down
--- a/_reference/Documents/JSReportSetup.md
+++ b/_reference/Documents/JSReportSetup.md
--- a/_reference/Documents/Jest
+++ b/_reference/Documents/Jest
--- a/_reference/Documents/New
+++ b/_reference/Documents/New
--- a/_reference/Documents/Responsibility
+++ b/_reference/Documents/Responsibility
--- a/_reference/Documents/SampleMetadata.md
+++ b/_reference/Documents/SampleMetadata.md
--- a/_reference/Documents/TeamsSlackInvestigationFinalVersion.md
+++ b/_reference/Documents/TeamsSlackInvestigationFinalVersion.md
--- a/_reference/JSON/Test_CDK_Acct
+++ b/_reference/JSON/Test_CDK_Acct
--- a/_reference/Documents/dropletSetup.md
+++ b/_reference/Documents/dropletSetup.md
--- a/_reference/Documents/firebase.md
+++ b/_reference/Documents/firebase.md
--- a/_reference/localEmailViewer/.gitignore
+++ b/_reference/localEmailViewer/.gitignore
@@ -1 +0,0 @@
-node_modules
--- a/_reference/localEmailViewer/README.md
+++ b/_reference/localEmailViewer/README.md
@@ -1,7 +0,0 @@
-This will connect to your dockers local stack session and render the email in HTML.
-
-```shell
-node index.js
-```
-
-http://localhost:3334
--- a/_reference/localEmailViewer/index.js
+++ b/_reference/localEmailViewer/index.js
@@ -1,116 +0,0 @@
-// index.js
-
-import express from 'express';
-import fetch from 'node-fetch';
-import {simpleParser} from 'mailparser';
-
-const app = express();
-const PORT = 3334;
-
-app.get('/', async (req, res) => {
-    try {
-        const response = await fetch('http://localhost:4566/_aws/ses');
-        if (!response.ok) {
-            throw new Error('Network response was not ok');
-        }
-        const data = await response.json();
-        const messagesHtml = await parseMessages(data.messages);
-        res.send(renderHtml(messagesHtml));
-    } catch (error) {
-        console.error('Error fetching messages:', error);
-        res.status(500).send('Error fetching messages');
-    }
-});
-
-async function parseMessages(messages) {
-    const parsedMessages = await Promise.all(
-        messages.map(async (message, index) => {
-            try {
-                const parsed = await simpleParser(message.RawData);
-                return `
-                    <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: lightgray">
-                     <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: white">
-                        <div class="mb-2">
-                            <span class="font-bold text-lg">Message ${index + 1}</span>
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">From:</span> ${message.Source}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Region:</span> ${message.Region}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
-                        </div>
-                     </div>
-                        <div class="prose">
-                            ${parsed.html || parsed.textAsHtml || 'No HTML content available'}
-                        </div>
-                    </div>
-                `;
-            } catch (error) {
-                console.error('Error parsing email:', error);
-                return `
-                    <div class="bg-white shadow-md rounded-lg p-4 mb-6">
-                        <div class="mb-2">
-                            <span class="font-bold text-lg">Message ${index + 1}</span>
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">From:</span> ${message.Source}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Region:</span> ${message.Region}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
-                        </div>
-                        <div class="text-red-500">
-                            Error parsing email content
-                        </div>
-                    </div>
-                `;
-            }
-        })
-    );
-    return parsedMessages.join('');
-}
-
-function renderHtml(messagesHtml) {
-    return `
-        <!DOCTYPE html>
-        <html lang="en">
-        <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <title>Email Messages Viewer</title>
-            <script src="https://cdn.tailwindcss.com"></script>
-            <style>
-                body {
-                    background-color: #f3f4f6;
-                    font-family: Arial, sans-serif;
-                }
-                .container {
-                    max-width: 800px;
-                    margin: 50px auto;
-                    padding: 20px;
-                }
-                .prose {
-                    line-height: 1.6;
-                }
-            </style>
-        </head>
-        <body>
-            <div class="container bg-white shadow-lg rounded-lg p-6">
-                <h1 class="text-2xl font-bold text-center mb-6">Email Messages Viewer</h1>
-                <div id="messages-container">
-                    ${messagesHtml}
-                </div>
-            </div>
-        </body>
-        </html>
-    `;
-}
-
-app.listen(PORT, () => {
-    console.log(`Server is running on http://localhost:${PORT}`);
-});
--- a/_reference/localEmailViewer/package-lock.json
+++ b/_reference/localEmailViewer/package-lock.json
--- a/_reference/localEmailViewer/package.json
+++ b/_reference/localEmailViewer/package.json
@@ -1,18 +0,0 @@
-{
-  "name": "localemailviewer",
-  "version": "1.0.0",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "dependencies": {
-    "express": "^4.21.1",
-    "mailparser": "^3.7.1",
-    "node-fetch": "^3.3.2"
-  }
-}
--- a/_reference/prHelper/index.html
+++ b/_reference/prHelper/index.html
--- a/_reference/Documents/productionBoardNotes.md
+++ b/_reference/Documents/productionBoardNotes.md
--- a/_reference/Documents/reportFiltersAndSorters.md
+++ b/_reference/Documents/reportFiltersAndSorters.md
--- a/_reference/Documents/test
+++ b/_reference/Documents/test
--- a/certs/id_rsa
+++ b/certs/id_rsa
@@ -1,27 +0,0 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAQEAvNl5fuVmLNv72BZNxnTqX5CHf5Xi8UxjYaYxHITSCx7blnhpVYLd
-qXvcOWXzbsfjch/den73QiW4n2FYz75oGMhUGlOYzdWKA9I9Sj09Qy1R06RhwDiZGd5qaM
-swEeXpkNmi2u4Qd2kJeDfUQUigjC09V81O/vrniGtQAJScfiG/itdm+Ufn09Z4MYk0HWjq
-iDokNEskoEPsibYIrb+Q6vdtuPkZO+wU/smXhPtgw5ST6oQdmm/gVNsRg5XNzxrire+z1G
-WatnnVL3hPnnfpnf8W589dyms7GGJwhPerSGTN1bn0T4+9C69Cd7LBJtxiuFdRmdlGLLLP
-RR48Rur71wAAA9AEfVsdBH1bHQAAAAdzc2gtcnNhAAABAQC82Xl+5WYs2/vYFk3GdOpfkI
-d/leLxTGNhpjEchNILHtuWeGlVgt2pe9w5ZfNux+NyH916fvdCJbifYVjPvmgYyFQaU5jN
-1YoD0j1KPT1DLVHTpGHAOJkZ3mpoyzAR5emQ2aLa7hB3aQl4N9RBSKCMLT1XzU7++ueIa1
-AAlJx+Ib+K12b5R+fT1ngxiTQdaOqIOiQ0SySgQ+yJtgitv5Dq9224+Rk77BT+yZeE+2DD
-lJPqhB2ab+BU2xGDlc3PGuKt77PUZZq2edUveE+ed+md/xbnz13KazsYYnCE96tIZM3Vuf
-RPj70Lr0J3ssEm3GK4V1GZ2UYsss9FHjxG6vvXAAAAAwEAAQAAAQAQTosSLQbMmtY9S3e9
-yjyusdExcCTfhyQRu4MEHmfws+JsNMuLqbgwOVTD1AzYJQR7x0qdmDcLjCxL/uDnV16vvS
-Sd/Vf1dhnryIyoS29tzI0DRG94ZKq7tBvmHp1w/jRT4KcSVnovhW9e5Rs74+SRFhr06PKI
-S+wQOIv48Nwue9+QUMsMCpWgKXHx7SHNTHvnAfqdhi9O29SWlMA+v+mELZ5Cl+HU0UTt2I
-A1BxOe1N8FjN7KE2viJexsl3is1PuqMkpLl/wyHBJTVzUadl6DRALJQIm7/YO5goE72YOV
-Lpo27do3zjhC87dlKdATvZUzfKV0LuUVdxq/PNDZMUbBAAAAgQDShAqDZiDrdTUaGXfUVm
-QzcnVNbh2/KgZh4uux9QNHST562W6cnN7qxoRwVrM4BCOk1Kl73QQZW4nDvXX3PVC5j038
-8AXkcBHS9j9f4h72ue7D2jqlbHFa7aGU9zYgk9mbBF+GX3tDntkAIQjLtwOLfj1iiJ/clX
-mHFUAY1V4L8AAAAIEA3E4t/v0yU5D9AOI0r17UNYqfeyDoKAEDR4QbbFjO1l0kLnEJy7Zx
-Mhj18GilYg2y0P0v8dSM/oWXS8Hua2t5i9Exlv6gHhGlQ80mwYcVGIxewZ/pPeCPw0U+kt
-EKUjt09m9Oe7+6xHQsTBj9hY8/vqPmQwRalZFcLdhHiDiVKTcAAACBANtykaPXdVzEFx7D
-UOlsjVL7zM0EVOFXf9JJQ6BhazhmsEI2PYt3IpgGMo8cXkoUofAOIYjf421AabN1BqSO5J
-XTMxM0ZV3JmLLi804Mu9h1iFrVTBdLYOMJdc2VCo1EwHWpo9SXOyjxce/znvcIOU04aZhu
-TaPg816X+E+gw5JhAAAAFGRhdmVARGF2ZVJpY2hlci1JTUVYAQIDBAUG
-----END OPENSSH PRIVATE KEY-----
--- a/certs/id_rsa.pub
+++ b/certs/id_rsa.pub
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC82Xl+5WYs2/vYFk3GdOpfkId/leLxTGNhpjEchNILHtuWeGlVgt2pe9w5ZfNux+NyH916fvdCJbifYVjPvmgYyFQaU5jN1YoD0j1KPT1DLVHTpGHAOJkZ3mpoyzAR5emQ2aLa7hB3aQl4N9RBSKCMLT1XzU7++ueIa1AAlJx+Ib+K12b5R+fT1ngxiTQdaOqIOiQ0SySgQ+yJtgitv5Dq9224+Rk77BT+yZeE+2DDlJPqhB2ab+BU2xGDlc3PGuKt77PUZZq2edUveE+ed+md/xbnz13KazsYYnCE96tIZM3VufRPj70Lr0J3ssEm3GK4V1GZ2UYsss9FHjxG6vvX dave@DaveRicher-IMEX
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -8,7 +8,7 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@ant-design/pro-layout": "^7.19.12",
+    "@ant-design/pro-layout": "^7.20.2",
    "@apollo/client": "^3.11.8",
    "@emotion/is-prop-valid": "^1.3.1",
    "@fingerprintjs/fingerprintjs": "^4.5.0",
@@ -19,7 +19,7 @@
    "@splitsoftware/splitio-react": "^1.13.0",
    "@tanem/react-nprogress": "^5.0.51",
    "@vitejs/plugin-react": "^4.3.1",
-    "antd": "^5.20.1",
+    "antd": "^5.21.0",
    "apollo-link-logger": "^2.0.1",
    "apollo-link-sentry": "^3.3.0",
    "autosize": "^6.0.1",
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -2,6 +2,8 @@ import { ApolloProvider } from "@apollo/client";
 import { SplitFactoryProvider, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
+import dayjs from "../utils/day";
+import "dayjs/locale/en";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
@@ -17,6 +19,8 @@ if (import.meta.env.DEV) {
  Userpilot.initialize("NX-69145f08");
 }

+dayjs.locale("en");
+
 const config = {
  core: {
    authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
--- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
+++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx
@@ -9,7 +9,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { exportPageLimit } from "../../utils/config";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
@@ -175,7 +175,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
      <Table
        loading={loading}
        dataSource={dataSource}
-        pagination={{ position: "top", pageSize: exportPageLimit }}
+        pagination={{ position: "top", pageSize: pageLimit }}
        columns={columns}
        rowKey="id"
        onChange={handleTableChange}
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -8,7 +8,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
-import { exportPageLimit } from "../../utils/config";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
@@ -177,7 +177,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
      <Table
        loading={loading}
        dataSource={dataSource}
-        pagination={{ position: "top", pageSize: exportPageLimit }}
+        pagination={{ position: "top", pageSize: pageLimit }}
        columns={columns}
        rowKey="id"
        onChange={handleTableChange}
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -1,18 +1,18 @@
 import { Button, Card, Input, Space, Table } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
 import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { exportPageLimit } from "../../utils/config";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
-import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { DateFormatter } from "../../utils/DateFormatter";
+import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import JobMarkSelectedExported from "../jobs-mark-selected-exported/jobs-mark-selected-exported";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
@@ -201,7 +201,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
      <Table
        loading={loading}
        dataSource={dataSource}
-        pagination={{ position: "top", pageSize: exportPageLimit }}
+        pagination={{ position: "top" }}
        columns={columns}
        rowKey="id"
        onChange={handleTableChange}
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -7,10 +7,10 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
 import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -72,14 +72,7 @@ export function BillEnterModalLinesComponent({
          <BillLineSearchSelect
            disabled={disabled}
            options={lineData}
-            style={{
-              width: "20rem",
-              maxWidth: "20rem",
-              minWidth: "10rem",
-              whiteSpace: "normal",
-              height: "auto",
-              minHeight: "32px" // default height of Ant Design inputs
-            }}
+            style={{ width: "100%", minWidth: "10rem" }}
            allowRemoved={form.getFieldValue("is_credit_memo") || false}
            onSelect={(value, opt) => {
              setFieldsValue({
@@ -112,7 +105,7 @@ export function BillEnterModalLinesComponent({
        title: t("billlines.fields.line_desc"),
        dataIndex: "line_desc",
        editable: true,
-        width: "20rem",
+
        formItemProps: (field) => {
          return {
            key: `${field.index}line_desc`,
@@ -126,7 +119,7 @@ export function BillEnterModalLinesComponent({
            ]
          };
        },
-        formInput: (record, index) => <Input.TextArea disabled={disabled} autoSize />
+        formInput: (record, index) => <Input disabled={disabled} />
      },
      {
        title: t("billlines.fields.quantity"),
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -11,7 +11,7 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
      disabled={disabled}
      ref={ref}
      showSearch
-      popupMatchSelectWidth={true}
+      popupMatchSelectWidth={false}
      optionLabelProp={"name"}
      //  optionFilterProp="line_desc"
      filterOption={(inputValue, option) => {
@@ -43,7 +43,7 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
            item.oem_partno ? ` - ${item.oem_partno}` : ""
          }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim(),
          label: (
-            <div style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+            <>
              <span>
                {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
                  item.oem_partno ? ` - ${item.oem_partno}` : ""
@@ -57,7 +57,7 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
              <span style={{ float: "right", paddingleft: "1rem" }}>
                {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
              </span>
-            </div>
+            </>
          )
        }))
      ]}
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/client/src/components/chat-popup/chat-popup.component.jsx
@@ -45,7 +45,7 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
    if (fcmToken) {
      setpollInterval(0);
    } else {
-      setpollInterval(90000);
+      setpollInterval(60000);
    }
  }, [fcmToken]);

--- a/client/src/components/contract-form/contract-form.component.jsx
+++ b/client/src/components/contract-form/contract-form.component.jsx
@@ -1,17 +1,15 @@
 import { WarningFilled } from "@ant-design/icons";
 import { Form, Input, InputNumber, Space } from "antd";
+import dayjs from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateFormatter } from "../../utils/DateFormatter";
-import dayjs from "../../utils/day";
 //import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
 import ContractStatusSelector from "../contract-status-select/contract-status-select.component";
 import ContractsRatesChangeButton from "../contracts-rates-change-button/contracts-rates-change-button.component";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
-import {
-  default as DateTimePicker,
-  default as FormDateTimePicker
-} from "../form-date-time-picker/form-date-time-picker.component";
+import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import InputPhone, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
@@ -20,10 +18,10 @@ import ContractFormJobPrefill from "./contract-form-job-prefill.component";
 export default function ContractFormComponent({ form, create = false, selectedJobState, selectedCar }) {
  const { t } = useTranslation();
  return (
-    <>
-      {!create && <FormFieldsChanged form={form} />}
+    <div>
+      <FormFieldsChanged form={form} />
      <LayoutFormRow>
-        {!create && (
+        {create ? null : (
          <Form.Item
            label={t("contracts.fields.status")}
            name="status"
@@ -52,7 +50,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
        <Form.Item label={t("contracts.fields.scheduledreturn")} name="scheduledreturn">
          <FormDateTimePicker />
        </Form.Item>
-        {!create && (
+        {create ? null : (
          <Form.Item label={t("contracts.fields.actualreturn")} name="actualreturn">
            <FormDateTimePicker />
          </Form.Item>
@@ -124,7 +122,7 @@ export default function ContractFormComponent({ form, create = false, selectedJo
            }}
          </Form.Item>
        )}
-        {!create && (
+        {create ? null : (
          <Form.Item label={t("contracts.fields.kmend")} name="kmend">
            <InputNumber />
          </Form.Item>
@@ -147,21 +145,25 @@ export default function ContractFormComponent({ form, create = false, selectedJo
        >
          <CourtesyCarFuelSlider />
        </Form.Item>
-        {!create && (
+        {create ? null : (
          <Form.Item label={t("contracts.fields.fuelin")} name="fuelin" span={8}>
            <CourtesyCarFuelSlider />
          </Form.Item>
        )}
      </LayoutFormRow>
-      <LayoutFormRow header={t("contracts.labels.driverinformation")}>
+      <div>
        <Space wrap>
-          {create && selectedJobState && (
-            <ContractFormJobPrefill jobId={selectedJobState && selectedJobState[0]} form={form} />
+          {selectedJobState && (
+            <div>
+              <ContractFormJobPrefill jobId={selectedJobState && selectedJobState[0]} form={form} />
+            </div>
          )}
-          {/* {<ContractLicenseDecodeButton form={form} />} */}
+          {
+            //<ContractLicenseDecodeButton form={form} />
+          }
        </Space>
-      </LayoutFormRow>
-      <LayoutFormRow noDivider={true}>
+      </div>
+      <LayoutFormRow header={t("contracts.labels.driverinformation")}>
        <Form.Item
          label={t("contracts.fields.driver_dlnumber")}
          name="driver_dlnumber"
@@ -181,8 +183,9 @@ export default function ContractFormComponent({ form, create = false, selectedJo
            const dlExpiresBeforeReturn = dayjs(form.getFieldValue("driver_dlexpiry")).isBefore(
              dayjs(form.getFieldValue("scheduledreturn"))
            );
+
            return (
-              <>
+              <div>
                <Form.Item
                  label={t("contracts.fields.driver_dlexpiry")}
                  name="driver_dlexpiry"
@@ -201,10 +204,11 @@ export default function ContractFormComponent({ form, create = false, selectedJo
                    <span>{t("contracts.labels.dlexpirebeforereturn")}</span>
                  </Space>
                )}
-              </>
+              </div>
            );
          }}
        </Form.Item>
+
        <Form.Item label={t("contracts.fields.driver_dlst")} name="driver_dlst">
          <Input />
        </Form.Item>
@@ -311,6 +315,6 @@ export default function ContractFormComponent({ form, create = false, selectedJo
          <InputNumber precision={2} />
        </Form.Item>
      </LayoutFormRow>
-    </>
+    </div>
  );
 }
--- a/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
+++ b/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
@@ -1,10 +1,10 @@
 import { Card, Table, Tag } from "antd";
-import axios from "axios";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import dayjs from "../../../utils/day";
 import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import { useTranslation } from "react-i18next";
+import React, { useEffect, useState } from "react";
+import dayjs from "../../../utils/day";
 import DashboardRefreshRequired from "../refresh-required.component";
+import axios from "axios";

 const fortyFiveDaysAgo = () => dayjs().subtract(45, "day").toLocaleString();

@@ -46,11 +46,6 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
      dataIndex: "humanReadable",
      key: "humanReadable"
    },
-    {
-      title: t("job_lifecycle.columns.average_human_readable"),
-      dataIndex: "averageHumanReadable",
-      key: "averageHumanReadable"
-    },
    {
      title: t("job_lifecycle.columns.status_count"),
      key: "statusCount",
--- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
+++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
@@ -1,62 +1,66 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Form, Input, Table } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx"; // Import SocketContext

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop
 });

-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+export default connect(mapStateToProps)(DmsAllocationsSummaryAp);

-export default connect(mapStateToProps, mapDispatchToProps)(DmsAllocationsSummaryAp);
-
-export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
+export function DmsAllocationsSummaryAp({ bodyshop, billids, title }) {
  const { t } = useTranslation();
  const [allocationsSummary, setAllocationsSummary] = useState([]);
+  const { socket } = useContext(SocketContext);

  useEffect(() => {
-    socket.on("ap-export-success", (billid) => {
+    if (!socket || !socket.connected) return;
+
+    const handleSuccess = async (billid) => {
      setAllocationsSummary((allocationsSummary) =>
        allocationsSummary.map((a) => {
          if (a.billid !== billid) return a;
          return { ...a, status: "Successful" };
        })
      );
-    });
-    socket.on("ap-export-failure", ({ billid, error }) => {
-      allocationsSummary.map((a) => {
-        if (a.billid !== billid) return a;
-        return { ...a, status: error };
-      });
-    });

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeListener("ap-export-success");
-      socket.removeListener("ap-export-failure");
-      //socket.disconnect();
+      try {
+        await new Promise((resolve, reject) => {
+          socket.emit("clear-dms-session", (response) => {
+            if (response && response.status === "ok") {
+              resolve();
+            } else {
+              reject(new Error("Failed to clear DMS session"));
+            }
+          });
+        });
+      } catch (error) {
+        console.error("Failed to clear DMS session", error);
+      }
    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+
+    socket.on("ap-export-success", handleSuccess);
+
+    return () => {
+      socket.off("ap-export-success", handleSuccess);
+    };
+  }, [socket]);

  useEffect(() => {
-    if (socket.connected) {
+    if (socket && socket.connected) {
      socket.emit("pbs-calculate-allocations-ap", billids, (ack) => {
        setAllocationsSummary(ack);
-
        socket.allocationsSummary = ack;
      });
    }
  }, [socket, socket.connected, billids]);
-  console.log(allocationsSummary);
+
  const columns = [
    {
      title: t("general.labels.status"),
@@ -68,35 +72,40 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
      dataIndex: ["Posting", "Reference"],
      key: "reference"
    },
-
    {
      title: t("jobs.fields.dms.lines"),
      dataIndex: "Lines",
      key: "Lines",
      render: (text, record) => (
        <table style={{ tableLayout: "auto", width: "100%" }}>
-          <tr>
-            <th>{t("bills.fields.invoice_number")}</th>
-            <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
-            <th>{t("jobs.fields.dms.amount")}</th>
-          </tr>
-          {record.Posting.Lines.map((l, idx) => (
-            <tr key={idx}>
-              <td>{l.InvoiceNumber}</td>
-              <td>{l.Account}</td>
-              <td>{l.Amount}</td>
+          <thead>
+            <tr>
+              <th>{t("bills.fields.invoice_number")}</th>
+              <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
+              <th>{t("jobs.fields.dms.amount")}</th>
            </tr>
-          ))}
+          </thead>
+          <tbody>
+            {record.Posting.Lines.map((l, idx) => (
+              <tr key={idx}>
+                <td>{l.InvoiceNumber}</td>
+                <td>{l.Account}</td>
+                <td>{l.Amount}</td>
+              </tr>
+            ))}
+          </tbody>
        </table>
      )
    }
  ];

  const handleFinish = async (values) => {
-    socket.emit(`pbs-export-ap`, {
-      billids,
-      txEnvelope: values
-    });
+    if (socket) {
+      socket.emit("pbs-export-ap", {
+        billids,
+        txEnvelope: values
+      });
+    }
  };

  return (
@@ -105,7 +114,9 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
      extra={
        <Button
          onClick={() => {
-            socket.emit("pbs-calculate-allocations-ap", billids, (ack) => setAllocationsSummary(ack));
+            if (socket) {
+              socket.emit("pbs-calculate-allocations-ap", billids, (ack) => setAllocationsSummary(ack));
+            }
          }}
        >
          <SyncOutlined />
@@ -124,12 +135,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
          name="journal"
          label={t("jobs.fields.dms.journal")}
          initialValue={bodyshop.cdk_configuration && bodyshop.cdk_configuration.default_journal}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
+          rules={[{ required: true }]}
        >
          <Input />
        </Form.Item>
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -24,7 +24,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
  const [allocationsSummary, setAllocationsSummary] = useState([]);

  useEffect(() => {
-    if (socket.connected) {
+    if (socket && socket.connected) {
      socket.emit("cdk-calculate-allocations", jobId, (ack) => {
        setAllocationsSummary(ack);
        socket.allocationsSummary = ack;
--- a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
+++ b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
@@ -1,37 +1,51 @@
 import { Button, Checkbox, Col, Table } from "antd";
-import React, { useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { socket } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { alphaSort } from "../../utils/sorters";
+import SocketContext from "../../contexts/SocketIO/socketContext"; // Import Socket Context

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+const mapDispatchToProps = (dispatch) => ({});
+
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);

 export function DmsCustomerSelector({ bodyshop }) {
  const { t } = useTranslation();
-  const [customerList, setcustomerList] = useState([]);
+  const { socket } = useContext(SocketContext); // Use Socket Context
+  const [customerList, setCustomerList] = useState([]);
  const [open, setOpen] = useState(false);
  const [selectedCustomer, setSelectedCustomer] = useState(null);
  const [dmsType, setDmsType] = useState("cdk");

-  socket.on("cdk-select-customer", (customerList, callback) => {
-    setOpen(true);
-    setDmsType("cdk");
-    setcustomerList(customerList);
-  });
-  socket.on("pbs-select-customer", (customerList, callback) => {
-    setOpen(true);
-    setDmsType("pbs");
-    setcustomerList(customerList);
-  });
+  useEffect(() => {
+    if (socket) {
+      const handleCdkSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("cdk");
+        setCustomerList(customerList);
+      };
+
+      const handlePbsSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("pbs");
+        setCustomerList(customerList);
+      };
+
+      socket.on("cdk-select-customer", handleCdkSelectCustomer);
+      socket.on("pbs-select-customer", handlePbsSelectCustomer);
+
+      // Clean up listeners on unmount
+      return () => {
+        socket.off("cdk-select-customer", handleCdkSelectCustomer);
+        socket.off("pbs-select-customer", handlePbsSelectCustomer);
+      };
+    }
+  }, [socket]);

  const onUseSelected = () => {
    setOpen(false);
@@ -69,17 +83,11 @@ export function DmsCustomerSelector({ bodyshop }) {
      key: "name1",
      sorter: (a, b) => alphaSort(a.name1 && a.name1.fullName, b.name1 && b.name1.fullName)
    },
-
    {
      title: t("jobs.fields.dms.address"),
-      //dataIndex: ["name2", "fullName"],
      key: "address",
-      render: (record, value) =>
-        `${
-          record.address && record.address.addressLine && record.address.addressLine[0]
-        }, ${record.address && record.address.city} ${
-          record.address && record.address.stateOrProvince
-        } ${record.address && record.address.postalCode}`
+      render: (record) =>
+        `${record.address?.addressLine?.[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`
    }
  ];

@@ -95,15 +103,15 @@ export function DmsCustomerSelector({ bodyshop }) {
      sorter: (a, b) => alphaSort(a.LastName, b.LastName),
      render: (text, record) => `${record.FirstName || ""} ${record.LastName || ""}`
    },
-
    {
      title: t("jobs.fields.dms.address"),
      key: "address",
-      render: (record, value) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
+      render: (record) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
    }
  ];

  if (!open) return null;
+
  return (
    <Col span={24}>
      <Table
@@ -125,7 +133,6 @@ export function DmsCustomerSelector({ bodyshop }) {
        columns={dmsType === "cdk" ? cdkColumns : pbsColumns}
        rowKey={(record) => (dmsType === "cdk" ? record.id.value : record.ContactId)}
        dataSource={customerList}
-        //onChange={handleTableChange}
        rowSelection={{
          onSelect: (record) => {
            setSelectedCustomer(dmsType === "cdk" ? record.id.value : record.ContactId);
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -4,11 +4,8 @@ import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";

-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});

 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -17,7 +14,7 @@ const mapDispatchToProps = (dispatch) => ({

 export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);

-export function DmsLogEvents({ socket, logs, bodyshop }) {
+export function DmsLogEvents({ logs }) {
  return (
    <Timeline
      pending
@@ -40,11 +37,13 @@ export function DmsLogEvents({ socket, logs, bodyshop }) {

 function LogLevelHierarchy(level) {
  switch (level) {
+    case "TRACE":
+      return "pink";
    case "DEBUG":
      return "orange";
    case "INFO":
      return "blue";
-    case "WARN":
+    case "WARNING":
      return "yellow";
    case "ERROR":
      return "red";
--- a/client/src/components/eula/eula.component.jsx
+++ b/client/src/components/eula/eula.component.jsx
@@ -8,7 +8,7 @@ import { INSERT_EULA_ACCEPTANCE } from "../../graphql/user.queries";
 import { useMutation } from "@apollo/client";
 import { acceptEula } from "../../redux/user/user.actions";
 import { useTranslation } from "react-i18next";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";

 import "./eula.styles.scss";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
@@ -208,7 +208,7 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
              {
                required: true,
                validator: (_, value) => {
-                  if (dayjs(value).isSame(dayjs(), "day")) {
+                  if (day(value).isSame(day(), "day")) {
                    return Promise.resolve();
                  }
                  return Promise.reject(new Error(t("eula.messages.date_accepted")));
--- a/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
+++ b/client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
@@ -2,38 +2,21 @@ import { DatePicker } from "antd";
 import PropTypes from "prop-types";
 import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import dayjs from "../../utils/day";
 import { fuzzyMatchDate } from "./formats.js";

-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-const DateTimePicker = ({
-  value,
-  onChange,
-  onBlur,
-  id,
-  onlyFuture,
-  onlyToday,
-  isDateOnly = false,
-  bodyshop,
-  ...restProps
-}) => {
+const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, onlyToday, isDateOnly = false, ...restProps }) => {
  const [isManualInput, setIsManualInput] = useState(false);
  const { t } = useTranslation();

  const handleChange = useCallback(
    (newDate) => {
      if (onChange) {
-        onChange(bodyshop?.timezone && newDate ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
+        onChange(newDate || null);
      }
      setIsManualInput(false);
    },
-    [onChange, bodyshop?.timezone]
+    [onChange]
  );

  const handleBlur = useCallback(
@@ -119,4 +102,4 @@ DateTimePicker.propTypes = {
  isDateOnly: PropTypes.bool
 };

-export default connect(mapStateToProps, null)(DateTimePicker);
+export default React.memo(DateTimePicker);
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -3,15 +3,13 @@ import axios from "axios";
 import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";

 export default function GlobalSearchOs() {
  const { t } = useTranslation();
-  const navigate = useNavigate();
-
  const [loading, setLoading] = useState(false);
  const [data, setData] = useState(false);

@@ -179,18 +177,7 @@ export default function GlobalSearchOs() {
  };

  return (
-    <AutoComplete
-      options={data}
-      onSearch={handleSearch}
-      onKeyDown={(e) => {
-        if (e.key !== "Enter") return;
-        const firstUrlForSearch = data?.[0]?.options?.[0]?.label?.props?.to;
-        if (!firstUrlForSearch) return;
-        navigate(firstUrlForSearch);
-      }}
-      defaultActiveFirstOption
-      onClear={() => setData([])}
-    >
+    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
      <Input.Search
        size="large"
        placeholder={t("general.labels.globalsearch")}
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -3,7 +3,7 @@ import { AutoComplete, Divider, Input, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
@@ -13,7 +13,6 @@ import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.compon
 export default function GlobalSearch() {
  const { t } = useTranslation();
  const [callSearch, { loading, error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY);
-  const navigate = useNavigate();

  const executeSearch = (v) => {
    if (v && v.variables.search && v.variables.search !== "" && v.variables.search.length >= 3) callSearch(v);
@@ -21,6 +20,7 @@ export default function GlobalSearch() {
  const debouncedExecuteSearch = _.debounce(executeSearch, 750);

  const handleSearch = (value) => {
+    console.log("Handle Search");
    debouncedExecuteSearch({ variables: { search: value } });
  };

@@ -156,17 +156,7 @@ export default function GlobalSearch() {
  if (error) return <AlertComponent message={error.message} type="error" />;

  return (
-    <AutoComplete
-      options={options}
-      onSearch={handleSearch}
-      defaultActiveFirstOption
-      onKeyDown={(e) => {
-        if (e.key !== "Enter") return;
-        const firstUrlForSearch = options?.[0]?.options?.[0]?.label?.props?.to;
-        if (!firstUrlForSearch) return;
-        navigate(firstUrlForSearch);
-      }}
-    >
+    <AutoComplete options={options} onSearch={handleSearch} defaultActiveFirstOption>
      <Input.Search
        size="large"
        placeholder={t("general.labels.globalsearch")}
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -116,15 +116,18 @@ function Header({

  const { t } = useTranslation();

-  // const deleteBetaCookie = () => {
-  //   const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
-  //   if (cookieExists) {
-  //     const domain = window.location.hostname.split(".").slice(-2).join(".");
-  //     document.cookie = `betaSwitchImex=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
-  //   }
-  // };
-  //
-  // deleteBetaCookie();
+  const deleteBetaCookie = () => {
+    const cookieExists = document.cookie.split("; ").some((row) => row.startsWith(`betaSwitchImex=`));
+    if (cookieExists) {
+      const domain = window.location.hostname.split(".").slice(-2).join(".");
+      document.cookie = `betaSwitchImex=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=.${domain}`;
+      console.log(`betaSwitchImex cookie deleted`);
+    } else {
+      console.log(`betaSwitchImex cookie does not exist`);
+    }
+  };
+
+  deleteBetaCookie();

  const accountingChildren = [];

--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -23,7 +23,6 @@ import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
 import { useMutation } from "@apollo/client";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
-import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -128,9 +127,6 @@ export function ScheduleEventComponent({
            {(event.job && event.job.alt_transport) || ""}
            <ScheduleAtChange job={event && event.job} />
          </DataLabel>
-          <DataLabel label={t("jobs.fields.comment")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
-            <ProductionListColumnComment record={event && event.job} />
-          </DataLabel>
          <ScheduleEventNote event={event} />
        </div>
      ) : (
@@ -320,7 +316,6 @@ export function ScheduleEventComponent({
      })`}

      {event.job && event.job.alt_transport && <div style={{ margin: ".1rem" }}>{event.job.alt_transport}</div>}
-      {event?.job?.comment && `C: ${event.job.comment}`}
    </Space>
  ) : (
    <div
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from "react";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import axios from "axios";
 import { Badge, Card, Space, Table, Tag } from "antd";
 import { gql, useQuery } from "@apollo/client";
@@ -72,7 +72,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
      dataIndex: "start",
      key: "start",
      render: (text) => DateTimeFormatterFunction(text),
-      sorter: (a, b) => dayjs(a.start).unix() - dayjs(b.start).unix()
+      sorter: (a, b) => day(a.start).unix() - day(b.start).unix()
    },
    {
      title: t("job_lifecycle.columns.relative_start"),
@@ -90,7 +90,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) {
          }
          return isEmpty(a.end) ? 1 : -1;
        }
-        return dayjs(a.end).unix() - dayjs(b.end).unix();
+        return day(a.end).unix() - day(b.end).unix();
      },
      render: (text) => (isEmpty(text) ? t("job_lifecycle.content.not_available") : DateTimeFormatterFunction(text))
    },
--- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
+++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
@@ -2,7 +2,7 @@ import React, { useState } from "react";

 import { useMutation } from "@apollo/client";
 import { Button, Form, notification, Popover, Select, Space } from "antd";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -48,7 +48,7 @@ export function JobLineDispatchButton({
      const result = await dispatchLines({
        variables: {
          partsDispatch: {
-            dispatched_at: dayjs(),
+            dispatched_at: day(),
            employeeid: values.employeeid,
            jobid: job.id,
            dispatched_by: currentUser.email,
@@ -138,11 +138,7 @@ export function JobLineDispatchButton({

  return (
    <Popover open={visible} content={popMenu}>
-      <Button
-        disabled={selectedLines.length === 0 || jobRO || disabled}
-        loading={loading}
-        onClick={() => setVisible(true)}
-      >
+      <Button disabled={selectedLines.length === 0 || jobRO || disabled} loading={loading} onClick={() => setVisible(true)}>
        {t("joblines.actions.dispatchparts", { count: selectedLines.length })}
      </Button>
    </Popover>
--- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx
+++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx
@@ -1,8 +1,5 @@
 import { useMutation } from "@apollo/client";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { notification } from "antd";
-import Axios from "axios";
-import Dinero from "dinero.js";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -10,10 +7,13 @@ import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_JOB_LINE, UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import CriticalPartsScan from "../../utils/criticalPartsScan";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
+import Axios from "axios";
+import Dinero from "dinero.js";
+import CriticalPartsScan from "../../utils/criticalPartsScan";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";

 const mapStateToProps = createStructuredSelector({
  jobLineEditModal: selectJobLineEditModal,
@@ -82,15 +82,13 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
        variables: {
          lineId: jobLineEditModal.context.id,
          line: {
-            ...UndefinedToNull({
-              ...values,
-              prt_dsmk_m: Dinero({
-                amount: Math.round(values.act_price * 100)
-              })
-                .percentage(Math.abs(values.prt_dsmk_p || 0))
-                .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
-                .toFormat(0.0)
+            ...values,
+            prt_dsmk_m: Dinero({
+              amount: Math.round(values.act_price * 100)
            })
+              .percentage(Math.abs(values.prt_dsmk_p || 0))
+              .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+              .toFormat(0.0)
          }
        },
        refetchQueries: ["GET_LINE_TICKET_BY_PK"]
--- a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
+++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
@@ -219,7 +219,7 @@ export function JobsExportAllButton({
  };

  return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled || jobIds?.length > 10}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {t("jobs.actions.exportselected")}
    </Button>
  );
--- a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
+++ b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Col, notification, Row, Table } from "antd";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_PARTS_DISPATCH_LINE } from "../../graphql/parts-dispatch.queries";
@@ -11,7 +11,7 @@ export default function PartsDispatchExpander({ dispatch, job }) {
  const [updateDispatchLine] = useMutation(UPDATE_PARTS_DISPATCH_LINE);

  const handleAccept = async ({ partsDispatchLineId }) => {
-    const accepted_at = dayjs();
+    const accepted_at = day();
    const result = await updateDispatchLine({
      variables: { id: partsDispatchLineId, line: { accepted_at } },
      optimisticResponse: {
--- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
+++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
@@ -242,8 +242,7 @@ export function PartsOrderListTableComponent({
      title: t("general.labels.actions"),
      dataIndex: "actions",
      key: "actions",
-      render: (text, record) => recordActions(record, true),
-      id: "parts-order-list-table-actions"
+      render: (text, record) => recordActions(record, true)
    }
  ];

--- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
+++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
@@ -200,7 +200,7 @@ export function PayableExportAll({
    );

  return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled || billids?.length > 10}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {t("jobs.actions.exportselected")}
    </Button>
  );
--- a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
+++ b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
@@ -180,7 +180,7 @@ export function PaymentsExportAllButton({
  };

  return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled || paymentIds?.length > 10}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {t("jobs.actions.exportselected")}
    </Button>
  );
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -1,14 +1,12 @@
 import { SyncOutlined } from "@ant-design/icons";
-import { PageHeader } from "@ant-design/pro-layout";
 import { useApolloClient } from "@apollo/client";
+import Board from "./trello-board/index";
 import { Button, notification, Skeleton, Space } from "antd";
-import cloneDeep from "lodash/cloneDeep";
-import isEqual from "lodash/isEqual";
+import { PageHeader } from "@ant-design/pro-layout";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { generate_UPDATE_JOB_KANBAN } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -17,13 +15,14 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import IndefiniteLoading from "../indefinite-loading/indefinite-loading.component";
 import ProductionBoardFilters from "../production-board-filters/production-board-filters.component";
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
-import ProductionListPrint from "../production-list-table/production-list-print.component.jsx";
 import CardColorLegend from "./production-board-kanban-card-color-legend.component.jsx";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import { defaultFilters, mergeWithDefaults } from "./settings/defaultKanbanSettings.js";
 import ProductionBoardKanbanSettings from "./settings/production-board-kanban.settings.component.jsx";
-import Board from "./trello-board/index";
+import cloneDeep from "lodash/cloneDeep";
+import isEqual from "lodash/isEqual";
+import { defaultFilters, mergeWithDefaults } from "./settings/defaultKanbanSettings.js";
+import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -186,7 +185,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
  const cardSettings = useMemo(() => {
    const kanbanSettings = associationSettings?.kanban_settings;
    return mergeWithDefaults(kanbanSettings);
-  }, [associationSettings?.kanban_settings]);
+  }, [associationSettings]);

  const handleSettingsChange = () => {
    setFilter(defaultFilters);
@@ -215,7 +214,6 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
              bodyshop={bodyshop}
              data={data}
            />
-            <ProductionListPrint />
          </Space>
        }
      />
--- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.container.jsx
@@ -1,9 +1,8 @@
-import React, { useContext, useEffect, useMemo, useRef } from "react";
-import { useApolloClient, useQuery, useSubscription } from "@apollo/client";
+import React, { useEffect, useMemo, useRef } from "react";
+import { useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
-  QUERY_EXACT_JOB_IN_PRODUCTION,
  QUERY_JOBS_IN_PRODUCTION,
  SUBSCRIPTION_JOBS_IN_PRODUCTION,
  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
@@ -11,8 +10,6 @@ import {
 import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -20,20 +17,7 @@ const mapStateToProps = createStructuredSelector({
 });

 function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
-  const fired = useRef(false);
-  const client = useApolloClient();
-  const { socket } = useContext(SocketContext); // Get the socket from context
-  const reconnectTimeout = useRef(null); // To store the reconnect timeout
-  const disconnectTime = useRef(null); // To track disconnection time
-  const acceptableReconnectTime = 2000; // 2 seconds threshold
-
-  const {
-    treatments: { Websocket_Production }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Websocket_Production"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
+  const fired = useRef(false); // useRef to keep track of whether the subscription fired

  const combinedStatuses = useMemo(
    () => [
@@ -50,12 +34,9 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionTyp
    onError: (error) => console.error(`Error fetching jobs in production: ${error.message}`)
  });

-  const subscriptionEnabled = Websocket_Production?.treatment === "off";
-
  const { data: updatedJobs } = useSubscription(
    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
    {
-      skip: !subscriptionEnabled,
      onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
    }
  );
@@ -65,112 +46,23 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionTyp
    onError: (error) => console.error(`Error fetching Kanban settings: ${error.message}`)
  });

-  useEffect(() => {
-    if (subscriptionEnabled) {
-      if (!updatedJobs) {
-        return;
-      }
-      if (!fired.current) {
-        fired.current = true;
-        return;
-      }
-      refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
-    }
-  }, [updatedJobs, refetch, subscriptionEnabled]);
+  // This provides us the current version of the Lanes from the Redux store
+  // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));

-  // Socket.IO implementation for users with Split treatment "off"
  useEffect(() => {
-    if (subscriptionEnabled || !socket || !bodyshop || !bodyshop.id) {
+    if (!updatedJobs) {
      return;
    }
-
-    const handleJobUpdates = async (jobChangedData) => {
-      const jobId = jobChangedData.id;
-
-      // Access the existing cache for QUERY_JOBS_IN_PRODUCTION
-      const existingJobsCache = client.readQuery({
-        query: QUERY_JOBS_IN_PRODUCTION
-      });
-
-      const existingJobs = existingJobsCache?.jobs || [];
-
-      // Check if the job already exists in the cached jobs
-      const existingJob = existingJobs.find((job) => job.id === jobId);
-
-      if (existingJob) {
-        // If the job exists, we update the cache without making any additional queries
-        client.writeQuery({
-          query: QUERY_JOBS_IN_PRODUCTION,
-          data: {
-            jobs: existingJobs.map((job) =>
-              job.id === jobId ? { ...existingJob, ...jobChangedData, __typename: "jobs" } : job
-            )
-          }
-        });
-      } else {
-        // If the job doesn't exist, fetch it from the server and then add it to the cache
-        try {
-          const { data: jobData } = await client.query({
-            query: QUERY_EXACT_JOB_IN_PRODUCTION,
-            variables: { id: jobId },
-            fetchPolicy: "network-only"
-          });
-
-          // Add the job to the existing cached jobs
-          client.writeQuery({
-            query: QUERY_JOBS_IN_PRODUCTION,
-            data: {
-              jobs: [...existingJobs, { ...jobData.job, __typename: "jobs" }]
-            }
-          });
-        } catch (error) {
-          console.error(`Error fetching job ${jobId}: ${error.message}`);
-        }
-      }
-    };
-
-    const handleDisconnect = () => {
-      // Capture the disconnection time
-      disconnectTime.current = Date.now();
-    };
-
-    const handleReconnect = () => {
-      const reconnectTime = Date.now();
-      const disconnectionDuration = reconnectTime - disconnectTime.current;
-
-      // Only refetch if disconnection was longer than the acceptable reconnect time
-      if (disconnectionDuration >= acceptableReconnectTime) {
-        if (!reconnectTimeout.current) {
-          reconnectTimeout.current = setTimeout(() => {
-            const randomDelay = Math.floor(Math.random() * (30000 - 10000 + 1)) + 10000; // Random delay between 10 and 30 seconds
-            setTimeout(() => {
-              if (refetch) refetch().catch((err) => console.error(`Issue `));
-              reconnectTimeout.current = null; // Clear the timeout reference after refetch
-            }, randomDelay);
-          }, acceptableReconnectTime);
-        }
-      }
-    };
-
-    // Listen for 'job-changed', 'disconnect', and 'connect' events
-    socket.on("production-job-updated", handleJobUpdates);
-    socket.on("disconnect", handleDisconnect);
-    socket.on("connect", handleReconnect);
-
-    // Clean up on unmount or when dependencies change
-    return () => {
-      socket.off("production-job-updated", handleJobUpdates);
-      socket.off("disconnect", handleDisconnect);
-      socket.off("connect", handleReconnect);
-      if (reconnectTimeout.current) {
-        clearTimeout(reconnectTimeout.current);
-      }
-    };
-  }, [subscriptionEnabled, socket, bodyshop, client, refetch]);
+    if (!fired.current) {
+      fired.current = true;
+      return;
+    }
+    refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+  }, [updatedJobs, refetch]);

  const filteredAssociationSettings = useMemo(() => {
    return associationSettings?.associations[0] || null;
-  }, [associationSettings?.associations]);
+  }, [associationSettings]);

  return (
    <ProductionBoardKanbanComponent
--- a/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
+++ b/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
@@ -1,66 +1,15 @@
-import InstanceRenderManager from "../../../utils/instanceRenderMgr.js";
-
 const statisticsItems = [
  { id: 0, name: "totalHrs", label: "total_hours_in_production" },
  { id: 1, name: "totalAmountInProduction", label: "total_amount_in_production" },
  { id: 2, name: "totalLAB", label: "total_lab_in_production" },
  { id: 3, name: "totalLAR", label: "total_lar_in_production" },
  { id: 4, name: "jobsInProduction", label: "jobs_in_production" },
-
-  {
-    id: 5,
-    name: "totalHrsOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_hours_in_view",
-      rome: "total_hours_on_board",
-      promanager: "total_hours_on_board"
-    })
-  },
-  {
-    id: 6,
-    name: "totalAmountOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_amount_in_view",
-      rome: "total_amount_on_board",
-      promanager: "total_amount_on_board"
-    })
-  },
-  {
-    id: 7,
-    name: "totalLABOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_lab_in_view",
-      rome: "total_lab_on_board",
-      promanager: "total_lab_on_board"
-    })
-  },
-  {
-    id: 8,
-    name: "totalLAROnBoard",
-    label: InstanceRenderManager({
-      imex: "total_lar_in_view",
-      rome: "total_lar_on_board",
-      promanager: "total_lar_on_board"
-    })
-  },
-  {
-    id: 9,
-    name: "jobsOnBoard",
-    label: InstanceRenderManager({
-      imex: "total_jobs_in_view",
-      rome: "total_jobs_on_board",
-      promanager: "total_jobs_on_board"
-    })
-  },
-  {
-    id: 10,
-    name: "tasksOnBoard",
-    label: InstanceRenderManager({
-      imex: "tasks_in_view",
-      rome: "tasks_on_board",
-      promanager: "tasks_on_board"
-    })
-  },
+  { id: 5, name: "totalHrsOnBoard", label: "total_hours_on_board" },
+  { id: 6, name: "totalAmountOnBoard", label: "total_amount_on_board" },
+  { id: 7, name: "totalLABOnBoard", label: "total_lab_on_board" },
+  { id: 8, name: "totalLAROnBoard", label: "total_lar_on_board" },
+  { id: 9, name: "jobsOnBoard", label: "total_jobs_on_board" },
+  { id: 10, name: "tasksOnBoard", label: "tasks_on_board" },
  { id: 11, name: "tasksInProduction", label: "tasks_in_production" }
 ];

--- a/client/src/components/production-list-columns/production-list-columns.status.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.status.component.jsx
@@ -21,26 +21,25 @@ export function ProductionListColumnStatus({ record, bodyshop, insertAuditTrail
  const [loading, setLoading] = useState(false);

  const handleSetStatus = async (e) => {
-    if (bodyshop.md_ro_statuses.production_statuses.includes(record.status) && !bodyshop.md_ro_statuses.post_production_statuses.includes(record.status)) {
-      logImEXEvent("production_change_status");
-      //    e.stopPropagation();
-      setLoading(true);
-      const { key } = e;
-      await updateJob({
-        variables: {
-          jobId: record.id,
-          job: {
-            status: key
-          }
+    logImEXEvent("production_change_status");
+    //    e.stopPropagation();
+    setLoading(true);
+    const { key } = e;
+    await updateJob({
+      variables: {
+        jobId: record.id,
+        job: {
+          status: key
        }
-      });
-      insertAuditTrail({
-        jobid: record.id,
-        operation: AuditTrailMapping.jobstatuschange(key),
-        type: "jobstatuschange"
-      });
-      setLoading(false);
-    }
+      }
+    });
+    insertAuditTrail({
+      jobid: record.id,
+      operation: AuditTrailMapping.jobstatuschange(key),
+      type: "jobstatuschange"
+    });
+
+    setLoading(false);
  };

  const menu = {
--- a/client/src/components/production-list-table/production-list-config-manager.component.jsx
+++ b/client/src/components/production-list-table/production-list-config-manager.component.jsx
@@ -457,42 +457,41 @@ export function ProductionListConfigManager({
          value={activeView}
          disabled={open || isAddingNewProfile} // Disable the Select box when the popover is open or adding a new profile
        >
-          {bodyshop?.production_config &&
-            bodyshop.production_config
-              .slice()
-              .sort((a, b) =>
-                a.name === t("production.constants.main_profile")
-                  ? -1
-                  : b.name === t("production.constants.main_profile")
-                    ? 1
-                    : 0
-              ) //
-              .map((config) => (
-                <Select.Option key={config.name} label={config.name}>
-                  <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
-                    <span
-                      style={{
-                        flex: 1,
-                        maxWidth: "80%",
-                        marginRight: "1rem",
-                        textOverflow: "ellipsis"
-                      }}
+          {bodyshop.production_config
+            .slice()
+            .sort((a, b) =>
+              a.name === t("production.constants.main_profile")
+                ? -1
+                : b.name === t("production.constants.main_profile")
+                  ? 1
+                  : 0
+            ) //
+            .map((config) => (
+              <Select.Option key={config.name} label={config.name}>
+                <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center" }}>
+                  <span
+                    style={{
+                      flex: 1,
+                      maxWidth: "80%",
+                      marginRight: "1rem",
+                      textOverflow: "ellipsis"
+                    }}
+                  >
+                    {config.name}
+                  </span>
+                  {config.name !== t("production.constants.main_profile") && (
+                    <Popconfirm
+                      placement="right"
+                      title={t("general.labels.areyousure")}
+                      onConfirm={() => handleTrash(config.name)}
+                      onCancel={(e) => e.stopPropagation()}
                    >
-                      {config.name}
-                    </span>
-                    {config.name !== t("production.constants.main_profile") && (
-                      <Popconfirm
-                        placement="right"
-                        title={t("general.labels.areyousure")}
-                        onConfirm={() => handleTrash(config.name)}
-                        onCancel={(e) => e.stopPropagation()}
-                      >
-                        <DeleteOutlined onClick={(e) => e.stopPropagation()} />
-                      </Popconfirm>
-                    )}
-                  </div>
-                </Select.Option>
-              ))}
+                      <DeleteOutlined onClick={(e) => e.stopPropagation()} />
+                    </Popconfirm>
+                  )}
+                </div>
+              </Select.Option>
+            ))}
          <Select.Option key="add_new" label={t("production.labels.addnewprofile")}>
            <div style={{ display: "flex", alignItems: "center" }}>
              <PlusOutlined style={{ marginRight: "0.5rem" }} />
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -51,8 +51,8 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici

  const initialColumnsRef = useRef(
    (initialStateRef.current &&
-      bodyshop?.production_config
-        ?.find((p) => p.name === defaultView)
+      bodyshop.production_config
+        .find((p) => p.name === defaultView)
        ?.columns.columnKeys.map((k) => {
          return {
            ...ProductionListColumns({
@@ -76,7 +76,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
  const { t } = useTranslation();

  const matchingColumnConfig = useMemo(() => {
-    return bodyshop?.production_config?.find((p) => p.name === defaultView);
+    return bodyshop.production_config.find((p) => p.name === defaultView);
  }, [bodyshop.production_config, defaultView]);

  useEffect(() => {
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/client/src/components/production-list-table/production-list-table.container.jsx
@@ -1,5 +1,5 @@
 import { useApolloClient, useQuery, useSubscription } from "@apollo/client";
-import React, { useContext, useEffect, useState, useRef } from "react";
+import React, { useEffect, useState } from "react";
 import {
  QUERY_EXACT_JOB_IN_PRODUCTION,
  QUERY_EXACT_JOBS_IN_PRODUCTION,
@@ -9,46 +9,19 @@ import {
 } from "../../graphql/jobs.queries";
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";

-export default function ProductionListTableContainer({ bodyshop, subscriptionType = "direct" }) {
-  const client = useApolloClient();
-  const { socket } = useContext(SocketContext);
-  const [joblist, setJoblist] = useState([]);
-  const reconnectTimeout = useRef(null); // To store the reconnect timeout
-  const disconnectTime = useRef(null); // To store the time of disconnection
-
-  const acceptableReconnectTime = 2000; // 2 seconds threshold
-
-  // Get Split treatment
-  const {
-    treatments: { Websocket_Production }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Websocket_Production"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
-
-  // Determine if subscription is enabled
-  const subscriptionEnabled = Websocket_Production?.treatment === "off";
-
-  // Use GraphQL query
+export default function ProductionListTableContainer({ subscriptionType = "direct" }) {
  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
    pollInterval: 3600000,
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
-
-  // Use GraphQL subscription when subscription is enabled
+  const client = useApolloClient();
+  const [joblist, setJoblist] = useState([]);
  const { data: updatedJobs } = useSubscription(
-    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
-    {
-      skip: !subscriptionEnabled
-    }
+    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION
  );

-  // Update joblist when data changes
  useEffect(() => {
    if (!(data && data.jobs)) return;
    setJoblist(
@@ -58,134 +31,34 @@ export default function ProductionListTableContainer({ bodyshop, subscriptionTyp
    );
  }, [data]);

-  // Handle updates from GraphQL subscription
  useEffect(() => {
-    if (subscriptionEnabled) {
-      if (!updatedJobs || joblist.length === 0) return;
+    if (!updatedJobs || joblist.length === 0) return;

-      const jobDiff = _.differenceWith(
-        joblist,
-        updatedJobs.jobs,
-        (a, b) => a.id === b.id && a.updated_at === b.updated_at
-      );
+    const jobDiff = _.differenceWith(
+      joblist,
+      updatedJobs.jobs,
+      (a, b) => a.id === b.id && a.updated_at === b.updated_at
+    );

-      if (jobDiff.length > 1) {
-        getUpdatedJobsData(jobDiff.map((j) => j.id));
-      } else if (jobDiff.length === 1) {
-        jobDiff.forEach((job) => {
-          getUpdatedJobData(job.id);
-        });
-      }
-
-      setJoblist(updatedJobs.jobs);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [updatedJobs, subscriptionEnabled]);
-
-  // Handle updates from Socket.IO when subscription is disabled
-  useEffect(() => {
-    if (subscriptionEnabled || !socket || !bodyshop || !bodyshop.id) {
-      return;
-    }
-
-    const handleJobUpdates = async (jobChangedData) => {
-      const jobId = jobChangedData.id;
-
-      // Access the existing cache for QUERY_JOBS_IN_PRODUCTION
-      const existingJobsCache = client.readQuery({
-        query: QUERY_JOBS_IN_PRODUCTION
+    if (jobDiff.length > 1) {
+      getUpdatedJobsData(jobDiff.map((j) => j.id));
+    } else if (jobDiff.length === 1) {
+      jobDiff.forEach((job) => {
+        getUpdatedJobData(job.id);
      });
+    }

-      const existingJobs = existingJobsCache?.jobs || [];
+    setJoblist(updatedJobs.jobs);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [updatedJobs]);

-      // Check if the job already exists in the cached jobs
-      const existingJob = existingJobs.find((job) => job.id === jobId);
-
-      if (existingJob) {
-        // If the job exists, we update the cache without making any additional queries
-        client.writeQuery({
-          query: QUERY_JOBS_IN_PRODUCTION,
-          data: {
-            jobs: existingJobs.map((job) =>
-              job.id === jobId ? { ...existingJob, ...jobChangedData, __typename: "jobs" } : job
-            )
-          }
-        });
-      } else {
-        // If the job doesn't exist, fetch it from the server and then add it to the cache
-        try {
-          const { data: jobData } = await client.query({
-            query: QUERY_EXACT_JOB_IN_PRODUCTION,
-            variables: { id: jobId },
-            fetchPolicy: "network-only"
-          });
-
-          // Add the job to the existing cached jobs
-          client.writeQuery({
-            query: QUERY_JOBS_IN_PRODUCTION,
-            data: {
-              jobs: [...existingJobs, { ...jobData.job, __typename: "jobs" }]
-            }
-          });
-        } catch (error) {
-          console.error(`Error fetching job ${jobId}: ${error.message}`);
-        }
-      }
-    };
-
-    const handleDisconnect = () => {
-      // Capture the time when the disconnection happens
-      disconnectTime.current = Date.now();
-    };
-
-    const handleReconnect = () => {
-      // Calculate how long the disconnection lasted
-      const reconnectTime = Date.now();
-      const disconnectionDuration = reconnectTime - disconnectTime.current;
-
-      // If disconnection lasted less than acceptable reconnect time, do nothing
-      if (disconnectionDuration < acceptableReconnectTime) {
-        return;
-      }
-
-      // Schedule a refetch with a random delay between 10 and 30 seconds
-      if (!reconnectTimeout.current) {
-        reconnectTimeout.current = setTimeout(() => {
-          const randomDelay = Math.floor(Math.random() * (30000 - 10000 + 1)) + 10000; // Random delay between 10 and 30 seconds
-          setTimeout(() => {
-            if (refetch) refetch();
-            reconnectTimeout.current = null; // Clear the timeout reference after refetch
-          }, randomDelay);
-        }, acceptableReconnectTime);
-      }
-    };
-
-    // Listen for 'production-job-updated', 'disconnect', and 'connect' events
-    socket.on("production-job-updated", handleJobUpdates);
-    socket.on("disconnect", handleDisconnect);
-    socket.on("connect", handleReconnect);
-
-    // Clean up on unmount or when dependencies change
-    return () => {
-      socket.off("production-job-updated", handleJobUpdates);
-      socket.off("disconnect", handleDisconnect);
-      socket.off("connect", handleReconnect);
-      if (reconnectTimeout.current) {
-        clearTimeout(reconnectTimeout.current);
-      }
-    };
-  }, [subscriptionEnabled, socket, bodyshop, client, refetch]);
-
-  // Functions to fetch updated job data
  const getUpdatedJobData = async (jobId) => {
-    await client.query({
+    client.query({
      query: QUERY_EXACT_JOB_IN_PRODUCTION,
-      variables: { id: jobId },
-      fetchPolicy: "network-only"
+      variables: { id: jobId }
    });
  };
-
-  const getUpdatedJobsData = (jobIds) => {
+  const getUpdatedJobsData = async (jobIds) => {
    client.query({
      query: QUERY_EXACT_JOBS_IN_PRODUCTION,
      variables: { ids: jobIds }
--- a/client/src/components/schedule-calendar-wrapper/localizer.js
+++ b/client/src/components/schedule-calendar-wrapper/localizer.js
@@ -120,6 +120,14 @@ var formats = {
 };

 const localizer = (dayjsLib) => {
+  // load dayjs plugins
+  dayjsLib.extend(isBetween);
+  dayjsLib.extend(isSameOrAfter);
+  dayjsLib.extend(isSameOrBefore);
+  dayjsLib.extend(localeData);
+  dayjsLib.extend(localizedFormat);
+  dayjsLib.extend(minMax);
+  dayjsLib.extend(utc);
  var locale = function locale(dj, c) {
    return c ? dj.locale(c) : dj;
  };
@@ -128,8 +136,7 @@ const localizer = (dayjsLib) => {
  // then use the timezone aware version

  //TODO This was the issue entirely...
-  // var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
-
+  //  var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
  var dayjs = dayjsLib;

  function getTimezoneOffset(date) {
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -20,7 +20,6 @@ const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  problemJobs: selectProblemJobs
 });
-
 const localizer = local(dayjs);

 export function ScheduleCalendarWrapperComponent({
--- a/client/src/components/scoreboard-display/scoreboard-display.component.jsx
+++ b/client/src/components/scoreboard-display/scoreboard-display.component.jsx
@@ -4,12 +4,12 @@ import ScoreboardChart from "../scoreboard-chart/scoreboard-chart.component";
 import ScoreboardLastDays from "../scoreboard-last-days/scoreboard-last-days.component";
 import ScoreboardTargetsTable from "../scoreboard-targets-table/scoreboard-targets-table.component";

-import { useApolloClient, useQuery } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { GET_BLOCKED_DAYS, QUERY_SCOREBOARD } from "../../graphql/scoreboard.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
+import { useApolloClient, useQuery } from "@apollo/client";
+import { GET_BLOCKED_DAYS, QUERY_SCOREBOARD } from "../../graphql/scoreboard.queries";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -26,7 +26,7 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
      start: dayjs().startOf("month"),
      end: dayjs().endOf("month")
    },
-    pollInterval: 60000*5
+    pollInterval: 60000
  });

  const { data } = scoreboardSubscription;
--- a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx
+++ b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx
@@ -1,13 +1,13 @@
 import { useQuery } from "@apollo/client";
 import { Col, Row } from "antd";
 import _ from "lodash";
+import dayjs from "../../utils/day";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { QUERY_TIME_TICKETS_IN_RANGE_SB } from "../../graphql/timetickets.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import dayjs from "../../utils/day";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
@@ -86,7 +86,7 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
    },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
-    pollInterval: 60000*5,
+    pollInterval: 60000,
    skip: !fixedPeriods
  });

--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
@@ -1,11 +1,11 @@
 import { useQuery } from "@apollo/client";
 import { Col, Row } from "antd";
 import _ from "lodash";
+import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React, { useMemo } from "react";
 import { useLocation } from "react-router-dom";
 import { QUERY_TIME_TICKETS_IN_RANGE_SB } from "../../graphql/timetickets.queries";
-import dayjs from "../../utils/day";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
@@ -68,7 +68,7 @@ export default function ScoreboardTimeTickets() {
    },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
-    pollInterval: 60000*5,
+    pollInterval: 60000,
    skip: !fixedPeriods
  });

--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -1,3 +1,10 @@
+import { Button, Card, Space, Switch, Table } from "antd";
+import queryString from "query-string";
+import React, { useCallback, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import { pageLimit } from "../../utils/config";
+import dayjs from "../../utils/day";
 import {
  CheckCircleFilled,
  CheckCircleOutlined,
@@ -8,16 +15,9 @@ import {
  PlusCircleFilled,
  SyncOutlined
 } from "@ant-design/icons";
-import { Button, Card, Space, Switch, Table } from "antd";
-import queryString from "query-string";
-import React, { useCallback, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { pageLimit } from "../../utils/config";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter.jsx";
-import dayjs from "../../utils/day";
+import { connect } from "react-redux";
+import { setModalContext } from "../../redux/modals/modals.actions";

 /**
 * Task List Component
@@ -140,17 +140,6 @@ function TaskListComponent({
    render: (text, record) => <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
  });

-  columns.push({
-    title: t("tasks.fields.created_by"),
-    dataIndex: "created_by",
-    key: "created_by",
-    width: "8%",
-    defaultSortOrder: "descend",
-    sorter: true,
-    sortOrder: sortcolumn === "created_by" && sortorder,
-    render: (text, record) => record.created_by
-  });
-
  if (!onlyMine) {
    columns.push({
      title: t("tasks.fields.assigned_to"),
@@ -166,70 +155,65 @@ function TaskListComponent({
    });
  }

-  columns.push({
-    title: t("tasks.fields.related_items"),
-    key: "related_items",
-    width: "12%",
-    render: (text, record) => {
-      const items = [];
-
-      // Job
-      if (showRo && record.job) {
-        items.push(
-          <Link key="job" to={`/manage/jobs/${record.job.id}?tab=tasks`}>
-            {t("tasks.fields.job.ro_number")}: {record.job.ro_number}
-          </Link>
-        );
-      }
-      if (showRo && !record.job) {
-        items.push(`${t("tasks.fields.job.ro_number")}: ${t("general.labels.na")}`);
-      }
-
-      // Jobline
-      if (record.jobline?.line_desc) {
-        items.push(
-          <span key="jobline">
-            {t("tasks.fields.jobline")}: {record.jobline.line_desc}
-          </span>
-        );
-      }
-
-      // Parts Order
-      if (record.parts_order) {
-        const { order_number, vendor } = record.parts_order;
-        const partsOrderText =
-          order_number && vendor?.name ? `${order_number} - ${vendor.name}` : t("general.labels.na");
-        items.push(
-          <Link
-            key="parts_order"
-            to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}
-          >
-            {t("tasks.fields.parts_order")}: {partsOrderText}
-          </Link>
-        );
-      }
-
-      // Bill
-      if (record.bill) {
-        const { invoice_number, vendor } = record.bill;
-        const billText = invoice_number && vendor?.name ? `${invoice_number} - ${vendor.name}` : t("general.labels.na");
-        items.push(
-          <Link key="bill" to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
-            {t("tasks.fields.bill")}: {billText}
-          </Link>
-        );
-      }
-
-      return items.length > 0 ? <Space direction="vertical">{items}</Space> : null;
-    }
-  });
+  if (showRo) {
+    columns.push({
+      title: t("tasks.fields.job.ro_number"),
+      dataIndex: ["job", "ro_number"],
+      key: "job.ro_number",
+      width: "8%",
+      render: (text, record) =>
+        record.job ? (
+          <Link to={`/manage/jobs/${record.job.id}?tab=tasks`}>{record.job.ro_number || t("general.labels.na")}</Link>
+        ) : (
+          t("general.labels.na")
+        )
+    });
+  }

  columns.push(
+    {
+      title: t("tasks.fields.jobline"),
+      dataIndex: ["jobline", "id"],
+      key: "jobline.id",
+      width: "8%",
+      render: (text, record) => record?.jobline?.line_desc || ""
+    },
+    {
+      title: t("tasks.fields.parts_order"),
+      dataIndex: ["parts_order", "id"],
+      key: "part_order.id",
+      width: "8%",
+      render: (text, record) =>
+        record.parts_order ? (
+          <Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
+            {record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
+              ? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
+              : t("general.labels.na")}
+          </Link>
+        ) : (
+          ""
+        )
+    },
+    {
+      title: t("tasks.fields.bill"),
+      dataIndex: ["bill", "id"],
+      key: "bill.id",
+      width: "10%",
+      render: (text, record) =>
+        record.bill ? (
+          <Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
+            {record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
+              ? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
+              : t("general.labels.na")}
+          </Link>
+        ) : (
+          ""
+        )
+    },
    {
      title: t("tasks.fields.title"),
      dataIndex: "title",
      key: "title",
-      minWidth: "20%",
      sorter: true,
      sortOrder: sortcolumn === "title" && sortorder
    },
@@ -263,7 +247,7 @@ function TaskListComponent({
    {
      title: t("tasks.fields.actions"),
      key: "toggleCompleted",
-      width: "8%",
+      width: "5%",
      render: (text, record) => (
        <Space direction="horizontal">
          <Button
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -39,7 +39,7 @@ export function TimeTicketList({
  extra
 }) {
  const [state, setState] = useState({
-    sortedInfo: { columnKey: 'date', order: 'descend' },
+    sortedInfo: {},
    filteredInfo: { text: "" }
  });

--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -1,7 +1,7 @@
-import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation, useQuery } from "@apollo/client";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Form, Modal, notification, Space } from "antd";
+import { PageHeader } from "@ant-design/pro-layout";
+import dayjs from "../../utils/day";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -11,9 +11,9 @@ import { INSERT_NEW_TIME_TICKET, UPDATE_TIME_TICKET } from "../../graphql/timeti
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectTimeTicket } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import dayjs from "../../utils/day";
-import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
+import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";

 const mapStateToProps = createStructuredSelector({
  timeTicketModal: selectTimeTicket,
@@ -87,7 +87,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
    if (enterAgain) {
      //Capture the existing information and repopulate it.

-      const prev = form.getFieldsValue(["date", "employeeid", "flat_rate"]);
+      const prev = form.getFieldsValue(["date", "employeeid"]);

      form.resetFields();

--- a/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx
+++ b/client/src/components/time-tickets-commit-toggle/time-tickets-commit-toggle.component.jsx
@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -29,7 +29,7 @@ export function TimeTicketsCommit({ bodyshop, currentUser, timeticket, disabled,
        ? { commited_by: null, committed_at: null }
        : {
            commited_by: currentUser.email,
-            committed_at: dayjs()
+            committed_at: day()
          };

      const result = await updateTimeTicket({
--- a/client/src/components/time-tickets-commit/time-tickets-commit.component.jsx
+++ b/client/src/components/time-tickets-commit/time-tickets-commit.component.jsx
@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification } from "antd";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -34,7 +34,7 @@ export function TimeTicketsCommit({
          timeticketIds: timetickets.map((ticket) => ticket.id),
          timeticket: {
            commited_by: currentUser.email,
-            committed_at: dayjs()
+            committed_at: day()
          }
        },
        update(cache) {
@@ -47,7 +47,7 @@ export function TimeTicketsCommit({
                    return {
                      ...ticket,
                      commited_by: currentUser.email,
-                      committed_at: dayjs()
+                      committed_at: day()
                    };
                  }
                  return ticket;
--- a/client/src/components/tt-approve-button/tt-approve-button.component.jsx
+++ b/client/src/components/tt-approve-button/tt-approve-button.component.jsx
@@ -1,7 +1,7 @@
 import { useApolloClient } from "@apollo/client";
 import { Button, notification } from "antd";
 import _ from "lodash";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -49,7 +49,7 @@ export function TtApproveButton({
          })),
          approvalIds: selectedTickets,
          approvalUpdate: {
-            approved_at: dayjs(),
+            approved_at: day(),
            approved_by: currentUser.email
          }
        }
--- a/client/src/components/wss-status-display/wss-status-display.component.jsx
+++ b/client/src/components/wss-status-display/wss-status-display.component.jsx
@@ -1,18 +0,0 @@
-import { connect } from "react-redux";
-import { GlobalOutlined } from "@ant-design/icons";
-import { createStructuredSelector } from "reselect";
-import React from "react";
-import { selectWssStatus } from "../../redux/application/application.selectors";
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  wssStatus: selectWssStatus
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(WssStatusDisplay);
-
-export function WssStatusDisplay({ wssStatus }) {
-  console.log("🚀 ~ WssStatusDisplay ~ wssStatus:", wssStatus);
-  return <GlobalOutlined style={{ color: wssStatus === "connected" ? "green" : "red", marginRight: ".5rem" }} />;
-}
--- a/client/src/contexts/SocketIO/useSocket.js
+++ b/client/src/contexts/SocketIO/useSocket.js
@@ -1,97 +1,54 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
 import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
-import { store } from "../../redux/store";
-import { addAlerts, setWssStatus } from "../../redux/application/application.actions";

 const useSocket = (bodyshop) => {
-  const socketRef = useRef(null);
-  const [clientId, setClientId] = useState(null);
+  const [socket, setSocket] = useState(null);
+  const [clientId, setClientId] = useState(null); // State to store unique identifier

  useEffect(() => {
-    const unsubscribe = auth.onIdTokenChanged(async (user) => {
-      if (user) {
-        const newToken = await user.getIdToken();
+    if (bodyshop && bodyshop.id) {
+      const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "https://localhost:3000";

-        if (socketRef.current) {
-          // Send new token to server
-          socketRef.current.emit("update-token", newToken);
-        } else if (bodyshop && bodyshop.id) {
-          // Initialize the socket
-          const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
+      const socketInstance = SocketIO(endpoint, {
+        path: "/ws", // Ensure this matches the Vite proxy and backend path
+        withCredentials: true,
+        auth: async (callback) => {
+          const token = auth.currentUser && (await auth.currentUser.getIdToken());
+          callback({ token });
+        },
+        reconnectionAttempts: Infinity, // Try reconnecting forever
+        reconnectionDelay: 2000, // How long to wait between reconnection attempts
+        reconnectionDelayMax: 10000 // Maximum delay between attempts
+      });

-          const socketInstance = SocketIO(endpoint, {
-            path: "/wss",
-            withCredentials: true,
-            auth: { token: newToken },
-            reconnectionAttempts: Infinity,
-            reconnectionDelay: 2000,
-            reconnectionDelayMax: 10000
-          });
+      setSocket(socketInstance);

-          socketRef.current = socketInstance;
+      socketInstance.on("connect", () => {
+        console.log("Socket connected:", socketInstance.id);
+        setClientId(socketInstance.id);
+      });

-          const handleBodyshopMessage = (message) => {
-            if (!message || !message?.type) return;
+      socketInstance.on("reconnect", (attempt) => {
+        console.log(`Socket reconnected after ${attempt} attempts`);
+      });

-            switch (message.type) {
-              case "alert-update":
-                store.dispatch(addAlerts(message.payload));
-                break;
-            }
+      socketInstance.on("connect_error", (err) => {
+        console.error("Socket connection error:", err);
+      });

-            if (!import.meta.env.DEV) return;
-            console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
-          };
+      socketInstance.on("disconnect", () => {
+        console.log("Socket disconnected");
+      });

-          const handleConnect = () => {
-            console.log("Socket connected:", socketInstance.id);
-            socketInstance.emit("join-bodyshop-room", bodyshop.id);
-            setClientId(socketInstance.id);
-            store.dispatch(setWssStatus("connected"));
-          };
-
-          const handleReconnect = (attempt) => {
-            console.log(`Socket reconnected after ${attempt} attempts`);
-            store.dispatch(setWssStatus("connected"));
-          };
-
-          const handleConnectionError = (err) => {
-            console.error("Socket connection error:", err);
-            store.dispatch(setWssStatus("error"));
-          };
-
-          const handleDisconnect = () => {
-            console.log("Socket disconnected");
-            store.dispatch(setWssStatus("disconnected"));
-          };
-
-          socketInstance.on("connect", handleConnect);
-          socketInstance.on("reconnect", handleReconnect);
-          socketInstance.on("connect_error", handleConnectionError);
-          socketInstance.on("disconnect", handleDisconnect);
-          socketInstance.on("bodyshop-message", handleBodyshopMessage);
-        }
-      } else {
-        // User is not authenticated
-        if (socketRef.current) {
-          socketRef.current.disconnect();
-          socketRef.current = null;
-        }
-      }
-    });
-
-    // Clean up the listener on unmount
-    return () => {
-      unsubscribe();
-      if (socketRef.current) {
-        socketRef.current.disconnect();
-        socketRef.current = null;
-      }
-    };
+      return () => {
+        socketInstance.disconnect();
+      };
+    }
  }, [bodyshop]);

-  return { socket: socketRef.current, clientId };
+  // Return both socket and clientId
+  return { socket, clientId };
 };

 export default useSocket;
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -48,7 +48,6 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
        v_model_desc
        est_ct_fn
        est_ct_ln
-        comment
        labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
          aggregate {
            sum {
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -2,7 +2,7 @@ import { gql } from "@apollo/client";

 export const QUERY_TICKETS_BY_JOBID = gql`
  query QUERY_TICKETS_BY_JOBID($jobid: uuid!) {
-    timetickets(where: { jobid: { _eq: $jobid } }) {
+    timetickets(where: { jobid: { _eq: $jobid } }, order_by: { date: desc_nulls_first }) {
      actualhrs
      cost_center
      ciecacode
@@ -26,7 +26,7 @@ export const QUERY_TICKETS_BY_JOBID = gql`

 export const QUERY_TIME_TICKETS_IN_RANGE = gql`
  query QUERY_TIME_TICKETS_IN_RANGE($start: date!, $end: date!) {
-    timetickets(where: { date: { _gte: $start, _lte: $end } }) {
+    timetickets(where: { date: { _gte: $start, _lte: $end } }, order_by: { date: desc_nulls_first }) {
      actualhrs
      ciecacode
      clockoff
@@ -69,6 +69,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
  ) {
    timetickets(
      where: { date: { _gte: $start, _lte: $end }, employeeid: { _eq: $employeeid } }
+      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
      ciecacode
@@ -100,6 +101,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
    }
    fixedperiod: timetickets(
      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, employeeid: { _eq: $employeeid } }
+      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
      ciecacode
@@ -143,6 +145,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
  ) {
    timetickets(
      where: { date: { _gte: $start, _lte: $end }, cost_center: { _neq: "timetickets.labels.shift" } }
+      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
      ciecacode
@@ -177,6 +180,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
    }
    fixedperiod: timetickets(
      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: { _neq: "timetickets.labels.shift" } }
+      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
      ciecacode
@@ -331,6 +335,7 @@ export const UPDATE_TIME_TICKETS = gql`
 export const QUERY_ACTIVE_TIME_TICKETS = gql`
  query QUERY_ACTIVE_TIME_TICKETS($employeeId: uuid) {
    timetickets(
+      order_by: { date: desc_nulls_first }
      where: {
        _and: {
          clockoff: { _is_null: true }
--- a/client/src/pages/dms-payables/dms-payables.container.jsx
+++ b/client/src/pages/dms-payables/dms-payables.container.jsx
@@ -1,20 +1,16 @@
 import { Button, Card, Col, notification, Row, Select, Space } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import SocketIO from "socket.io-client";
 import DmsAllocationsSummaryApComponent from "../../components/dms-allocations-summary-ap/dms-allocations-summary-ap.component";
 import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
-import { auth } from "../../firebase/firebase.utils";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import SocketContext from "../../contexts/SocketIO/socketContext";

-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});

 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -23,17 +19,9 @@ const mapDispatchToProps = (dispatch) => ({

 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);

-export const socket = SocketIO(import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", {
-  path: "/ws",
-  withCredentials: true,
-  auth: async (callback) => {
-    const token = auth.currentUser && (await auth.currentUser.getIdToken());
-    callback({ token });
-  }
-});
-
-export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
+  const { socket } = useContext(SocketContext);
  const [logLevel, setLogLevel] = useState("DEBUG");
  const history = useNavigate();
  const [logs, setLogs] = useState([]);
@@ -64,40 +52,43 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
  }, [t, setBreadcrumbs, setSelectedHeader]);

  useEffect(() => {
-    socket.on("connect", () => socket.emit("set-log-level", logLevel));
-    socket.on("reconnect", () => {
-      setLogs((logs) => {
-        return [
+    if (socket) {
+      const handleConnect = () => socket.emit("set-log-level", logLevel);
+      const handleReconnect = () => {
+        setLogs((logs) => [
          ...logs,
          {
            timestamp: new Date(),
-            level: "WARN",
-            message: "Reconnected to CDK Export Service"
+            level: "WARNING",
+            message: "Reconnected to DMS Export Service"
          }
-        ];
-      });
-    });
+        ]);
+      };
+      const handleLogEvent = (payload) => {
+        setLogs((logs) => [...logs, payload]);
+      };
+      const handleExportComplete = () => {
+        notification.open({
+          type: "success",
+          message: t("jobs.labels.dms.apexported")
+        });
+      };

-    socket.on("log-event", (payload) => {
-      setLogs((logs) => {
-        return [...logs, payload];
-      });
-    });
+      socket.on("connect", handleConnect);
+      socket.on("reconnect", handleReconnect);
+      socket.on("log-event", handleLogEvent);
+      socket.on("ap-export-complete", handleExportComplete);

-    socket.on("ap-export-complete", (payload) => {
-      notification.open({
-        type: "success",
-        message: t("jobs.labels.dms.apexported")
-      });
-    });
+      if (socket.disconnected) socket.connect();

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeAllListeners();
-      socket.disconnect();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+      return () => {
+        socket.off("connect", handleConnect);
+        socket.off("reconnect", handleReconnect);
+        socket.off("log-event", handleLogEvent);
+        socket.off("ap-export-complete", handleExportComplete);
+      };
+    }
+  }, [socket, logLevel, t]);

  if (!state?.billids) {
    history(`/manage/accounting/payables`);
@@ -123,36 +114,30 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                    socket.emit("set-log-level", value);
                  }}
                >
+                  <Select.Option key="TRACE">TRACE</Select.Option>
                  <Select.Option key="DEBUG">DEBUG</Select.Option>
                  <Select.Option key="INFO">INFO</Select.Option>
-                  <Select.Option key="WARN">WARN</Select.Option>
+                  <Select.Option key="WARNING">WARNING</Select.Option>
                  <Select.Option key="ERROR">ERROR</Select.Option>
                </Select>
                <Button onClick={() => setLogs([])}>Clear Logs</Button>
                <Button
                  onClick={() => {
                    setLogs([]);
-
-                    socket.disconnect();
-                    socket.connect();
+                    if (socket) {
+                      socket.emit("clear-dms-session");
+                    }
                  }}
                >
-                  Reconnect
+                  Clear Session
                </Button>
              </Space>
            }
          >
-            <DmsLogEvents socket={socket} logs={logs} />
+            <DmsLogEvents logs={logs} />
          </Card>
        </div>
      </Col>
    </Row>
  );
 }
-
-export const determineDmsType = (bodyshop) => {
-  if (bodyshop.cdk_dealerid) return "cdk";
-  else {
-    return "pbs";
-  }
-};
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -1,12 +1,11 @@
 import { useQuery } from "@apollo/client";
 import { Button, Card, Col, notification, Result, Row, Select, Space } from "antd";
 import queryString from "query-string";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import SocketIO from "socket.io-client";
 import AlertComponent from "../../components/alert/alert.component";
 import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
 import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
@@ -14,12 +13,12 @@ import DmsLogEvents from "../../components/dms-log-events/dms-log-events.compone
 import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
-import { auth } from "../../firebase/firebase.utils";
 import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import SocketContext from "../../contexts/SocketIO/socketContext";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -28,25 +27,21 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });

 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);

-export const socket = SocketIO(
-  import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", // for dev testing,
-  {
-    path: "/ws",
-    withCredentials: true,
-    auth: async (callback) => {
-      const token = auth.currentUser && (await auth.currentUser.getIdToken());
-      callback({ token });
-    }
-  }
-);
-
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
  const { t } = useTranslation();
+  const { socket } = useContext(SocketContext);
  const [logLevel, setLogLevel] = useState("DEBUG");
  const history = useNavigate();
  const [logs, setLogs] = useState([]);
@@ -59,6 +54,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
+
  const logsRef = useRef(null);

  useEffect(() => {
@@ -83,47 +79,73 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
  }, [t, setBreadcrumbs, setSelectedHeader]);

  useEffect(() => {
-    socket.on("connect", () => socket.emit("set-log-level", logLevel));
-    socket.on("reconnect", () => {
-      setLogs((logs) => {
-        return [
+    if (socket) {
+      const handleConnect = () => {
+        socket.emit("set-log-level", logLevel);
+      };
+
+      const handleReconnect = () => {
+        setLogs((logs) => [
          ...logs,
          {
            timestamp: new Date(),
-            level: "warn",
-            message: "Reconnected to CDK Export Service"
+            level: "WARNING",
+            message: "Reconnected to DMS Export Service"
          }
-        ];
-      });
-    });
-    socket.on("connect_error", (err) => {
-      console.log(`connect_error due to ${err}`, err);
-      notification.error({ message: err.message });
-    });
-    socket.on("log-event", (payload) => {
-      setLogs((logs) => {
-        return [...logs, payload];
-      });
-    });
-    socket.on("export-success", (payload) => {
-      notification.success({
-        message: t("jobs.successes.exported")
-      });
-      insertAuditTrail({
-        jobid: payload,
-        operation: AuditTrailMapping.jobexported(),
-        type: "jobexported"
-      });
-      history("/manage/accounting/receivables");
-    });
+        ]);
+      };

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeAllListeners();
-      socket.disconnect();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+      const handleConnectError = (err) => {
+        console.log(`connect_error due to ${err}`, err);
+        notification.error({ message: err.message });
+      };
+
+      const handleLogEvent = (payload) => {
+        setLogs((logs) => [...logs, payload]);
+      };
+
+      const handleExportSuccess = async (payload) => {
+        notification.success({
+          message: t("jobs.successes.exported")
+        });
+        insertAuditTrail({
+          jobid: payload,
+          operation: AuditTrailMapping.jobexported(),
+          type: "jobexported"
+        });
+
+        try {
+          await new Promise((resolve, reject) => {
+            socket.emit("clear-dms-session", (response) => {
+              if (response && response.status === "ok") {
+                resolve();
+              } else {
+                reject(new Error("Failed to clear DMS session"));
+              }
+            });
+          });
+        } catch (error) {
+          console.error("Failed to clear DMS session", error);
+        }
+
+        history("/manage/accounting/receivables");
+      };
+
+      socket.on("connect", handleConnect);
+      socket.on("reconnect", handleReconnect);
+      socket.on("connect_error", handleConnectError);
+      socket.on("log-event", handleLogEvent);
+      socket.on("export-success", handleExportSuccess);
+
+      return () => {
+        socket.off("connect", handleConnect);
+        socket.off("reconnect", handleReconnect);
+        socket.off("connect_error", handleConnectError);
+        socket.off("log-event", handleLogEvent);
+        socket.off("export-success", handleExportSuccess);
+      };
+    }
+  }, [socket, logLevel, t, insertAuditTrail, history]);

  if (loading) return <LoadingSpinner />;
  if (error) return <AlertComponent message={error.message} type="error" />;
@@ -173,25 +195,27 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                      socket.emit("set-log-level", value);
                    }}
                  >
+                    <Select.Option key="TRACE">TRACE</Select.Option>
                    <Select.Option key="DEBUG">DEBUG</Select.Option>
                    <Select.Option key="INFO">INFO</Select.Option>
-                    <Select.Option key="WARN">WARN</Select.Option>
+                    <Select.Option key="WARNING">WARNING</Select.Option>
                    <Select.Option key="ERROR">ERROR</Select.Option>
                  </Select>
                  <Button onClick={() => setLogs([])}>Clear Logs</Button>
                  <Button
                    onClick={() => {
                      setLogs([]);
-                      socket.disconnect();
-                      socket.connect();
+                      if (socket) {
+                        socket.emit("clear-dms-session");
+                      }
                    }}
                  >
-                    Reconnect
+                    Clear Session
                  </Button>
                </Space>
              }
            >
-              <DmsLogEvents socket={socket} logs={logs} />
+              <DmsLogEvents logs={logs} />
            </Card>
          </div>
        </Col>
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,4 +1,4 @@
-import { FloatButton, Layout, notification, Spin } from "antd";
+import { FloatButton, Layout, Spin } from "antd";
 // import preval from "preval.macro";
 import React, { lazy, Suspense, useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -18,15 +18,13 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
-import { requestForToken } from "../../firebase/firebase.utils";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
+
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import "./manage.page.styles.scss";
-import WssStatusDisplayComponent from "../../components/wss-status-display/wss-status-display.component.jsx";
-import { selectAlerts } from "../../redux/application/application.selectors.js";
-import { addAlerts } from "../../redux/application/application.actions.js";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { requestForToken } from "../../firebase/firebase.utils.js";

 const JobsPage = lazy(() => import("../jobs/jobs.page"));

@@ -105,80 +103,16 @@ const { Content, Footer } = Layout;

 const mapStateToProps = createStructuredSelector({
  conflict: selectInstanceConflict,
-  bodyshop: selectBodyshop,
-  alerts: selectAlerts
+  bodyshop: selectBodyshop
 });

-const ALERT_FILE_URL = InstanceRenderManager({
-  imex: "https://images.imex.online/alerts/alerts-imex.json",
-  rome: "https://images.imex.online/alerts/alerts-rome.json"
-});
+const mapDispatchToProps = (dispatch) => ({});

-const mapDispatchToProps = (dispatch) => ({
-  setAlerts: (alerts) => dispatch(addAlerts(alerts))
-});
-
-export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
+export function Manage({ conflict, bodyshop }) {
  const { t } = useTranslation();
  const [chatVisible] = useState(false);
  const { socket, clientId } = useContext(SocketContext);

-  // State to track displayed alerts
-  const [displayedAlertIds, setDisplayedAlertIds] = useState([]);
-
-  // Fetch displayed alerts from localStorage on mount
-  useEffect(() => {
-    const displayedAlerts = JSON.parse(localStorage.getItem("displayedAlerts") || "[]");
-    setDisplayedAlertIds(displayedAlerts);
-  }, []);
-
-  // Fetch alerts from the JSON file and dispatch to Redux store
-  useEffect(() => {
-    const fetchAlerts = async () => {
-      try {
-        const response = await fetch(ALERT_FILE_URL);
-        const fetchedAlerts = await response.json();
-        setAlerts(fetchedAlerts);
-      } catch (error) {
-        console.error("Error fetching alerts:", error);
-      }
-    };
-
-    fetchAlerts();
-  }, []);
-
-  // Use useEffect to watch for new alerts
-  useEffect(() => {
-    if (alerts && Object.keys(alerts).length > 0) {
-      // Convert the alerts object into an array
-      const alertArray = Object.values(alerts);
-
-      // Filter out alerts that have already been dismissed
-      const newAlerts = alertArray.filter((alert) => !displayedAlertIds.includes(alert.id));
-
-      newAlerts.forEach((alert) => {
-        // Display the notification
-        notification.open({
-          key: "notification-alerts-" + alert.id,
-          message: alert.message,
-          description: alert.description,
-          type: alert.type || "info",
-          duration: 0,
-          placement: "bottomRight",
-          closable: true,
-          onClose: () => {
-            // When the notification is closed, update displayed alerts state and localStorage
-            setDisplayedAlertIds((prevIds) => {
-              const updatedIds = [...prevIds, alert.id];
-              localStorage.setItem("displayedAlerts", JSON.stringify(updatedIds));
-              return updatedIds;
-            });
-          }
-        });
-      });
-    }
-  }, [alerts, displayedAlertIds]);
-
  useEffect(() => {
    const widgetId = InstanceRenderManager({
      imex: "IABVNO4scRKY11XBQkNr",
@@ -198,6 +132,27 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
    });
  }, [t]);

+  useEffect(() => {
+    if (socket && bodyshop && bodyshop.id) {
+      const handleConnect = () => {
+        socket.emit("join-bodyshop-room", bodyshop.id);
+      };
+
+      const handleBodyshopMessage = (message) => {
+        console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
+      };
+
+      socket.on("connect", handleConnect);
+      socket.on("bodyshop-message", handleBodyshopMessage);
+
+      return () => {
+        socket.emit("leave-bodyshop-room", bodyshop.id);
+        socket.off("connect", handleConnect);
+        socket.off("bodyshop-message", handleBodyshopMessage);
+      };
+    }
+  }, [socket, bodyshop]);
+
  const AppRouteTable = (
    <Suspense
      fallback={
@@ -670,8 +625,7 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
            }}
          >
            <div style={{ display: "flex" }}>
-              <WssStatusDisplayComponent />
-              <div onClick={broadcastMessage}>
+              <div>
                {`${InstanceRenderManager({
                  imex: t("titles.imexonline"),
                  rome: t("titles.romeonline"),
@@ -680,6 +634,8 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
              </div>
              <div id="noticeable-widget" style={{ marginLeft: "1rem" }} />
            </div>
+            <button onClick={broadcastMessage}>Broadcast Message</button>
+
            <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
              Disclaimer & Notices
            </Link>
--- a/client/src/pages/production-list/production-list.component.jsx
+++ b/client/src/pages/production-list/production-list.component.jsx
@@ -26,7 +26,7 @@ export function ProductionListComponent({ bodyshop }) {
  return (
    <>
      <NoteUpsertModal />
-      <ProductionListTable bodyshop={bodyshop} subscriptionType={Production_Use_View.treatment} />
+      <ProductionListTable subscriptionType={Production_Use_View.treatment} />
    </>
  );
 }
--- a/client/src/redux/application/application.actions.js
+++ b/client/src/redux/application/application.actions.js
@@ -67,13 +67,3 @@ export const setUpdateAvailable = (isUpdateAvailable) => ({
  type: ApplicationActionTypes.SET_UPDATE_AVAILABLE,
  payload: isUpdateAvailable
 });
-
-export const addAlerts = (alerts) => ({
-  type: ApplicationActionTypes.ADD_ALERTS,
-  payload: alerts
-});
-
-export const setWssStatus = (status) => ({
-  type: ApplicationActionTypes.SET_WSS_STATUS,
-  payload: status
-});
--- a/client/src/redux/application/application.reducer.js
+++ b/client/src/redux/application/application.reducer.js
@@ -3,7 +3,6 @@ import ApplicationActionTypes from "./application.types";
 const INITIAL_STATE = {
  loading: false,
  online: true,
-  wssStatus: "disconnected",
  updateAvailable: false,
  breadcrumbs: [],
  recentItems: [],
@@ -15,8 +14,7 @@ const INITIAL_STATE = {
    error: null
  },
  jobReadOnly: false,
-  partnerVersion: null,
-  alerts: {}
+  partnerVersion: null
 };

 const applicationReducer = (state = INITIAL_STATE, action) => {
@@ -89,21 +87,6 @@ const applicationReducer = (state = INITIAL_STATE, action) => {
    case ApplicationActionTypes.SET_PROBLEM_JOBS: {
      return { ...state, problemJobs: action.payload };
    }
-    case ApplicationActionTypes.SET_WSS_STATUS: {
-      return { ...state, wssStatus: action.payload };
-    }
-
-    case ApplicationActionTypes.ADD_ALERTS: {
-      const newAlertsMap = { ...state.alerts };
-
-      action.payload.alerts.forEach((alert) => {
-        newAlertsMap[alert.id] = alert;
-      });
-      return {
-        ...state,
-        alerts: newAlertsMap
-      };
-    }
    default:
      return state;
  }
--- a/client/src/redux/application/application.selectors.js
+++ b/client/src/redux/application/application.selectors.js
@@ -22,5 +22,3 @@ export const selectJobReadOnly = createSelector([selectApplication], (applicatio
 export const selectOnline = createSelector([selectApplication], (application) => application.online);
 export const selectProblemJobs = createSelector([selectApplication], (application) => application.problemJobs);
 export const selectUpdateAvailable = createSelector([selectApplication], (application) => application.updateAvailable);
-export const selectWssStatus = createSelector([selectApplication], (application) => application.wssStatus);
-export const selectAlerts = createSelector([selectApplication], (application) => application.alerts);
--- a/client/src/redux/application/application.types.js
+++ b/client/src/redux/application/application.types.js
@@ -12,8 +12,6 @@ const ApplicationActionTypes = {
  SET_ONLINE_STATUS: "SET_ONLINE_STATUS",
  INSERT_AUDIT_TRAIL: "INSERT_AUDIT_TRAIL",
  SET_PROBLEM_JOBS: "SET_PROBLEM_JOBS",
-  SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE",
-  SET_WSS_STATUS: "SET_WSS_STATUS",
-  ADD_ALERTS: "ADD_ALERTS"
+  SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE"
 };
 export default ApplicationActionTypes;
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -28,7 +28,7 @@ import {
 } from "../../firebase/firebase.utils";
 import { QUERY_EULA } from "../../graphql/bodyshop.queries";
 import client from "../../utils/GraphQLClient";
-import dayjs from "../../utils/day";
+import day from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import {
  checkInstanceId,
@@ -96,7 +96,7 @@ export function* isUserAuthenticated() {
    const eulaQuery = yield client.query({
      query: QUERY_EULA,
      variables: {
-        now: dayjs()
+        now: day()
      }
    });

@@ -242,10 +242,6 @@ export function* signInSuccessSaga({ payload }) {
        window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
        window.$crisp.push(["set", "session:segments", [["user"]]]);
      },
-      rome: () => {
-        window.$zoho.salesiq.visitor.name(payload.displayName || payload.email);
-        window.$zoho.salesiq.visitor.email(payload.email);
-      },
      promanager: () => {
        Userpilot.identify(payload.email, {
          email: payload.email
@@ -314,7 +310,8 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
  try {
    const userEmail = yield select((state) => state.user.currentUser.email);
    try {
-      dayjs.tz.setDefault(payload.timezone);
+      //console.log("Setting shop timezone.");
+      // dayjs.tz.setDefault(payload.timezone);
    } catch (error) {
      console.log(error);
    }
@@ -374,9 +371,6 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
          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 });
        }
      });
    } catch (error) {
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -119,7 +119,7 @@
        "jobclosedwithbypass": "Job was invoiced using the master bypass password. ",
        "jobconverted": "Job converted and assigned number {{ro_number}}.",
        "jobdelivery": "Job intake completed. Status set to {{status}}. Actual completion is {{actual_completion}}.",
-        "jobexported": "Job has been exported",
+        "jobexported": "",
        "jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
        "jobimported": "Job imported.",
        "jobinproductionchange": "Job production status set to {{inproduction}}",
@@ -1338,8 +1338,6 @@
    },
    "job_lifecycle": {
      "columns": {
-        "average_human_readable": "Average Human Readable",
-        "average_value": "Average Value",
        "duration": "Duration",
        "end": "End",
        "human_readable": "Human Readable",
@@ -2851,21 +2849,15 @@
          "jobs_in_production": "Jobs in Production",
          "tasks_in_production": "Tasks in Production",
          "tasks_on_board": "Tasks on Board",
-          "tasks_in_view": "Tasks in View",
          "total_amount_in_production": "Dollars in Production",
          "total_amount_on_board": "Dollars on Board",
-          "total_amount_in_view": "Dollars in View",
          "total_hours_in_production": "Hours in Production",
          "total_hours_on_board": "Hours on Board",
-          "total_hours_in_view": "Hours in View",
          "total_jobs_on_board": "Jobs on Board",
-          "total_jobs_in_view": "Jobs in View",
          "total_lab_in_production": "Body Hours in Production",
          "total_lab_on_board": "Body Hours on Board",
-          "total_lab_in_view": "Body Hours in View",
          "total_lar_in_production": "Refinish Hours in Production",
-          "total_lar_on_board": "Refinish Hours on Board",
-          "total_lar_in_view": "Refinish Hours in View"
+          "total_lar_on_board": "Refinish Hours on Board"
        },
        "statistics_title": "Statistics"
      },
@@ -2877,21 +2869,15 @@
        "tasks": "Tasks",
        "tasks_in_production": "Tasks in Production",
        "tasks_on_board": "Tasks on Board",
-        "tasks_in_view": "Tasks in View",
        "total_amount_in_production": "Dollars in Production",
        "total_amount_on_board": "Dollars on Board",
-        "total_amount_in_view": "Dollars in View",
        "total_hours_in_production": "Hours in Production",
        "total_hours_on_board": "Hours on Board",
-        "total_hours_in_view": "Hours in View",
        "total_jobs_on_board": "Jobs on Board",
-        "total_jobs_in_view": "Jobs in View",
        "total_lab_in_production": "Body Hours in Production",
        "total_lab_on_board": "Body Hours on Board",
-        "total_lab_in_view": "Body Hours in View",
        "total_lar_in_production": "Refinish Hours in Production",
-        "total_lar_on_board": "Refinish Hours on Board",
-        "total_lar_in_view": "Refinish Hours in View"
+        "total_lar_on_board": "Refinish Hours on Board"
      },
      "successes": {
        "removed": "Job removed from production."
@@ -3046,7 +3032,6 @@
        "production_by_target_date": "Production by Target Date",
        "production_by_technician": "Production by Technician",
        "production_by_technician_one": "Production filtered by Technician",
-        "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_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
@@ -3189,7 +3174,6 @@
        "billid": "Bill",
        "completed": "Completed",
        "created_at": "Created At",
-        "created_by": "Created By",
        "description": "Description",
        "due_date": "Due Date",
        "job": {
@@ -3206,7 +3190,6 @@
          "medium": "Medium"
        },
        "priority": "Priority",
-        "related_items": "Related Items",
        "remind_at": "Remind At",
        "title": "Title"
      },
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1338,8 +1338,6 @@
    },
    "job_lifecycle": {
      "columns": {
-        "average_human_readable": "",
-        "average_value": "",
        "duration": "",
        "end": "",
        "human_readable": "",
@@ -2851,21 +2849,15 @@
          "jobs_in_production": "",
          "tasks_in_production": "",
          "tasks_on_board": "",
-          "tasks_in_view": "",
          "total_amount_in_production": "",
          "total_amount_on_board": "",
-          "total_amount_in_view": "",
          "total_hours_in_production": "",
          "total_hours_on_board": "",
-          "total_hours_in_view": "",
          "total_jobs_on_board": "",
-          "total_jobs_in_view": "",
          "total_lab_in_production": "",
          "total_lab_on_board": "",
-          "total_lab_in_view": "",
          "total_lar_in_production": "",
-          "total_lar_on_board": "",
-          "total_lar_in_view": ""
+          "total_lar_on_board": ""
        },
        "statistics_title": ""
      },
@@ -2877,21 +2869,15 @@
        "tasks": "",
        "tasks_in_production": "",
        "tasks_on_board": "",
-        "tasks_in_view": "",
        "total_amount_in_production": "",
        "total_amount_on_board": "",
-        "total_amount_in_view": "",
        "total_hours_in_production": "",
        "total_hours_on_board": "",
-        "total_hours_in_view": "",
        "total_jobs_on_board": "",
-        "total_jobs_in_view": "",
        "total_lab_in_production": "",
        "total_lab_on_board": "",
-        "total_lab_in_view": "",
        "total_lar_in_production": "",
-        "total_lar_on_board": "",
-        "total_lar_in_view": ""
+        "total_lar_on_board": ""
      },
      "successes": {
        "removed": ""
@@ -3046,7 +3032,6 @@
        "production_by_target_date": "",
        "production_by_technician": "",
        "production_by_technician_one": "",
-        "production_not_production_status": "",
        "production_over_time": "",
        "psr_by_make": "",
        "purchase_return_ratio_grouped_by_vendor_detail": "",
@@ -3189,7 +3174,6 @@
        "billid": "",
        "completed": "",
        "created_at": "",
-        "created_by": "",
        "description": "",
        "due_date": "",
        "job": {
@@ -3206,7 +3190,6 @@
          "medium": ""
        },
        "priority": "",
-        "related_items": "",
        "remind_at": "",
        "title": ""
      },
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -2333,14 +2333,6 @@ export const TemplateList = (type, context) => {
            key: "production_by_technician",
            //idtype: "vendor",
            disabled: false
-          },
-          production_not_production_status: {
-            title: i18n.t("reportcenter.templates.production_not_production_status"),
-            description: "",
-            subject: i18n.t("reportcenter.templates.production_not_production_status"),
-            key: "production_not_production_status",
-            //idtype: "vendor",
-            disabled: false
          }
        }
      : {}),
--- a/client/src/utils/config.js
+++ b/client/src/utils/config.js
@@ -1,4 +1,3 @@
 // Sometimes referred to as PageSize, this variable controls the amount of records
 // to show on one page during pagination.
 export const pageLimit = 50;
-export const exportPageLimit = 10;
--- a/client/src/utils/day.js
+++ b/client/src/utils/day.js
@@ -1,6 +1,5 @@
 import dayjs from "dayjs";

-import "dayjs/locale/en";
 import dayjsBusinessDays from "dayjs-business-days2";
 import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
 import updateLocale from "dayjs/plugin/updateLocale";
@@ -65,6 +64,4 @@ dayjs.extend(minMax);
 dayjs.extend(isBetween);
 dayjs.extend(dayjsBusinessDays);

-dayjs.locale("en");
-
 export default dayjs;
--- a/client/src/utils/localmedia.js
+++ b/client/src/utils/localmedia.js
@@ -2,5 +2,5 @@ import { store } from "../redux/store";

 export function CreateExplorerLinkForJob({ jobid }) {
  const bodyshop = store.getState().user.bodyshop;
-  return `imexmedia://`.concat(encodeURIComponent(`${bodyshop.localmediaservernetwork}\\Jobs\\${jobid}`));
+  return `imexmedia://${bodyshop.localmediaservernetwork}\\Jobs\\${jobid}`;
 }
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -9,7 +9,6 @@ import eslint from "vite-plugin-eslint";
 import { VitePWA } from "vite-plugin-pwa";
 import InstanceRenderManager from "./src/utils/instanceRenderMgr";
 import chalk from "chalk";
-//import { visualizer } from "rollup-plugin-visualizer";

 process.env.VITE_APP_GIT_SHA_DATE = new Date().toLocaleString("en-US", {
  timeZone: "America/Los_Angeles"
@@ -47,7 +46,6 @@ export const logger = createLogger("info", {
 export default defineConfig({
  base: "/",
  plugins: [
-    //visualizer(),
    ViteEjsPlugin((viteConfig) => ({ env: viteConfig.env })),
    VitePWA({
      injectRegister: "auto",
@@ -126,12 +124,6 @@ export default defineConfig({
        secure: false,
        ws: true
      },
-      "/wss": {
-        target: "ws://localhost:4000",
-        rewriteWsOrigin: true,
-        secure: false,
-        ws: true
-      },
      "/api": {
        target: "http://localhost:4000",
        changeOrigin: true,
@@ -168,12 +160,6 @@ export default defineConfig({
        secure: false,
        ws: true
      },
-      "/wss": {
-        target: "ws://localhost:4000",
-        rewriteWsOrigin: true,
-        secure: false,
-        ws: true
-      },
      "/api": {
        target: "http://localhost:4000",
        changeOrigin: true,
@@ -188,32 +174,7 @@ export default defineConfig({
        manualChunks: {
          antd: ["antd"],
          "react-redux": ["react-redux"],
-          redux: ["redux"],
-          lodash: ["lodash"],
-          "@sentry/react": ["@sentry/react"],
-          "@splitsoftware/splitio-react": ["@splitsoftware/splitio-react"],
-          logrocket: ["logrocket"],
-          "firebase/app": ["firebase/app"],
-          "firebase/firestore": ["firebase/firestore"],
-          "firebase/firestore/lite": ["firebase/firestore/lite"],
-          "firebase/auth": ["firebase/auth"],
-          "firebase/functions": ["firebase/functions"],
-          "firebase/storage": ["firebase/storage"],
-          "firebase/database": ["firebase/database"],
-          "firebase/remote-config": ["firebase/remote-config"],
-          "firebase/performance": ["firebase/performance"],
-          "@firebase/app": ["@firebase/app"],
-          "@firebase/firestore": ["@firebase/firestore"],
-          "@firebase/firestore/lite": ["@firebase/firestore/lite"],
-          "@firebase/auth": ["@firebase/auth"],
-          "@firebase/functions": ["@firebase/functions"],
-          "@firebase/storage": ["@firebase/storage"],
-          "@firebase/database": ["@firebase/database"],
-          "@firebase/remote-config": ["@firebase/remote-config"],
-          "@firebase/performance": ["@firebase/performance"],
-          markerjs2: ["markerjs2"],
-          "@apollo/client": ["@apollo/client"],
-          "libphonenumber-js": ["libphonenumber-js"]
+          redux: ["redux"]
        }
      }
    }
@@ -223,8 +184,6 @@ export default defineConfig({
      "react",
      "react-dom",
      "antd",
-      "lodash",
-      "@sentry/react",
      "@apollo/client",
      "@reduxjs/toolkit",
      "axios",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dave Richer	b13c42b02f	IO-2742-redis - Merge Release / Up deps (prior to parking) Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 14:44:22 -04:00
Dave Richer	93f6a80fda	Merge remote-tracking branch 'origin/release/2024-09-27' into feature/IO-2742-redis	2024-09-24 14:21:51 -04:00
Dave Richer	5e14258839	IO-2742-redis - PR Changes Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 14:20:09 -04:00
Dave Richer	5c54cf6c44	feature/IO-2924-Refactor-Production-Board-For-Sockets - Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-16 11:48:17 -04:00
Dave Richer	a2d95dbce3	feature/IO-2742-redis - Checkpoint - clear stage before moving to sub task Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 11:53:29 -04:00
Dave Richer	51c181dab7	feature/IO-2742-redis - Checkpoint, Final cleanup of server.js Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 20:52:49 -04:00
Dave Richer	4486858a86	feature/IO-2742-redis - Checkpoint, All optimizations to prevent multiple requests to redis have been applied. Things like using lists for the Log Events, to getting and setting multiple values at the same time when given the chance. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 20:27:40 -04:00
Dave Richer	f606228792	feature/IO-2742-redis - Checkpoint, Redis fully implemented. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 19:08:24 -04:00
Dave Richer	bca0a35cdd	Remove express line Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 11:12:14 -04:00
Dave Richer	0ee51ed4c1	- Update Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 11:06:36 -04:00
Dave Richer	11b903f24b	- Fix DMS Socket (missing reference) - Add preview mode Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 10:30:55 -04:00
Dave Richer	f83deb0c26	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 17:15:08 -04:00
Dave Richer	9a0d973b26	Normalize SocketIO App wide. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 16:23:38 -04:00
Dave Richer	ea0a717895	feature/IO-2742-redis - Normalize Network Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 15:17:13 -04:00
Dave Richer	40f1a2f6ed	feature/IO-2742-redis - Dep Bump Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 14:34:50 -04:00
Dave Richer	3433b1a600	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2742-redis	2024-09-10 14:28:44 -04:00
Dave Richer	49a7313abb	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-09 23:27:28 -04:00
Dave Richer	319b24ce8a	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2742-redis	2024-09-09 11:39:48 -04:00
Dave Richer	08d8a4f7dc	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-09 11:39:39 -04:00
Dave Richer	03e8b62e4f	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-06 13:22:17 -04:00
Dave Richer	44db8f20e9	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-06 11:53:08 -04:00
Dave Richer	f28068d0e7	Merge remote-tracking branch 'origin/release/2024-09-06' into feature/IO-2742-redis	2024-09-05 19:38:00 -04:00
Patrick Fic	5f082b9619	Basic connection to elasticache server.	2024-08-22 14:48:00 -07:00
				`@@ -1 +0,0 @@`
				`ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC82Xl+5WYs2/vYFk3GdOpfkId/leLxTGNhpjEchNILHtuWeGlVgt2pe9w5ZfNux+NyH916fvdCJbifYVjPvmgYyFQaU5jN1YoD0j1KPT1DLVHTpGHAOJkZ3mpoyzAR5emQ2aLa7hB3aQl4N9RBSKCMLT1XzU7++ueIa1AAlJx+Ib+K12b5R+fT1ngxiTQdaOqIOiQ0SySgQ+yJtgitv5Dq9224+Rk77BT+yZeE+2DDlJPqhB2ab+BU2xGDlc3PGuKt77PUZZq2edUveE+ed+md/xbnz13KazsYYnCE96tIZM3VufRPj70Lr0J3ssEm3GK4V1GZ2UYsss9FHjxG6vvX dave@DaveRicher-IMEX`