IO-2992 Bill Line column Width with Word Breaks

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
Merged in release/2024-10-18 (pull request #1828 )
2024-10-21 10:53:32 -07:00 · 2024-10-19 03:47:08 +00:00 · 2024-10-18 19:25:09 +00:00 · 2024-10-18 15:22:56 -04:00 · 2024-10-18 16:30:02 +00:00 · 2024-10-18 16:29:25 +00:00
82 changed files with 4810 additions and 2260 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,24 @@
+# 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/47
+++ b/47
@@ -0,0 +1,47 @@
+# 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
+
+# Start the application
+CMD ["nodemon", "--legacy-watch", "server.js"]
--- a/_reference/dockerreadme.md
+++ b/_reference/dockerreadme.md
@@ -0,0 +1,64 @@
+# 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/certs/cert.pem
+++ b/certs/cert.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIUD/QBSAXy/AlJ/cS4DaPWJLpChxgwDQYJKoZIhvcNAQEL
+BQAwPTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMSEwHwYDVQQKDBhJbnRlcm5l
+dCBXaWRnaXRzIFB0eSBMdGQwHhcNMjQwOTA5MTU0MjA1WhcNMjUwOTA5MTU0MjA1
+WjA9MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xITAfBgNVBAoMGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKSd0l7NJCNBwvtPU+dVPQkteg0AfC3sGqRnZMQteCRVa2oIgC4NoF3A9BK/yHbF
+ZF25OnXTck5vzc8yb3v73ndfTD9ASKNoiaZE84/GFBsxqlKR8cs0qVwzuAsdijMv
+vlMPNlMRyE1Rb7nR6HXGkPXNyxgMko03NXPkvIje9zRudm0Lf8L4q/hPyPkS7Mrm
+/uQfAAJe+xFcupkEX2XY7r0x1C+z6E8lA1UcuhK3SHdW7CWYqp1vU5/dnnUiXwCa
+GiC6Y1bCJB0pDAVISzy3JUDdINZdiqGR+y8ho3pstChf2mp/76s3N9eG9KA/qaFK
+BrGk2PvCoZ8/Aj1aMsRYFHECAwEAAaNTMFEwHQYDVR0OBBYEFDLJ2fbWP4VUJgOp
+PSs+NGHcVgRmMB8GA1UdIwQYMBaAFDLJ2fbWP4VUJgOpPSs+NGHcVgRmMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABfv5ut/y03atq0NMB0jeDY4
+AvW4ukk0k1svyqxFZCw9o7m2lHb/IjmVrZG1Sj4JWrrSv0s02ccb26/t6vazNa5L
+Powe3eyfHgfjTZJmgs8hyeMwKS0wWk/SPuu9JDhIJakiquqD+UVBGkHpP+XYvhDv
+vhS2XRlW+aEjpUmr1oCyyrc6WbzrYRNadqEsn/AxwcMyUbht3Ugjkg+OpidcTIQp
+5lv63waKo6I1vQofzBQ3L7JYsKo8kC0vAP7wkLxvzBii335uZJzzpFYFVOyVNezi
+dJdazPbRYbXz4LjltdEn/SNfRuKX8ZRiN2OSo7OfSrZaMTS87SfCSFJGgQM8Yrk=
+-----END CERTIFICATE-----
--- a/certs/key.pem
+++ b/certs/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCkndJezSQjQcL7
+T1PnVT0JLXoNAHwt7BqkZ2TELXgkVWtqCIAuDaBdwPQSv8h2xWRduTp103JOb83P
+Mm97+953X0w/QEijaImmRPOPxhQbMapSkfHLNKlcM7gLHYozL75TDzZTEchNUW+5
+0eh1xpD1zcsYDJKNNzVz5LyI3vc0bnZtC3/C+Kv4T8j5EuzK5v7kHwACXvsRXLqZ
+BF9l2O69MdQvs+hPJQNVHLoSt0h3VuwlmKqdb1Of3Z51Il8AmhogumNWwiQdKQwF
+SEs8tyVA3SDWXYqhkfsvIaN6bLQoX9pqf++rNzfXhvSgP6mhSgaxpNj7wqGfPwI9
+WjLEWBRxAgMBAAECggEAUNpHYlLFxh9dokujPUMreF+Cy/IKDBAkQc2au5RNpyLh
+YDIOqw/8TTAhcTgLQPLQygvZP9f8E7RsVLFD+pSJ/v2qmIJ9au1Edor1Sg+S/oxV
+SLrwFMunx2aLpcH7iAqSI3+cQg7A3+D4zD7iOz6tIl3Su9wo+v073tFhHKTOrEwv
+Qgr9Jf3viIiKV1ym+uQEVQndocfsj46FnFpXTQ2qs7kAF6FgAOLDGfQQwzkiqEBD
+NsqsDmbYIx6foZL+DEz1ZVO2M5B+xxpbNK82KwuQilVpimW8ui4LZHCe+RIFzt9+
+BK6KGlLpSEwTFliivI3nahy18JzskZsfyah0CPZlQQKBgQDVv+A0qIPGvOP3Sx+9
+HyeQCV23SkvvSvw8p8pMB0gvwv63YdJ7N/rJzBGS6YUHFWWZZgEeTgkJ6VJvoe0r
+8JL1el9uSUa7f0eayjmFBOGuzpktNVdIn2Tg7A9MWA4JqPNNC69RMOh86ewGD4J3
+a8Hz2a1bHxAmy/AZt2ukypY6eQKBgQDFJ7kqeOPkRBz9WbALRgVIXo8YWf5di0sQ
+r0HC03GAISHQ725A2IFBPHJWeqj0jaMiIZD0y+Obgp7KAskrJaLfsd7Ug775kFfw
+oUI9UAl6kRuPKvm3BaVAm46SQm+56VsgxTi73YN0NUp75THHZgAJjepF9zSpVJxq
+VY9DjEGruQKBgQCQCpGIatcCol/tUg69X7VFd0pULhkl1J5OMbQ9r9qRdRI5eg5h
+QsQaIQ7mtb8TmvOwf/DY/zVQHI+U8sXlCmW+TwzoQTENQSR7xzMj1LpRFqBaustr
+AR72A537kItFLzll/i3SxOam5uxK2UDOQSuerF4KPdCglGXkrpo3nt3F4QKBgQCa
+RArPAOjQo7tLQfJN3+wiRFsTYtd1uphx5bA/EdOtvj8HjVFnzADXWsTchf3N3UXY
+XwtdgGwIMpys1KEz8a8P+c2x26SDAj7NOmDqOMYx8Xju/WGHpBM6Cn30U6e4gK+d
+ZLSPyzQgqdIuP5hDvbwpvbGiLVw3Ys1BJtGCuSxpgQJ/eHnRiuSi5Zq5jGg+GpA+
+FEEc9NCy772rR+4uzEOqyIwqewffqzSuVWuIsY/8MP3fh+NDxl/mU6cB5QVeD54Z
+JZUKwmpM26muiM6WvVnM4ExPdSGA2+l4pZjby/KKd6F/w0tgZ1jb9Pb2/0vN3qVA
+Y4U4XNTMt2fxUACqiL4SHA==
+-----END PRIVATE KEY-----
--- a/client/.env.development.imex
+++ b/client/.env.development.imex
@@ -8,7 +8,7 @@ VITE_APP_CLOUDINARY_API_KEY=957865933348715
 VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=/api/
 VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
--- a/client/.env.development.promanager
+++ b/client/.env.development.promanager
@@ -8,7 +8,7 @@ VITE_APP_CLOUDINARY_API_KEY=957865933348715
 VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=/api/
 VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=PROMANAGER
--- a/client/.env.development.rome
+++ b/client/.env.development.rome
@@ -9,7 +9,7 @@ VITE_APP_CLOUDINARY_API_KEY=957865933348715
 VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=/api/
 VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_COUNTRY=USA
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1,3 +1,4 @@

 # Sentry Config File
 .sentryclirc
+/dev-dist
--- a/client/cypress.config.js
+++ b/client/cypress.config.js
@@ -12,6 +12,6 @@ module.exports = defineConfig({
    setupNodeEvents(on, config) {
      return require("./cypress/plugins/index.js")(on, config);
    },
-    baseUrl: "http://localhost:3000"
+    baseUrl: "https://localhost:3000"
  }
 });
--- a/client/index.html
+++ b/client/index.html
@@ -17,7 +17,7 @@
  <meta name="theme-color" content="#1690ff"/>
  <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
  <!-- TODO:AIo Update the individual logos for each.-->
-  <link rel="apple-touch-icon" href="public/logo192.png"/>
+  <link rel="apple-touch-icon" href="/logo192.png"/>
  <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
  <!--
    manifest.json provides metadata used when your web app is installed on a
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -9,37 +9,37 @@
  "proxy": "http://localhost:4000",
  "dependencies": {
    "@ant-design/pro-layout": "^7.19.12",
-    "@apollo/client": "^3.11.4",
-    "@emotion/is-prop-valid": "^1.3.0",
-    "@fingerprintjs/fingerprintjs": "^4.4.3",
+    "@apollo/client": "^3.11.8",
+    "@emotion/is-prop-valid": "^1.3.1",
+    "@fingerprintjs/fingerprintjs": "^4.5.0",
    "@jsreport/browser-client": "^3.1.0",
    "@reduxjs/toolkit": "^2.2.7",
-    "@sentry/cli": "^2.33.1",
+    "@sentry/cli": "^2.36.2",
    "@sentry/react": "^7.114.0",
-    "@splitsoftware/splitio-react": "^1.12.1",
+    "@splitsoftware/splitio-react": "^1.13.0",
    "@tanem/react-nprogress": "^5.0.51",
    "@vitejs/plugin-react": "^4.3.1",
    "antd": "^5.20.1",
    "apollo-link-logger": "^2.0.1",
    "apollo-link-sentry": "^3.3.0",
    "autosize": "^6.0.1",
-    "axios": "^1.7.4",
+    "axios": "^1.7.7",
    "classnames": "^2.5.1",
    "css-box-model": "^1.2.1",
-    "dayjs": "^1.11.12",
+    "dayjs": "^1.11.13",
    "dayjs-business-days2": "^1.2.2",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
-    "firebase": "^10.12.5",
+    "firebase": "^10.13.2",
    "graphql": "^16.9.0",
-    "i18next": "^23.12.3",
+    "i18next": "^23.15.1",
    "i18next-browser-languagedetector": "^8.0.0",
    "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.11.5",
+    "libphonenumber-js": "^1.11.9",
    "logrocket": "^8.1.2",
-    "markerjs2": "^2.32.1",
+    "markerjs2": "^2.32.2",
    "memoize-one": "^6.0.0",
    "normalize-url": "^8.0.1",
    "object-hash": "^3.0.0",
@@ -47,7 +47,7 @@
    "query-string": "^9.1.0",
    "raf-schd": "^4.0.3",
    "react": "^18.3.1",
-    "react-big-calendar": "^1.13.2",
+    "react-big-calendar": "^1.14.1",
    "react-color": "^2.19.3",
    "react-cookie": "^7.2.0",
    "react-dom": "^18.3.1",
@@ -58,15 +58,15 @@
    "react-icons": "^5.3.0",
    "react-image-lightbox": "^5.1.4",
    "react-markdown": "^9.0.1",
-    "react-number-format": "^5.4.0",
+    "react-number-format": "^5.4.2",
    "react-popopo": "^2.1.9",
-    "react-product-fruits": "^2.2.6",
+    "react-product-fruits": "^2.2.61",
    "react-redux": "^9.1.2",
    "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.26.0",
+    "react-router-dom": "^6.26.2",
    "react-sticky": "^6.0.3",
    "react-virtualized": "^9.22.5",
-    "react-virtuoso": "^4.10.1",
+    "react-virtuoso": "^4.10.4",
    "recharts": "^2.12.7",
    "redux": "^5.0.1",
    "redux-actions": "^3.0.3",
@@ -74,12 +74,12 @@
    "redux-saga": "^1.3.0",
    "redux-state-sync": "^3.1.4",
    "reselect": "^5.1.1",
-    "sass": "^1.77.8",
-    "socket.io-client": "^4.7.5",
-    "styled-components": "^6.1.12",
+    "sass": "^1.79.3",
+    "socket.io-client": "^4.8.0",
+    "styled-components": "^6.1.13",
    "subscriptions-transport-ws": "^0.11.0",
    "use-memo-one": "^1.1.3",
-    "userpilot": "^1.3.5",
+    "userpilot": "^1.3.6",
    "vite-plugin-ejs": "^1.7.0",
    "web-vitals": "^3.5.2"
  },
@@ -91,6 +91,9 @@
    "start:imex": "dotenvx run --env-file=.env.development.imex -- vite",
    "start:rome": "dotenvx run --env-file=.env.development.rome -- vite",
    "start:promanager": "dotenvx run --env-file=.env.development.promanager -- vite",
+    "preview:imex": "dotenvx run --env-file=.env.development.imex -- vite preview",
+    "preview:rome": "dotenvx run --env-file=.env.development.rome -- vite preview",
+    "preview:promanager": "dotenvx run --env-file=.env.development.promanager -- vite preview",
    "build:test:imex": "env-cmd -f .env.test.imex npm run build",
    "build:test:rome": "env-cmd -f .env.test.rome npm run build",
    "build:test:promanager": "env-cmd -f .env.test.promanager npm run build",
@@ -131,29 +134,29 @@
  "devDependencies": {
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-react": "^7.24.7",
-    "@dotenvx/dotenvx": "^1.7.0",
+    "@dotenvx/dotenvx": "^1.14.1",
    "@emotion/babel-plugin": "^11.12.0",
-    "@emotion/react": "^11.13.0",
-    "@sentry/webpack-plugin": "^2.22.2",
+    "@emotion/react": "^11.13.3",
+    "@sentry/webpack-plugin": "^2.22.4",
    "@testing-library/cypress": "^10.0.2",
    "browserslist": "^4.23.3",
    "browserslist-to-esbuild": "^2.1.1",
+    "chalk": "^5.3.0",
    "cross-env": "^7.0.3",
-    "cypress": "^13.13.3",
+    "cypress": "^13.14.2",
    "eslint": "^8.57.0",
    "eslint-config-react-app": "^7.0.1",
    "eslint-plugin-cypress": "^2.15.1",
-    "memfs": "^4.11.1",
+    "memfs": "^4.12.0",
    "os-browserify": "^0.3.0",
    "react-error-overlay": "6.0.11",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.3",
-    "vite": "^5.4.0",
+    "vite": "^5.4.7",
    "vite-plugin-babel": "^1.2.0",
    "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-legacy": "^2.1.0",
    "vite-plugin-node-polyfills": "^0.22.0",
-    "vite-plugin-pwa": "^0.20.1",
+    "vite-plugin-pwa": "^0.20.5",
    "vite-plugin-style-import": "^2.0.0",
    "workbox-window": "^7.1.0"
  }
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -21,6 +21,7 @@ import "./App.styles.scss";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
+import { SocketProvider } from "../contexts/SocketIO/socketContext.jsx";

 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -201,7 +202,9 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
          path="/manage/*"
          element={
            <ErrorBoundary>
-              <PrivateRoute isAuthorized={currentUser.authorized} />
+              <SocketProvider bodyshop={bodyshop}>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
+              </SocketProvider>
            </ErrorBoundary>
          }
        >
@@ -211,7 +214,9 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
          path="/tech/*"
          element={
            <ErrorBoundary>
-              <PrivateRoute isAuthorized={currentUser.authorized} />
+              <SocketProvider bodyshop={bodyshop}>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
+              </SocketProvider>
            </ErrorBoundary>
          }
        >
--- 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 { pageLimit } from "../../utils/config";
+import { exportPageLimit } 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: pageLimit }}
+        pagination={{ position: "top", pageSize: exportPageLimit }}
        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 { pageLimit } from "../../utils/config";
+import { exportPageLimit } 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: pageLimit }}
+        pagination={{ position: "top", pageSize: exportPageLimit }}
        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" }}
+        pagination={{ position: "top", pageSize: exportPageLimit }}
        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,7 +72,14 @@ export function BillEnterModalLinesComponent({
          <BillLineSearchSelect
            disabled={disabled}
            options={lineData}
-            style={{ width: "100%", minWidth: "10rem" }}
+            style={{
+              width: "20rem",
+              maxWidth: "20rem",
+              minWidth: "10rem",
+              whiteSpace: "normal",
+              height: "auto",
+              minHeight: "32px" // default height of Ant Design inputs
+            }}
            allowRemoved={form.getFieldValue("is_credit_memo") || false}
            onSelect={(value, opt) => {
              setFieldsValue({
@@ -105,7 +112,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`,
@@ -119,7 +126,7 @@ export function BillEnterModalLinesComponent({
            ]
          };
        },
-        formInput: (record, index) => <Input disabled={disabled} />
+        formInput: (record, index) => <Input.TextArea disabled={disabled} autoSize />
      },
      {
        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={false}
+      popupMatchSelectWidth={true}
      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/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -3,13 +3,15 @@ import axios from "axios";
 import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } 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);

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

  return (
-    <AutoComplete options={data} onSearch={handleSearch} defaultActiveFirstOption onClear={() => setData([])}>
+    <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([])}
+    >
      <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 } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
@@ -13,6 +13,7 @@ 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);
@@ -20,7 +21,6 @@ export default function GlobalSearch() {
  const debouncedExecuteSearch = _.debounce(executeSearch, 750);

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

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

  return (
-    <AutoComplete options={options} onSearch={handleSearch} defaultActiveFirstOption>
+    <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);
+      }}
+    >
      <Input.Search
        size="large"
        placeholder={t("general.labels.globalsearch")}
--- 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,5 +1,8 @@
 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";
@@ -7,13 +10,10 @@ 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,13 +82,15 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
        variables: {
          lineId: jobLineEditModal.context.id,
          line: {
-            ...values,
-            prt_dsmk_m: Dinero({
-              amount: Math.round(values.act_price * 100)
+            ...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)
            })
-              .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}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || jobIds?.length > 10}>
      {t("jobs.actions.exportselected")}
    </Button>
  );
--- 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,7 +242,8 @@ export function PartsOrderListTableComponent({
      title: t("general.labels.actions"),
      dataIndex: "actions",
      key: "actions",
-      render: (text, record) => recordActions(record, true)
+      render: (text, record) => recordActions(record, true),
+      id: "parts-order-list-table-actions"
    }
  ];

--- 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}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || billids?.length > 10}>
      {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}>
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled || paymentIds?.length > 10}>
      {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
@@ -185,7 +185,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
  const cardSettings = useMemo(() => {
    const kanbanSettings = associationSettings?.kanban_settings;
    return mergeWithDefaults(kanbanSettings);
-  }, [associationSettings]);
+  }, [associationSettings?.kanban_settings]);

  const handleSettingsChange = () => {
    setFilter(defaultFilters);
--- 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,8 +1,9 @@
-import React, { useEffect, useMemo, useRef } from "react";
-import { useQuery, useSubscription } from "@apollo/client";
+import React, { useContext, useEffect, useMemo, useRef } from "react";
+import { useApolloClient, 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
@@ -10,6 +11,8 @@ 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,
@@ -17,7 +20,20 @@ const mapStateToProps = createStructuredSelector({
 });

 function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
-  const fired = useRef(false); // useRef to keep track of whether the subscription fired
+  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 combinedStatuses = useMemo(
    () => [
@@ -34,9 +50,12 @@ 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}`)
    }
  );
@@ -46,22 +65,112 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionTyp
    onError: (error) => console.error(`Error fetching Kanban settings: ${error.message}`)
  });

-  // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));
-
  useEffect(() => {
-    if (!updatedJobs) {
+    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]);
+
+  // Socket.IO implementation for users with Split treatment "off"
+  useEffect(() => {
+    if (subscriptionEnabled || !socket || !bodyshop || !bodyshop.id) {
      return;
    }
-    if (!fired.current) {
-      fired.current = true;
-      return;
-    }
-    refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
-  }, [updatedJobs, refetch]);
+
+    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]);

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

  return (
    <ProductionBoardKanbanComponent
--- a/client/src/components/production-board-kanban/production-board-kanban.styles.scss
+++ b/client/src/components/production-board-kanban/production-board-kanban.styles.scss
@@ -17,7 +17,6 @@
  border-radius: 5px 5px 0 0;
 }

-
 .production-alert {
  background: transparent;
  border: none;
@@ -70,3 +69,8 @@
    }
  }
 }
+
+.clone.is-dragging .ant-card {
+  border: #1890ff 2px solid !important;
+  border-radius: 12px;
+}
--- a/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
+++ b/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
@@ -1,15 +1,66 @@
+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: "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: 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: 11, name: "tasksInProduction", label: "tasks_in_production" }
 ];

--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/state/get-droppable-over.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/state/get-droppable-over.js
@@ -25,8 +25,8 @@ function getFurthestAway({ pageBorderBox, draggable, candidates }) {
      const axis = candidate.axis;
      const target = patch(
        candidate.axis.line,
-        // use the current center of the dragging item on the main axis
-        pageBorderBox.center[axis.line],
+        // use the center of the list on the main axis
+        candidate.page.borderBox.center[axis.line],
        // use the center of the list on the cross axis
        candidate.page.borderBox.center[axis.crossAxisLine]
      );
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-droppable-publisher/get-closest-scrollable.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-droppable-publisher/get-closest-scrollable.js
@@ -5,6 +5,7 @@ import getBodyElement from "../get-body-element";
 const isEqual = (base) => (value) => base === value;
 const isScroll = isEqual("scroll");
 const isAuto = isEqual("auto");
+const isOverlay = isEqual("overlay");
 const isVisible = isEqual("visible");
 const isEither = (overflow, fn) => fn(overflow.overflowX) || fn(overflow.overflowY);
 const isBoth = (overflow, fn) => fn(overflow.overflowX) && fn(overflow.overflowY);
@@ -14,7 +15,7 @@ const isElementScrollable = (el) => {
    overflowX: style.overflowX,
    overflowY: style.overflowY
  };
-  return isEither(overflow, isScroll) || isEither(overflow, isAuto);
+  return isEither(overflow, isScroll) || isEither(overflow, isAuto) || isEither(overflow, isOverlay);
 };

 // Special case for a body element
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-sensor-marshal/find-closest-draggable-id-from-event.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-sensor-marshal/find-closest-draggable-id-from-event.js
@@ -8,7 +8,7 @@ function getSelector(contextId) {
  return `[${attributes.dragHandle.contextId}="${contextId}"]`;
 }

-function findClosestDragHandleFromEvent(contextId, event) {
+export function findClosestDragHandleFromEvent(contextId, event) {
  const target = event.target;
  if (!isElement(target)) {
    warning("event.target must be a Element");
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-sensor-marshal/sensors/use-touch-sensor.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-sensor-marshal/sensors/use-touch-sensor.js
@@ -240,11 +240,14 @@ export default function useTouchSensor(api) {
          y: clientY
        };

+        const handle = api.findClosestDragHandle(event);
+        invariant(handle, "Touch sensor unable to find drag handle");
+
        // unbind this event handler
        unbindEventsRef.current();

        // eslint-disable-next-line no-use-before-define
-        startPendingDrag(actions, point);
+        startPendingDrag(actions, point, handle);
      }
    }),
    // not including stop or startPendingDrag as it is not defined initially
@@ -288,7 +291,7 @@ export default function useTouchSensor(api) {
    }
  }, [stop]);
  const bindCapturingEvents = useCallback(
-    function bindCapturingEvents() {
+    function bindCapturingEvents(target) {
      const options = {
        capture: true,
        passive: false
@@ -307,7 +310,7 @@ export default function useTouchSensor(api) {
      // Old behaviour:
      // https://gist.github.com/parris/dda613e3ae78f14eb2dc9fa0f4bfce3d
      // https://stackoverflow.com/questions/33298828/touch-move-event-dont-fire-after-touch-start-target-is-removed
-      const unbindTarget = bindEvents(window, getHandleBindings(args), options);
+      const unbindTarget = bindEvents(target, getHandleBindings(args), options);
      const unbindWindow = bindEvents(window, getWindowBindings(args), options);
      unbindEventsRef.current = function unbindAll() {
        unbindTarget();
@@ -330,7 +333,7 @@ export default function useTouchSensor(api) {
    [getPhase, setPhase]
  );
  const startPendingDrag = useCallback(
-    function startPendingDrag(actions, point) {
+    function startPendingDrag(actions, point, target) {
      invariant(getPhase().type === "IDLE", "Expected to move from IDLE to PENDING drag");
      const longPressTimerId = setTimeout(startDragging, timeForLongPress);
      setPhase({
@@ -339,7 +342,7 @@ export default function useTouchSensor(api) {
        actions,
        longPressTimerId
      });
-      bindCapturingEvents();
+      bindCapturingEvents(target);
    },
    [bindCapturingEvents, getPhase, setPhase, startDragging]
  );
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-sensor-marshal/use-sensor-marshal.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-sensor-marshal/use-sensor-marshal.js
@@ -23,7 +23,9 @@ import getBorderBoxCenterPosition from "../get-border-box-center-position";
 import { warning } from "../../dev-warning";
 import useLayoutEffect from "../use-isomorphic-layout-effect";
 import { noop } from "../../empty";
-import findClosestDraggableIdFromEvent from "./find-closest-draggable-id-from-event";
+import findClosestDraggableIdFromEvent, {
+  findClosestDragHandleFromEvent
+} from "./find-closest-draggable-id-from-event";
 import findDraggable from "../get-elements/find-draggable";
 import bindEvents from "../event-bindings/bind-events";

@@ -339,6 +341,9 @@ export default function useSensorMarshal({ contextId, store, registry, customSen
      }),
    [contextId, lockAPI, registry, store]
  );
+
+  const findClosestDragHandle = useCallback((event) => findClosestDragHandleFromEvent(contextId, event), [contextId]);
+
  const findClosestDraggableId = useCallback((event) => findClosestDraggableIdFromEvent(contextId, event), [contextId]);
  const findOptionsForDraggable = useCallback(
    (id) => {
@@ -370,9 +375,18 @@ export default function useSensorMarshal({ contextId, store, registry, customSen
      findClosestDraggableId,
      findOptionsForDraggable,
      tryReleaseLock,
-      isLockClaimed
+      isLockClaimed,
+      findClosestDragHandle
    }),
-    [canGetLock, tryGetLock, findClosestDraggableId, findOptionsForDraggable, tryReleaseLock, isLockClaimed]
+    [
+      canGetLock,
+      tryGetLock,
+      findClosestDraggableId,
+      findOptionsForDraggable,
+      tryReleaseLock,
+      isLockClaimed,
+      findClosestDragHandle
+    ]
  );

  // Bad ass
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-style-marshal/get-styles.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-style-marshal/get-styles.js
@@ -83,7 +83,13 @@ const getFinalStyles = (contextId) => {
    return {
      selector: getSelector(attributes.draggable.contextId),
      styles: {
-        dragging: transition,
+        dragging: `
+          ${transition}
+          user-select: none;
+          -webkit-user-select: none;
+          -moz-user-select: none;
+          -ms-user-select: none;
+        `,
        dropAnimating: transition,
        userCancel: transition
      }
--- a/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-style-marshal/use-style-marshal.js
+++ b/client/src/components/production-board-kanban/trello-board/dnd/lib/view/use-style-marshal/use-style-marshal.js
@@ -67,7 +67,9 @@ export default function useStyleMarshal(contextId, nonce) {
      const remove = (ref) => {
        const current = ref.current;
        invariant(current, "Cannot unmount ref as it is not set");
-        getHead().removeChild(current);
+        if (getHead().contains(current)) {
+          getHead().removeChild(current);
+        }
        ref.current = null;
      };
      remove(alwaysRef);
--- 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,25 +21,26 @@ export function ProductionListColumnStatus({ record, bodyshop, insertAuditTrail
  const [loading, setLoading] = useState(false);

  const handleSetStatus = async (e) => {
-    logImEXEvent("production_change_status");
-    //    e.stopPropagation();
-    setLoading(true);
-    const { key } = e;
-    await updateJob({
-      variables: {
-        jobId: record.id,
-        job: {
-          status: key
+    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
+          }
        }
-      }
-    });
-    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,41 +457,42 @@ 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
-            .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()}
+          {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"
+                      }}
                    >
-                      <DeleteOutlined onClick={(e) => e.stopPropagation()} />
-                    </Popconfirm>
-                  )}
-                </div>
-              </Select.Option>
-            ))}
+                      {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>
+              ))}
          <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,8 +76,8 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
  const { t } = useTranslation();

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

  useEffect(() => {
    const newColumns =
--- 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, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState, useRef } from "react";
 import {
  QUERY_EXACT_JOB_IN_PRODUCTION,
  QUERY_EXACT_JOBS_IN_PRODUCTION,
@@ -9,19 +9,46 @@ 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({ subscriptionType = "direct" }) {
+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
  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
    pollInterval: 3600000,
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
-  const client = useApolloClient();
-  const [joblist, setJoblist] = useState([]);
+
+  // Use GraphQL subscription when subscription is enabled
  const { data: updatedJobs } = useSubscription(
-    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION
+    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
+    {
+      skip: !subscriptionEnabled
+    }
  );

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

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

-    setJoblist(updatedJobs.jobs);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [updatedJobs]);
+    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 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) => {
-    client.query({
+    await client.query({
      query: QUERY_EXACT_JOB_IN_PRODUCTION,
-      variables: { id: jobId }
+      variables: { id: jobId },
+      fetchPolicy: "network-only"
    });
  };
-  const getUpdatedJobsData = async (jobIds) => {
+
+  const getUpdatedJobsData = (jobIds) => {
    client.query({
      query: QUERY_EXACT_JOBS_IN_PRODUCTION,
      variables: { ids: jobIds }
--- a/client/src/components/wss-status-display/wss-status-display.component.jsx
+++ b/client/src/components/wss-status-display/wss-status-display.component.jsx
@@ -0,0 +1,18 @@
+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/socketContext.jsx
+++ b/client/src/contexts/SocketIO/socketContext.jsx
@@ -0,0 +1,13 @@
+import React, { createContext } from "react";
+import useSocket from "./useSocket"; // Import the custom hook
+
+// Create the SocketContext
+const SocketContext = createContext(null);
+
+export const SocketProvider = ({ children, bodyshop }) => {
+  const { socket, clientId } = useSocket(bodyshop);
+
+  return <SocketContext.Provider value={{ socket, clientId }}> {children}</SocketContext.Provider>;
+};
+
+export default SocketContext;
--- a/client/src/contexts/SocketIO/useSocket.js
+++ b/client/src/contexts/SocketIO/useSocket.js
@@ -0,0 +1,88 @@
+import { useEffect, useState, useRef } from "react";
+import SocketIO from "socket.io-client";
+import { auth } from "../../firebase/firebase.utils";
+import { store } from "../../redux/store";
+import { setWssStatus } from "../../redux/application/application.actions";
+const useSocket = (bodyshop) => {
+  const socketRef = useRef(null);
+  const [clientId, setClientId] = useState(null);
+
+  useEffect(() => {
+    const unsubscribe = auth.onIdTokenChanged(async (user) => {
+      if (user) {
+        const newToken = await user.getIdToken();
+
+        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: "/wss",
+            withCredentials: true,
+            auth: { token: newToken },
+            reconnectionAttempts: Infinity,
+            reconnectionDelay: 2000,
+            reconnectionDelayMax: 10000
+          });
+
+          socketRef.current = socketInstance;
+
+          const handleBodyshopMessage = (message) => {
+            if (!import.meta.env.DEV) return;
+            console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
+          };
+
+          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;
+      }
+    };
+  }, [bodyshop]);
+
+  return { socket: socketRef.current, clientId };
+};
+
+export default useSocket;
--- a/client/src/pages/dms-payables/dms-payables.container.jsx
+++ b/client/src/pages/dms-payables/dms-payables.container.jsx
@@ -23,17 +23,14 @@ 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 : window.location.origin,
-  {
-    path: "/ws",
-    withCredentials: true,
-    auth: async (callback) => {
-      const token = auth.currentUser && (await auth.currentUser.getIdToken());
-      callback({ token });
-    }
+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 }) {
  const { t } = useTranslation();
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -34,7 +34,7 @@ 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 : "http://localhost:4000", // for dev testing,
+  import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", // for dev testing,
  {
    path: "/ws",
    withCredentials: true,
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,6 +1,6 @@
 import { FloatButton, Layout, Spin } from "antd";
 // import preval from "preval.macro";
-import React, { lazy, Suspense, useEffect, useState } from "react";
+import React, { lazy, Suspense, useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, Route, Routes } from "react-router-dom";
@@ -19,11 +19,13 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com
 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";

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

@@ -110,6 +112,7 @@ const mapDispatchToProps = (dispatch) => ({});
 export function Manage({ conflict, bodyshop }) {
  const { t } = useTranslation();
  const [chatVisible] = useState(false);
+  const { socket, clientId } = useContext(SocketContext);

  useEffect(() => {
    const widgetId = InstanceRenderManager({
@@ -129,6 +132,7 @@ export function Manage({ conflict, bodyshop }) {
      promanager: t("titles.promanager")
    });
  }, [t]);
+
  const AppRouteTable = (
    <Suspense
      fallback={
@@ -569,6 +573,13 @@ export function Manage({ conflict, bodyshop }) {
  else if (bodyshop && bodyshop.sub_status !== "active") PageContent = <ShopSubStatusComponent />;
  else PageContent = AppRouteTable;

+  const broadcastMessage = () => {
+    if (socket && bodyshop && bodyshop.id) {
+      console.log(`Broadcasting message to bodyshop ${bodyshop.id}:`);
+      socket.emit("broadcast-to-bodyshop", bodyshop.id, `Hello from ${clientId}`);
+    }
+  };
+
  return (
    <>
      {import.meta.env.PROD && <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />}
@@ -594,7 +605,8 @@ export function Manage({ conflict, bodyshop }) {
            }}
          >
            <div style={{ display: "flex" }}>
-              <div>
+              <WssStatusDisplayComponent />
+              <div onClick={broadcastMessage}>
                {`${InstanceRenderManager({
                  imex: t("titles.imexonline"),
                  rome: t("titles.romeonline"),
--- 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 subscriptionType={Production_Use_View.treatment} />
+      <ProductionListTable bodyshop={bodyshop} subscriptionType={Production_Use_View.treatment} />
    </>
  );
 }
--- a/client/src/redux/application/application.actions.js
+++ b/client/src/redux/application/application.actions.js
@@ -67,3 +67,7 @@ export const setUpdateAvailable = (isUpdateAvailable) => ({
  type: ApplicationActionTypes.SET_UPDATE_AVAILABLE,
  payload: isUpdateAvailable
 });
+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,6 +3,7 @@ import ApplicationActionTypes from "./application.types";
 const INITIAL_STATE = {
  loading: false,
  online: true,
+  wssStatus: "disconnected",
  updateAvailable: false,
  breadcrumbs: [],
  recentItems: [],
@@ -87,6 +88,9 @@ 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 };
+    }
    default:
      return state;
  }
--- a/client/src/redux/application/application.selectors.js
+++ b/client/src/redux/application/application.selectors.js
@@ -22,3 +22,4 @@ 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);
--- a/client/src/redux/application/application.types.js
+++ b/client/src/redux/application/application.types.js
@@ -12,6 +12,7 @@ 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_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE",
+  SET_WSS_STATUS: "SET_WSS_STATUS"
 };
 export default ApplicationActionTypes;
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -242,6 +242,10 @@ 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
@@ -310,8 +314,8 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
  try {
    const userEmail = yield select((state) => state.user.currentUser.email);
    try {
-      //console.log("Setting shop timezone.");
-      // dayjs.tz.setDefault(payload.timezone);
+      console.log("Setting shop timezone.");
+      day.tz.setDefault(payload.timezone);
    } catch (error) {
      console.log(error);
    }
@@ -371,6 +375,9 @@ 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": "",
+        "jobexported": "Job has been exported",
        "jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
        "jobimported": "Job imported.",
        "jobinproductionchange": "Job production status set to {{inproduction}}",
@@ -2849,15 +2849,21 @@
          "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_on_board": "Refinish Hours on Board",
+          "total_lar_in_view": "Refinish Hours in View"
        },
        "statistics_title": "Statistics"
      },
@@ -2869,15 +2875,21 @@
        "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_on_board": "Refinish Hours on Board",
+        "total_lar_in_view": "Refinish Hours in View"
      },
      "successes": {
        "removed": "Job removed from production."
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2849,15 +2849,21 @@
          "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_on_board": "",
+          "total_lar_in_view": ""
        },
        "statistics_title": ""
      },
@@ -2869,15 +2875,21 @@
        "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_on_board": "",
+        "total_lar_in_view": ""
      },
      "successes": {
        "removed": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2845,40 +2845,52 @@
 				"filters_title": "",
 				"information": "",
 				"layout": "",
-				"statistics": {
-					"jobs_in_production": "",
-					"tasks_in_production": "",
-					"tasks_on_board": "",
-					"total_amount_in_production": "",
-					"total_amount_on_board": "",
-					"total_hours_in_production": "",
-					"total_hours_on_board": "",
-					"total_jobs_on_board": "",
-					"total_lab_in_production": "",
-					"total_lab_on_board": "",
-					"total_lar_in_production": "",
-					"total_lar_on_board": ""
-				},
+        "statistics": {
+          "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": ""
+        },
 				"statistics_title": ""
 			},
-			"statistics": {
-				"currency_symbol": "",
-				"hours": "",
-				"jobs": "",
-				"jobs_in_production": "",
-				"tasks": "",
-				"tasks_in_production": "",
-				"tasks_on_board": "",
-				"total_amount_in_production": "",
-				"total_amount_on_board": "",
-				"total_hours_in_production": "",
-				"total_hours_on_board": "",
-				"total_jobs_on_board": "",
-				"total_lab_in_production": "",
-				"total_lab_on_board": "",
-				"total_lar_in_production": "",
-				"total_lar_on_board": ""
-			},
+      "statistics": {
+        "currency_symbol": "",
+        "hours": "",
+        "jobs": "",
+        "jobs_in_production": "",
+        "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": ""
+      },
 			"successes": {
 				"removed": ""
 			}
--- a/client/src/utils/CleanAxios.js
+++ b/client/src/utils/CleanAxios.js
@@ -2,9 +2,9 @@ import axios from "axios";
 import { auth } from "../firebase/firebase.utils";
 import InstanceRenderManager from "./instanceRenderMgr";

-axios.defaults.baseURL =
-  import.meta.env.VITE_APP_AXIOS_BASE_API_URL ||
-  (import.meta.env.MODE === "production" ? "https://api.imex.online/" : "http://localhost:4000/");
+axios.defaults.baseURL = import.meta.env.DEV
+  ? "/api/"
+  : import.meta.env.VITE_APP_AXIOS_BASE_API_URL || "https://api.imex.online/";

 export const axiosAuthInterceptorId = axios.interceptors.request.use(
  async (config) => {
--- a/client/src/utils/config.js
+++ b/client/src/utils/config.js
@@ -1,3 +1,4 @@
 // 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/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://${bodyshop.localmediaservernetwork}\\Jobs\\${jobid}`;
+  return `imexmedia://`.concat(encodeURIComponent(`${bodyshop.localmediaservernetwork}\\Jobs\\${jobid}`));
 }
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -3,16 +3,22 @@ import { promises as fsPromises } from "fs";
 import { createRequire } from "module";
 import * as path from "path";
 import * as url from "url";
-import { defineConfig } from "vite";
+import { createLogger, defineConfig } from "vite";
 import { ViteEjsPlugin } from "vite-plugin-ejs";
 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"
 });

+const getFormattedTimestamp = () =>
+  new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
+
+/** This is a hack around react-virtualized, should be removed when switching to react-virtuoso */
 const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`;

 function reactVirtualizedFix() {
@@ -32,10 +38,16 @@ function reactVirtualizedFix() {
    }
  };
 }
+/** End of hack */
+
+export const logger = createLogger("info", {
+  allowClearScreen: false
+});

 export default defineConfig({
  base: "/",
  plugins: [
+    //visualizer(),
    ViteEjsPlugin((viteConfig) => ({ env: viteConfig.env })),
    VitePWA({
      injectRegister: "auto",
@@ -99,7 +111,6 @@ export default defineConfig({
    reactVirtualizedFix(),
    react(),
    eslint()
-    // CompressionPlugin(), //Cloudfront already compresses assets, so not needed.
  ],
  define: {
    APP_VERSION: JSON.stringify(process.env.npm_package_version)
@@ -107,7 +118,69 @@ export default defineConfig({
  server: {
    host: true,
    port: 3000,
-    open: true
+    open: true,
+    proxy: {
+      "/ws": {
+        target: "ws://localhost:4000",
+        rewriteWsOrigin: true,
+        secure: false,
+        ws: true
+      },
+      "/wss": {
+        target: "ws://localhost:4000",
+        rewriteWsOrigin: true,
+        secure: false,
+        ws: true
+      },
+      "/api": {
+        target: "http://localhost:4000",
+        changeOrigin: true,
+        secure: false,
+        ws: false,
+        rewrite: (path) => {
+          const replacedValue = path.replace(/^\/api/, "");
+          logger.info(
+            `${chalk.grey.bold(getFormattedTimestamp())} ${chalk.cyan.bold("[vite]")} ${chalk.green.bold("[API]")} ${chalk.blue(replacedValue)}`
+          );
+          return replacedValue;
+        }
+      }
+    },
+    https: {
+      key: await fsPromises.readFile("../certs/key.pem"),
+      cert: await fsPromises.readFile("../certs/cert.pem"),
+      allowHTTP1: false // Force HTTP/2
+    }
+  },
+  preview: {
+    port: 6000,
+    host: true,
+    open: true,
+    https: {
+      key: await fsPromises.readFile("../certs/key.pem"),
+      cert: await fsPromises.readFile("../certs/cert.pem"),
+      allowHTTP1: false // Force HTTP/2
+    },
+    proxy: {
+      "/ws": {
+        target: "ws://localhost:4000",
+        rewriteWsOrigin: true,
+        secure: false,
+        ws: true
+      },
+      "/wss": {
+        target: "ws://localhost:4000",
+        rewriteWsOrigin: true,
+        secure: false,
+        ws: true
+      },
+      "/api": {
+        target: "http://localhost:4000",
+        changeOrigin: true,
+        secure: false,
+        ws: false
+      }
+    }
  },
  build: {
    rollupOptions: {
@@ -115,17 +188,63 @@ export default defineConfig({
        manualChunks: {
          antd: ["antd"],
          "react-redux": ["react-redux"],
-          redux: ["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"]
        }
      }
    }
  },
  optimizeDeps: {
-    include: ["react", "react-dom", "antd", "@apollo/client", "@reduxjs/toolkit", "axios"],
+    include: [
+      "react",
+      "react-dom",
+      "antd",
+      "lodash",
+      "@sentry/react",
+      "@apollo/client",
+      "@reduxjs/toolkit",
+      "axios",
+      "react-router-dom",
+      "dayjs",
+      "redux",
+      "react-redux"
+    ],
    esbuildOptions: {
      loader: {
        ".js": "jsx"
      }
    }
+  },
+  css: {
+    preprocessorOptions: {
+      scss: {
+        api: "modern-compiler",
+        quietDeps: true // Quite Deprecation Warnings, should be disabled occasionally before major upgrades
+      }
+    }
  }
 });
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,173 @@
+#############################
+# Ports Exposed
+# 4000 - Imex Node API 
+# 4556 - LocalStack (Local AWS)
+# 3333 - SocketIO Admin-UI (Optional)
+# 3334 - Redis-Insights (Optional)
+#############################
+
+services:
+  
+  # Redis Node 1 
+  redis-node-1:
+    build:
+      context: ./redis
+    container_name: redis-node-1
+    hostname: redis-node-1
+    restart: unless-stopped
+    networks:
+      - redis-cluster-net
+    volumes:
+      - redis-node-1-data:/data
+      - redis-lock:/redis-lock
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+  # Redis Node 2  
+  redis-node-2:
+    build:
+      context: ./redis
+    container_name: redis-node-2
+    hostname: redis-node-2
+    restart: unless-stopped
+    networks:
+      - redis-cluster-net
+    volumes:
+      - redis-node-2-data:/data
+      - redis-lock:/redis-lock
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+  # Redis Node 3
+  redis-node-3:
+    build:
+      context: ./redis
+    container_name: redis-node-3
+    hostname: redis-node-3
+    restart: unless-stopped
+    networks:
+      - redis-cluster-net
+    volumes:
+      - redis-node-3-data:/data
+      - redis-lock:/redis-lock
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+
+  # LocalStack: Used to emulate AWS services locally, currently setup for SES
+  # Notes: Set the ENV Debug to 1 for additional logging
+  localstack:
+    image: localstack/localstack
+    container_name: localstack
+    hostname: localstack
+    networks:
+      - redis-cluster-net
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - SERVICES=ses
+      - DEBUG=0
+      - AWS_ACCESS_KEY_ID=test
+      - AWS_SECRET_ACCESS_KEY=test
+      - AWS_DEFAULT_REGION=ca-central-1
+      - EXTRA_CORS_ALLOWED_HEADERS=Authorization,Content-Type
+      - EXTRA_CORS_ALLOWED_ORIGINS=*
+      - EXTRA_CORS_EXPOSE_HEADERS=Authorization,Content-Type
+    ports:
+      - "4566:4566"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4566/_localstack/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 20s
+
+  # AWS-CLI - Used in conjunction with LocalStack to set required permission to send emails
+  aws-cli:
+    image: amazon/aws-cli
+    container_name: aws-cli
+    hostname: aws-cli
+    networks:
+      - redis-cluster-net
+    depends_on:
+      localstack:
+        condition: service_healthy
+    environment:
+      - AWS_ACCESS_KEY_ID=test
+      - AWS_SECRET_ACCESS_KEY=test
+      - AWS_DEFAULT_REGION=ca-central-1
+    entrypoint: /bin/sh -c
+    command: >
+      "
+        aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
+        aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
+      "
+  # Node App: The Main IMEX API
+  node-app:
+    build:
+      context: .
+    container_name: node-app
+    hostname: imex-api
+    networks:
+      - redis-cluster-net
+    env_file:
+      - .env.development
+    depends_on:
+      redis-node-1:
+        condition: service_healthy
+      redis-node-2:
+        condition: service_healthy
+      redis-node-3:
+        condition: service_healthy
+      localstack:
+        condition: service_healthy
+      aws-cli:
+        condition: service_completed_successfully
+    ports:
+      - "4000:4000"
+    volumes:
+      - .:/app
+      - node-app-npm-cache:/app/node_modules
+
+#  ## Optional Container to Observe SocketIO data
+#  socketio-admin-ui:
+#    image: maitrungduc1410/socket.io-admin-ui
+#    container_name: socketio-admin-ui
+#    networks:
+#      - redis-cluster-net
+#    ports:
+#      - "3333:80"
+
+#  ##Optional Container to Observe Redis Cluster Data
+#  redis-insight:
+#    image: redislabs/redisinsight:latest
+#    container_name: redis-insight
+#    hostname: redis-insight
+#    restart: unless-stopped
+#    ports:
+#      - "3334:5540"
+#    networks:
+#      - redis-cluster-net
+#    volumes:
+#      - redis-insight-data:/db
+
+networks:
+  redis-cluster-net:
+    driver: bridge
+
+volumes:
+  node-app-npm-cache:
+  redis-node-1-data:
+  redis-node-2-data:
+  redis-node-3-data:
+  redis-lock:
+  redis-insight-data:
--- a/firebase/readme.md
+++ b/firebase/readme.md
@@ -1,4 +1,4 @@
 Must set the environment variables using:

-firebase functions:config:set auth.graphql_endpoint="https://db.dev.bodyshop.app/v1/graphql"
+firebase functions:config:set auth.graphql_endpoint="https://db.dev.imex.online/v1/graphql"
 auth.hasura_secret_admin_key="Dev-BodyShopApp!"
--- a/nodemon.json
+++ b/nodemon.json
@@ -0,0 +1,35 @@
+{
+  "watch": [
+    "server.js",
+    "server"
+  ],
+  "ignore": [
+    "client",
+    ".circleci",
+    ".platform",
+    ".idea",
+    ".vscode",
+    "_reference",
+    "firebase",
+    "hasura",
+    "logs",
+    "redis",
+    ".dockerignore",
+    ".ebignore",
+    ".editorconfig",
+    ".env.development",
+    ".env.development.rome",
+    ".eslintrc.json",
+    ".gitignore",
+    ".npmmrc",
+    ".prettierrc.js",
+    "bodyshop_translations.babel",
+    "Dockerfile",
+    "ecosystem.config.js",
+    "job-totals-testing-util.js",
+    "nodemon.json",
+    "package.json",
+    "package-lock.json",
+    "setadmin.js"
+  ]
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -19,44 +19,50 @@
    "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\""
  },
  "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.629.0",
-    "@aws-sdk/client-ses": "^3.629.0",
-    "@aws-sdk/credential-provider-node": "^3.629.0",
-    "@opensearch-project/opensearch": "^2.11.0",
-    "aws4": "^1.13.1",
-    "axios": "^1.7.4",
+    "@aws-sdk/client-elasticache": "^3.665.0",
+    "@aws-sdk/client-secrets-manager": "^3.654.0",
+    "@aws-sdk/client-ses": "^3.654.0",
+    "@aws-sdk/credential-provider-node": "^3.654.0",
+    "@opensearch-project/opensearch": "^2.12.0",
+    "@socket.io/admin-ui": "^0.5.1",
+    "@socket.io/redis-adapter": "^8.3.0",
+    "aws4": "^1.13.2",
+    "axios": "^1.7.7",
    "better-queue": "^3.8.12",
    "bluebird": "^3.7.2",
-    "body-parser": "^1.20.2",
+    "body-parser": "^1.20.3",
    "canvas": "^2.11.2",
-    "chart.js": "^4.4.3",
-    "cloudinary": "^2.4.0",
+    "chart.js": "^4.4.4",
+    "cloudinary": "^2.5.0",
    "compression": "^1.7.4",
    "cookie-parser": "^1.4.6",
    "cors": "2.8.5",
    "csrf": "^3.1.0",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
-    "express": "^4.19.2",
-    "firebase-admin": "^12.3.1",
+    "express": "^4.21.0",
+    "firebase-admin": "^12.5.0",
    "graphql": "^16.9.0",
    "graphql-request": "^6.1.0",
    "graylog2": "^0.2.1",
    "inline-css": "^4.0.2",
    "intuit-oauth": "^4.1.2",
+    "ioredis": "^5.4.1",
    "json-2-csv": "^5.5.5",
    "lodash": "^4.17.21",
    "moment": "^2.30.1",
    "moment-timezone": "^0.5.45",
    "multer": "^1.4.5-lts.1",
-    "node-mailjet": "^6.0.5",
+    "node-mailjet": "^6.0.6",
    "node-persist": "^4.0.3",
-    "nodemailer": "^6.9.14",
-    "phone": "^3.1.49",
+    "nodemailer": "^6.9.15",
+    "phone": "^3.1.50",
    "recursive-diff": "^1.0.9",
+    "redis": "^4.7.0",
    "rimraf": "^6.0.1",
-    "soap": "^1.1.1",
-    "socket.io": "^4.7.5",
+    "soap": "^1.1.4",
+    "socket.io": "^4.8.0",
+    "socket.io-adapter": "^2.5.5",
    "ssh2-sftp-client": "^10.0.3",
    "twilio": "^4.23.0",
    "uuid": "^10.0.0",
--- a/redis/Dockerfile
+++ b/redis/Dockerfile
@@ -0,0 +1,20 @@
+# Use the official Redis image
+FROM redis:7.0-alpine
+
+# Copy the Redis configuration file
+COPY redis.conf /usr/local/etc/redis/redis.conf
+
+# Copy the entrypoint script
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
+# Make the entrypoint script executable
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# Debugging step: List contents of /usr/local/bin
+RUN ls -l /usr/local/bin
+
+# Expose Redis ports
+EXPOSE 6379 16379
+
+# Set the entrypoint
+ENTRYPOINT ["entrypoint.sh"]
--- a/redis/entrypoint.sh
+++ b/redis/entrypoint.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+LOCKFILE="/redis-lock/redis-cluster-init.lock"
+
+# Start Redis server in the background
+redis-server /usr/local/etc/redis/redis.conf &
+
+# Wait for Redis server to start
+sleep 5
+
+# Only initialize the cluster if the lock file doesn't exist
+if [ ! -f "$LOCKFILE" ]; then
+  echo "Initializing Redis Cluster..."
+
+  # Create lock file to prevent further initialization attempts
+  touch "$LOCKFILE"
+  if [ $? -eq 0 ]; then
+    echo "Lock file created successfully at $LOCKFILE."
+  else
+    echo "Failed to create lock file."
+  fi
+
+  # Initialize the Redis cluster
+  yes yes | redis-cli --cluster create \
+    redis-node-1:6379 \
+    redis-node-2:6379 \
+    redis-node-3:6379 \
+    --cluster-replicas 0
+
+  echo "Redis Cluster initialized."
+else
+  echo "Cluster already initialized, skipping initialization."
+fi
+
+# Keep the container running
+tail -f /dev/null
--- a/redis/redis.conf
+++ b/redis/redis.conf
@@ -0,0 +1,6 @@
+bind 0.0.0.0
+port 6379
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 5000
+appendonly yes
--- a/server.js
+++ b/server.js
@@ -1,110 +1,329 @@
-// Import core modules
-const express = require("express");
 const cors = require("cors");
-const bodyParser = require("body-parser");
 const path = require("path");
+const http = require("http");
+const Redis = require("ioredis");
+const express = require("express");
+const bodyParser = require("body-parser");
 const compression = require("compression");
 const cookieParser = require("cookie-parser");
-const http = require("http");
 const { Server } = require("socket.io");
+const { createAdapter } = require("@socket.io/redis-adapter");
+const { instrument } = require("@socket.io/admin-ui");
+const { isString, isEmpty } = require("lodash");
+
+const logger = require("./server/utils/logger");
+const { applyRedisHelpers } = require("./server/utils/redisHelpers");
+const { applyIOHelpers } = require("./server/utils/ioHelpers");
+const { redisSocketEvents } = require("./server/web-sockets/redisSocketEvents");
+const { ElastiCacheClient, DescribeCacheClustersCommand } = require("@aws-sdk/client-elasticache");
+const { default: InstanceManager } = require("./server/utils/instanceMgr");

 // Load environment variables
 require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });

-// Import custom utilities and handlers
-const logger = require("./server/utils/logger");
+const CLUSTER_RETRY_BASE_DELAY = 100;
+const CLUSTER_RETRY_MAX_DELAY = 5000;
+const CLUSTER_RETRY_JITTER = 100;

-// Express app and server setup
-const app = express();
-const port = process.env.PORT || 5000;
-const server = http.createServer(app);
-const io = new Server(server, {
-  path: "/ws",
-  cors: {
-    origin: [
-      "https://test.imex.online",
-      "https://www.test.imex.online",
-      "http://localhost:3000",
-      "https://imex.online",
-      "https://www.imex.online",
-      "https://romeonline.io", //Added in all RO and PM routes to simplyify setup.
-      "https://www.romeonline.io",
-      "https://beta.test.romeonline.io",
-      "https://www.beta.test.romeonline.io",
-      "https://beta.romeonline.io",
-      "https://www.beta.romeonline.io",
-      "https://beta.test.imex.online",
-      "https://www.beta.test.imex.online",
-      "https://beta.imex.online",
-      "https://www.beta.imex.online",
-      "https://www.test.promanager.web-est.com",
-      "https://test.promanager.web-est.com",
-      "https://www.promanager.web-est.com",
-      "https://www.promanager.web-est.com"
-    ],
-    methods: ["GET", "POST"],
-    credentials: true,
-    exposedHeaders: ["set-cookie"]
+/**
+ * CORS Origin for Socket.IO
+ * @type {string[][]}
+ */
+const SOCKETIO_CORS_ORIGIN = [
+  "https://test.imex.online",
+  "https://www.test.imex.online",
+  "http://localhost:3000",
+  "https://localhost:3000",
+  "https://imex.online",
+  "https://www.imex.online",
+  "https://romeonline.io",
+  "https://www.romeonline.io",
+  "https://test.romeonline.io",
+  "https://www.test.romeonline.io",
+  "https://beta.romeonline.io",
+  "https://www.beta.romeonline.io",
+  "https://beta.test.imex.online",
+  "https://www.beta.test.imex.online",
+  "https://beta.imex.online",
+  "https://www.beta.imex.online",
+  "https://www.test.promanager.web-est.com",
+  "https://test.promanager.web-est.com",
+  "https://www.promanager.web-est.com",
+  "https://promanager.web-est.com",
+  "https://old.imex.online",
+  "https://www.old.imex.online",
+  "https://wsadmin.imex.online",
+  "https://www.wsadmin.imex.online"
+];
+
+const SOCKETIO_CORS_ORIGIN_DEV = ["http://localhost:3333", "https://localhost:3333"];
+
+/**
+ * Middleware for Express app
+ * @param app
+ */
+const applyMiddleware = ({ app }) => {
+  app.use(compression());
+  app.use(cookieParser());
+  app.use(bodyParser.json({ limit: "50mb" }));
+  app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
+  app.use(cors({ credentials: true, exposedHeaders: ["set-cookie"] }));
+
+  // Helper middleware
+  app.use((req, res, next) => {
+    req.logger = logger;
+    next();
+  });
+};
+
+/**
+ * Route groupings for Express app
+ * @param app
+ */
+const applyRoutes = ({ app }) => {
+  app.use("/", require("./server/routes/miscellaneousRoutes"));
+  app.use("/notifications", require("./server/routes/notificationsRoutes"));
+  app.use("/render", require("./server/routes/renderRoutes"));
+  app.use("/mixdata", require("./server/routes/mixDataRoutes"));
+  app.use("/accounting", require("./server/routes/accountingRoutes"));
+  app.use("/qbo", require("./server/routes/qboRoutes"));
+  app.use("/media", require("./server/routes/mediaRoutes"));
+  app.use("/sms", require("./server/routes/smsRoutes"));
+  app.use("/job", require("./server/routes/jobRoutes"));
+  app.use("/scheduling", require("./server/routes/schedulingRoutes"));
+  app.use("/utils", require("./server/routes/utilRoutes"));
+  app.use("/data", require("./server/routes/dataRoutes"));
+  app.use("/adm", require("./server/routes/adminRoutes"));
+  app.use("/tech", require("./server/routes/techRoutes"));
+  app.use("/intellipay", require("./server/routes/intellipayRoutes"));
+  app.use("/cdk", require("./server/routes/cdkRoutes"));
+  app.use("/csi", require("./server/routes/csiRoutes"));
+  app.use("/payroll", require("./server/routes/payrollRoutes"));
+
+  // Default route for forbidden access
+  app.get("/", (req, res) => {
+    res.status(200).send("Access Forbidden.");
+  });
+};
+
+/**
+ * Fetch Redis nodes from AWS ElastiCache
+ * @returns {Promise<string[]>}
+ */
+const getRedisNodesFromAWS = async () => {
+  const client = new ElastiCacheClient({
+    region: InstanceManager({
+      imex: "ca-central-1",
+      rome: "us-east-2"
+    })
+  });
+
+  const params = {
+    ReplicationGroupId: process.env.REDIS_CLUSTER_ID,
+    ShowCacheNodeInfo: true
+  };
+
+  try {
+    // Fetch the cache clusters associated with the replication group
+    const command = new DescribeCacheClustersCommand(params);
+    const response = await client.send(command);
+    const cacheClusters = response.CacheClusters;
+
+    return cacheClusters.flatMap((cluster) =>
+      cluster.CacheNodes.map((node) => `${node.Endpoint.Address}:${node.Endpoint.Port}`)
+    );
+  } catch (err) {
+    logger.log(`Error fetching Redis nodes from AWS: ${err.message}`, "ERROR", "redis", "api");
+    throw err;
  }
-});
-exports.io = io;
+};

-require("./server/web-sockets/web-socket");
+/**
+ * Connect to Redis Cluster
+ * @returns {Promise<unknown>}
+ */
+const connectToRedisCluster = async () => {
+  let redisServers;

-// Middleware
-app.use(compression());
-app.use(cookieParser());
-app.use(bodyParser.json({ limit: "50mb" }));
-app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
-app.use(cors({ credentials: true, exposedHeaders: ["set-cookie"] }));
+  if (isString(process.env?.REDIS_CLUSTER_ID) && !isEmpty(process.env?.REDIS_CLUSTER_ID)) {
+    // Fetch Redis nodes from AWS if AWS environment variables are present
+    redisServers = await getRedisNodesFromAWS();
+  } else {
+    // Use the Dockerized Redis cluster in development
+    if (isEmpty(process.env?.REDIS_URL) || !isString(process.env?.REDIS_URL)) {
+      logger.log(`[${process.env.NODE_ENV}] No or Malformed REDIS_URL present.`, "ERROR", "redis", "api");
+      process.exit(1);
+    }
+    try {
+      redisServers = JSON.parse(process.env.REDIS_URL);
+    } catch (error) {
+      logger.log(
+        `[${process.env.NODE_ENV}] Failed to parse REDIS_URL: ${error.message}. Exiting...`,
+        "ERROR",
+        "redis",
+        "api"
+      );
+      process.exit(1);
+    }
+  }

-// Helper middleware
-app.use((req, res, next) => {
-  req.logger = logger;
-  next();
-});
+  const clusterRetryStrategy = (times) => {
+    const delay =
+      Math.min(CLUSTER_RETRY_BASE_DELAY + times * 50, CLUSTER_RETRY_MAX_DELAY) + Math.random() * CLUSTER_RETRY_JITTER;
+    logger.log(
+      `[${process.env.NODE_ENV}] Redis cluster not yet ready. Retrying in ${delay.toFixed(2)}ms`,
+      "ERROR",
+      "redis",
+      "api"
+    );
+    return delay;
+  };

-// Route groupings
-app.use("/", require("./server/routes/miscellaneousRoutes"));
-app.use("/notifications", require("./server/routes/notificationsRoutes"));
-app.use("/render", require("./server/routes/renderRoutes"));
-app.use("/mixdata", require("./server/routes/mixDataRoutes"));
-app.use("/accounting", require("./server/routes/accountingRoutes"));
-app.use("/qbo", require("./server/routes/qboRoutes"));
-app.use("/media", require("./server/routes/mediaRoutes"));
-app.use("/sms", require("./server/routes/smsRoutes"));
-app.use("/job", require("./server/routes/jobRoutes"));
-app.use("/scheduling", require("./server/routes/schedulingRoutes"));
-app.use("/utils", require("./server/routes/utilRoutes"));
-app.use("/data", require("./server/routes/dataRoutes"));
-app.use("/adm", require("./server/routes/adminRoutes"));
-app.use("/tech", require("./server/routes/techRoutes"));
-app.use("/intellipay", require("./server/routes/intellipayRoutes"));
-app.use("/cdk", require("./server/routes/cdkRoutes"));
-app.use("/csi", require("./server/routes/csiRoutes"));
-app.use("/payroll", require("./server/routes/payrollRoutes"));
+  const redisCluster = new Redis.Cluster(redisServers, {
+    clusterRetryStrategy,
+    enableAutoPipelining: true,
+    enableReadyCheck: true,
+    redisOptions: {
+      // connectTimeout: 10000, // Timeout for connecting in ms
+      // idleTimeoutMillis: 30000, // Close idle connections after 30s
+      // maxRetriesPerRequest: 5 // Retry a maximum of 5 times per request
+    }
+  });

-// Default route for forbidden access
-app.get("/", (req, res) => {
-  res.status(200).send("Access Forbidden.");
-});
+  return new Promise((resolve, reject) => {
+    redisCluster.on("ready", () => {
+      logger.log(`[${process.env.NODE_ENV}] Redis cluster connection established.`, "INFO", "redis", "api");
+      resolve(redisCluster);
+    });

+    redisCluster.on("error", (err) => {
+      logger.log(`[${process.env.NODE_ENV}] Redis cluster connection failed: ${err.message}`, "ERROR", "redis", "api");
+      reject(err);
+    });
+  });
+};
+
+/**
+ * Apply Redis to the server
+ * @param server
+ * @param app
+ */
+const applySocketIO = async ({ server, app }) => {
+  const redisCluster = await connectToRedisCluster();
+
+  // Handle errors
+  redisCluster.on("error", (err) => {
+    logger.log(`[${process.env.NODE_ENV}] Redis ERROR`, "ERROR", "redis", "api");
+  });
+
+  const pubClient = redisCluster;
+  const subClient = pubClient.duplicate();
+
+  pubClient.on("error", (err) => logger.log(`Redis pubClient error: ${err}`, "ERROR", "redis"));
+  subClient.on("error", (err) => logger.log(`Redis subClient error: ${err}`, "ERROR", "redis"));
+
+  process.on("SIGINT", async () => {
+    logger.log("Closing Redis connections...", "INFO", "redis", "api");
+    try {
+      await Promise.all([pubClient.disconnect(), subClient.disconnect()]);
+      logger.log("Redis connections closed. Process will exit.", "INFO", "redis", "api");
+    } catch (error) {
+      logger.log(`Error closing Redis connections: ${error.message}`, "ERROR", "redis", "api");
+    }
+  });
+
+  const ioRedis = new Server(server, {
+    path: "/wss",
+    adapter: createAdapter(pubClient, subClient),
+    cors: {
+      origin:
+        process.env?.NODE_ENV === "development"
+          ? [...SOCKETIO_CORS_ORIGIN, ...SOCKETIO_CORS_ORIGIN_DEV]
+          : SOCKETIO_CORS_ORIGIN,
+      methods: ["GET", "POST"],
+      credentials: true,
+      exposedHeaders: ["set-cookie"]
+    }
+  });
+
+  if (isString(process.env.REDIS_ADMIN_PASS) && !isEmpty(process.env.REDIS_ADMIN_PASS)) {
+    logger.log(`[${process.env.NODE_ENV}] Initializing Redis Admin UI....`, "INFO", "redis", "api");
+    instrument(ioRedis, {
+      auth: {
+        type: "basic",
+        username: "admin",
+        password: process.env.REDIS_ADMIN_PASS
+      },
+
+      mode: process.env.REDIS_ADMIN_MODE || "development"
+    });
+  }
+
+  const io = new Server(server, {
+    path: "/ws",
+    cors: {
+      origin: SOCKETIO_CORS_ORIGIN,
+      methods: ["GET", "POST"],
+      credentials: true,
+      exposedHeaders: ["set-cookie"]
+    }
+  });
+
+  const api = {
+    pubClient,
+    io,
+    ioRedis,
+    redisCluster
+  };
+
+  app.use((req, res, next) => {
+    Object.assign(req, api);
+
+    next();
+  });
+
+  Object.assign(module.exports, api);
+
+  return api;
+};
+
+/**
+ * Main function to start the server
+ * @returns {Promise<void>}
+ */
 const main = async () => {
-  await server.listen(port);
+  const app = express();
+  const port = process.env.PORT || 5000;
+
+  const server = http.createServer(app);
+
+  const { pubClient, ioRedis } = await applySocketIO({ server, app });
+  const redisHelpers = applyRedisHelpers({ pubClient, app, logger });
+  const ioHelpers = applyIOHelpers({ app, redisHelpers, ioRedis, logger });
+
+  // Legacy Socket Events
+  require("./server/web-sockets/web-socket");
+
+  applyMiddleware({ app });
+  applyRoutes({ app });
+  redisSocketEvents({ io: ioRedis, redisHelpers, ioHelpers, logger });
+
+  try {
+    await server.listen(port);
+    logger.log(`[${process.env.NODE_ENV}] Server started on port ${port}`, "INFO", "api");
+  } catch (error) {
+    logger.log(`[${process.env.NODE_ENV}] Server failed to start on port ${port}`, "ERROR", "api", error);
+  }
 };

 // Start server
-main()
-  .then(() => {
-    logger.log(`[${process.env.NODE_ENV || "DEVELOPMENT"}] Server started on port ${port}`, "INFO", "api");
-  })
-  .catch((error) => {
-    logger.log(
-      `[${process.env.NODE_ENV || "DEVELOPMENT"}] Server failed to start on port ${port}`,
-      "ERROR",
-      "api",
-      error
-    );
+main().catch((error) => {
+  logger.log(`Main-API-Error: Something was not caught in the application.`, "error", "api", null, {
+    error: error.message,
+    errorjson: JSON.stringify(error)
  });
+  // Note: If we want the app to crash on all uncaught async operations, we would
+  // need to put a `process.exit(1);` here
+});
--- a/server/accounting/pbs/pbs-job-export.js
+++ b/server/accounting/pbs/pbs-job-export.js
@@ -602,18 +602,22 @@ async function MarkJobExported(socket, jobid) {
 }

 async function InsertFailedExportLog(socket, error) {
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-  const result = await client
-    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
-    .request(queries.INSERT_EXPORT_LOG, {
-      log: {
-        bodyshopid: socket.JobData.bodyshop.id,
-        jobid: socket.JobData.id,
-        successful: false,
-        message: [error],
-        useremail: socket.user.email
-      }
-    });
+  try {
+    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
+    const result = await client
+      .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
+      .request(queries.INSERT_EXPORT_LOG, {
+        log: {
+          bodyshopid: socket.JobData.bodyshop.id,
+          jobid: socket.JobData.id,
+          successful: false,
+          message: [error],
+          useremail: socket.user.email
+        }
+      });

-  return result;
+    return result;
+  } catch (error2) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
+  }
 }
--- a/server/cdk/cdk-job-export.js
+++ b/server/cdk/cdk-job-export.js
@@ -986,18 +986,22 @@ async function MarkJobExported(socket, jobid) {
 }

 async function InsertFailedExportLog(socket, error) {
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-  const result = await client
-    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
-    .request(queries.INSERT_EXPORT_LOG, {
-      log: {
-        bodyshopid: socket.JobData.bodyshop.id,
-        jobid: socket.JobData.id,
-        successful: false,
-        message: [error],
-        useremail: socket.user.email
-      }
-    });
+  try {
+    const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
+    const result = await client
+      .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
+      .request(queries.INSERT_EXPORT_LOG, {
+        log: {
+          bodyshopid: socket.JobData.bodyshop.id,
+          jobid: socket.JobData.id,
+          successful: false,
+          message: [error],
+          useremail: socket.user.email
+        }
+      });

-  return result;
+    return result;
+  } catch (error2) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
+  }
 }
--- a/server/email/mailer.js
+++ b/server/email/mailer.js
@@ -0,0 +1,31 @@
+const { isString, isEmpty } = require("lodash");
+const { defaultProvider } = require("@aws-sdk/credential-provider-node");
+const { default: InstanceManager } = require("../utils/instanceMgr");
+const aws = require("@aws-sdk/client-ses");
+const nodemailer = require("nodemailer");
+
+const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
+
+const sesConfig = {
+  apiVersion: "latest",
+  credentials: defaultProvider(),
+  region: isLocal
+    ? "ca-central-1"
+    : InstanceManager({
+        imex: "ca-central-1",
+        rome: "us-east-2"
+      })
+};
+
+if (isLocal) {
+  sesConfig.endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:4566`;
+  console.log(`SES Mailer set to LocalStack end point: ${sesConfig.endpoint}`);
+}
+
+const ses = new aws.SES(sesConfig);
+
+let transporter = nodemailer.createTransport({
+  SES: { ses, aws }
+});
+
+module.exports = transporter;
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -3,30 +3,13 @@ require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
 const axios = require("axios");
-let nodemailer = require("nodemailer");
-let aws = require("@aws-sdk/client-ses");
-let { defaultProvider } = require("@aws-sdk/credential-provider-node");
 const InstanceManager = require("../utils/instanceMgr").default;
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 const { isObject } = require("lodash");
 const generateEmailTemplate = require("./generateTemplate");
-const moment = require("moment");
-
-const ses = new aws.SES({
-  // The key apiVersion is no longer supported in v3, and can be removed.
-  // @deprecated The client uses the "latest" apiVersion.
-  apiVersion: "latest",
-  defaultProvider,
-  region: InstanceManager({
-    imex: "ca-central-1",
-    rome: "us-east-2"
-  })
-});
-let transporter = nodemailer.createTransport({
-  SES: { ses, aws }
-});
+const mailer = require("./mailer");

 // Get the image from the URL and return it as a base64 string
 const getImage = async (imageUrl) => {
@@ -66,7 +49,7 @@ const logEmail = async (req, email) => {
 const sendServerEmail = async ({ subject, text }) => {
  if (process.env.NODE_ENV === undefined) return;
  try {
-    transporter.sendMail(
+    mailer.sendMail(
      {
        from: InstanceManager({
          imex: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
@@ -96,9 +79,9 @@ const sendServerEmail = async ({ subject, text }) => {
  }
 };

-const sendProManagerWelcomeEmail = async ({to, subject, html}) => {
+const sendProManagerWelcomeEmail = async ({ to, subject, html }) => {
  try {
-    await transporter.sendMail({
+    await mailer.sendMail({
      from: `ProManager <noreply@promanager.web-est.com>`,
      to,
      subject,
@@ -112,7 +95,7 @@ const sendProManagerWelcomeEmail = async ({to, subject, html}) => {

 const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachments }) => {
  try {
-    transporter.sendMail(
+    mailer.sendMail(
      {
        from: InstanceManager({
          imex: `ImEX Online <noreply@imex.online>`,
@@ -166,7 +149,7 @@ const sendEmail = async (req, res) => {
    );
  }

-  transporter.sendMail(
+  mailer.sendMail(
    {
      from: `${req.body.from.name} <${req.body.from.address}>`,
      replyTo: req.body.ReplyTo.Email,
@@ -280,7 +263,7 @@ const emailBounce = async (req, res) => {
        status: "Bounced",
        context: message.bounce?.bouncedRecipients
      });
-      transporter.sendMail(
+      mailer.sendMail(
        {
          from: InstanceMgr({
            imex: `ImEX Online <noreply@imex.online>`,
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -2,30 +2,14 @@ const path = require("path");
 require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });
-let nodemailer = require("nodemailer");
-let aws = require("@aws-sdk/client-ses");
-let { defaultProvider } = require("@aws-sdk/credential-provider-node");
 const InstanceManager = require("../utils/instanceMgr").default;
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 const generateEmailTemplate = require("./generateTemplate");
-const moment = require("moment");
+const moment = require("moment-timezone");
 const { taskEmailQueue } = require("./tasksEmailsQueue");
-
-const ses = new aws.SES({
-  apiVersion: "latest",
-  defaultProvider,
-  region: InstanceManager({
-    imex: "ca-central-1",
-    rome: "us-east-2"
-  })
-});
-
-const transporter = nodemailer.createTransport({
-  SES: { ses, aws },
-  sendingRate: InstanceManager({ imex: 40, rome: 10 })
-});
+const mailer = require("./mailer");

 // Initialize the Tasks Email Queue
 const tasksEmailQueue = taskEmailQueue();
@@ -41,28 +25,32 @@ const tasksEmailQueueCleanup = async () => {
  }
 };

-if (process.env.NODE_ENV !== "development") {
-  // Handling SIGINT (e.g., Ctrl+C)
-  process.on("SIGINT", async () => {
-    await tasksEmailQueueCleanup();
-    process.exit(0);
-  });
-  // Handling SIGTERM (e.g., sent by system shutdown)
-  process.on("SIGTERM", async () => {
-    await tasksEmailQueueCleanup();
-    process.exit(0);
-  });
-  // Handling uncaught exceptions
-  process.on("uncaughtException", async (err) => {
-    await tasksEmailQueueCleanup();
-    process.exit(1); // Exit with an 'error' code
-  });
-  // Handling unhandled promise rejections
-  process.on("unhandledRejection", async (reason, promise) => {
-    await tasksEmailQueueCleanup();
-    process.exit(1); // Exit with an 'error' code
-  });
-}
+// if (process.env.NODE_ENV !== "development") {
+//   // Handling SIGINT (e.g., Ctrl+C)
+//   process.on("SIGINT", async () => {
+//     console.log("Handling SIGNIT For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(0);
+//   });
+//   // Handling SIGTERM (e.g., sent by system shutdown)
+//   process.on("SIGTERM", async () => {
+//     console.log("Handling SIGTERM For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(0);
+//   });
+//   // Handling uncaught exceptions
+//   process.on("uncaughtException", async (err) => {
+//     console.log("Handling uncaughtException For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(1);
+//   });
+//   // Handling unhandled promise rejections
+//   process.on("unhandledRejection", async (reason, promise) => {
+//     console.log("Handling unhandledRejection For Tasks Cleanup");
+//     await tasksEmailQueueCleanup();
+//     process.exit(1);
+//   });
+// }

 /**
 * Format the date for the email.
@@ -108,12 +96,13 @@ const getEndpoints = (bodyshop) =>
          : "https://romeonline.io"
  });

-const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId) => {
+const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId, dateLine) => {
  const endPoints = getEndpoints(bodyshop);
  return {
    header: title,
    subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)}`,
-    body: `Reference: ${job.ro_number || "N/A"} | ${job.ownr_co_nm ? job.ownr_co_nm : `${job.ownr_fn || ""} ${job.ownr_ln || ""}`.trim()} | ${`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim()}<br>${description ? description.concat("<br>") : ""}<a href="${endPoints}/manage/tasks/alltasks?taskid=${taskId}">View this task.</a>`
+    body: `Reference: ${job.ro_number || "N/A"} | ${job.ownr_co_nm ? job.ownr_co_nm : `${job.ownr_fn || ""} ${job.ownr_ln || ""}`.trim()} | ${`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim()}<br>${description ? description.concat("<br>") : ""}<a href="${endPoints}/manage/tasks/alltasks?taskid=${taskId}">View this task.</a>`,
+    dateLine
  };
 };

@@ -125,6 +114,7 @@ const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, j
 * @param html
 * @param taskIds
 * @param successCallback
+ * @param requestInstance
 */
 const sendMail = (type, to, subject, html, taskIds, successCallback, requestInstance) => {
  const fromEmails = InstanceManager({
@@ -135,7 +125,7 @@ const sendMail = (type, to, subject, html, taskIds, successCallback, requestInst
        : "Rome Online <noreply@romeonline.io>"
  });

-  transporter.sendMail(
+  mailer.sendMail(
    {
      from: fromEmails,
      to,
@@ -152,8 +142,6 @@ const sendMail = (type, to, subject, html, taskIds, successCallback, requestInst
      }
    }
  );
-  // }
-  // });
 };

 /**
@@ -178,6 +166,8 @@ const taskAssignedEmail = async (req, res) => {
    id: newTask.id
  });

+  const dateLine = moment().tz(tasks_by_pk.bodyshop.timezone).format("M/DD/YYYY @ hh:mm a");
+
  sendMail(
    "assigned",
    tasks_by_pk.assigned_to_employee.user_email,
@@ -190,7 +180,8 @@ const taskAssignedEmail = async (req, res) => {
        newTask.due_date,
        tasks_by_pk.bodyshop,
        tasks_by_pk.job,
-        newTask.id
+        newTask.id,
+        dateLine
      )
    ),
    null,
@@ -247,7 +238,7 @@ const tasksRemindEmail = async (req, res) => {
      const fromEmails = InstanceManager({
        imex: "ImEX Online <noreply@imex.online>",
        rome:
-        tasksRequest?.tasks[0].bodyshop.convenient_company === "promanager"
+          tasksRequest?.tasks[0].bodyshop.convenient_company === "promanager"
            ? "ProManager <noreply@promanager.web-est.com>"
            : "Rome Online <noreply@romeonline.io>"
      });
@@ -259,6 +250,8 @@ const tasksRemindEmail = async (req, res) => {

      const taskIds = groupedTasks[recipient.email].map((task) => task.id);

+      const dateLine = moment().tz(tasksRequest?.tasks[0].bodyshop.timezone).format("M/DD/YYYY @ hh:mm a");
+
      // There is only the one email to send to this author.
      if (recipient.count === 1) {
        const onlyTask = groupedTasks[recipient.email][0];
@@ -274,7 +267,8 @@ const tasksRemindEmail = async (req, res) => {
            onlyTask.due_date,
            onlyTask.bodyshop,
            onlyTask.job,
-            onlyTask.id
+            onlyTask.id,
+            dateLine
          )
        );
      }
@@ -283,7 +277,7 @@ const tasksRemindEmail = async (req, res) => {
        const endPoints = InstanceManager({
          imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
          rome:
-          tasksRequest?.tasks[0].bodyshop.convenient_company === "promanager"
+            tasksRequest?.tasks[0].bodyshop.convenient_company === "promanager"
              ? process.env?.NODE_ENV === "test"
                ? "https//test.promanager.web-est.com"
                : "https://promanager.web-est.com"
@@ -297,6 +291,7 @@ const tasksRemindEmail = async (req, res) => {
        emailData.html = generateEmailTemplate({
          header: `${allTasks.length} Tasks require your attention`,
          subHeader: `Please click on the Tasks below to view the Task.`,
+          dateLine,
          body: `<ul>
              ${allTasks
                .map((task) =>
@@ -335,6 +330,29 @@ const tasksRemindEmail = async (req, res) => {
  }
 };

+// Note: Uncomment this to test locally, it will call the remind_at email check every 20 seconds
+// const callTaskRemindEmailInternally = () => {
+//   const req = {
+//     body: {
+//       // You can mock any request data here if needed
+//     }
+//   };
+//
+//   const res = {
+//     status: (code) => {
+//       return {
+//         json: (data) => {
+//           console.log(`Response Status: ${code}`, data);
+//         }
+//       };
+//     }
+//   };
+//
+//   // Call the taskRemindEmail function with mock req and res
+//   tasksRemindEmail(req, res);
+// };
+// setInterval(callTaskRemindEmailInternally, 20000);
+
 module.exports = {
  taskAssignedEmail,
  tasksRemindEmail,
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -2489,6 +2489,7 @@ exports.QUERY_REMIND_TASKS = `
      bodyshop {
        shopname
        convenient_company
+        timezone
      }
      bodyshopid
    }
@@ -2512,6 +2513,7 @@ query QUERY_TASK_BY_ID($id: uuid!) {
    bodyshop{
      shopname
      convenient_company
+      timezone
    }
    job{
      ro_number
--- a/server/ioevent/ioevent.js
+++ b/server/ioevent/ioevent.js
@@ -7,21 +7,32 @@ require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });

+// Emit this to bodyshop room
+
 exports.default = async (req, res) => {
  const { useremail, bodyshopid, operationName, variables, env, time, dbevent, user } = req.body;
-
+  const {
+    ioRedis,
+    ioHelpers: { getBodyshopRoom }
+  } = req;
  try {
-    await client.request(queries.INSERT_IOEVENT, {
-      event: {
-        operationname: operationName,
-        time,
-        dbevent,
-        env,
-        variables,
-        bodyshopid,
-        useremail
-      }
+    // await client.request(queries.INSERT_IOEVENT, {
+    //   event: {
+    //     operationname: operationName,
+    //     time,
+    //     dbevent,
+    //     env,
+    //     variables,
+    //     bodyshopid,
+    //     useremail
+    //   }
+    // });
+
+    ioRedis.to(getBodyshopRoom(bodyshopid)).emit("bodyshop-message", {
+      operationName,
+      useremail
    });
+
    res.sendStatus(200);
  } catch (error) {
    logger.log("ioevent-error", "trace", user, null, {
--- a/server/job/job-updated.js
+++ b/server/job/job-updated.js
@@ -0,0 +1,32 @@
+const { isObject } = require("lodash");
+
+const jobUpdated = async (req, res) => {
+  const { ioRedis, logger, ioHelpers } = req;
+
+  if (!req?.body?.event?.data?.new || !isObject(req?.body?.event?.data?.new)) {
+    logger.log("job-update-error", "ERROR", req.user?.email, null, {
+      message: `Malformed Job Update request sent from Hasura`,
+      body: req?.body
+    });
+
+    return res.json({
+      status: "error",
+      message: `Malformed Job Update request sent from Hasura`
+    });
+  }
+
+  logger.log("job-update", "INFO", req.user?.email, null, {
+    message: `Job updated event received from Hasura`,
+    jobid: req?.body?.event?.data?.new?.id
+  });
+
+  const updatedJob = req.body.event.data.new;
+  const bodyshopID = updatedJob.shopid;
+
+  // Emit the job-updated event only to the room corresponding to the bodyshop
+  ioRedis.to(ioHelpers.getBodyshopRoom(bodyshopID)).emit("production-job-updated", updatedJob);
+
+  return res.json({ message: "Job updated and event emitted" });
+};
+
+module.exports = jobUpdated;
--- a/server/job/job.js
+++ b/server/job/job.js
@@ -14,3 +14,4 @@ exports.costing = require("./job-costing").JobCosting;
 exports.costingmulti = require("./job-costing").JobCostingMulti;
 exports.statustransition = require("./job-status-transition").statustransition;
 exports.lifecycle = require("./job-lifecycle");
+exports.jobUpdated = require("./job-updated");
--- a/server/routes/jobRoutes.js
+++ b/server/routes/jobRoutes.js
@@ -5,7 +5,7 @@ const ppc = require("../ccc/partspricechange");
 const { partsScan } = require("../parts-scan/parts-scan");
 const eventAuthorizationMiddleware = require("../middleware/eventAuthorizationMIddleware");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const { totals, statustransition, totalsSsu, costing, lifecycle, costingmulti } = require("../job/job");
+const { totals, statustransition, totalsSsu, costing, lifecycle, costingmulti, jobUpdated } = require("../job/job");
 const withUserGraphQLClientMiddleware = require("../middleware/withUserGraphQLClientMiddleware");

 router.post("/totals", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, totals);
@@ -16,5 +16,6 @@ router.post("/lifecycle", validateFirebaseIdTokenMiddleware, withUserGraphQLClie
 router.post("/costingmulti", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, costingmulti);
 router.post("/partsscan", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, partsScan);
 router.post("/ppc", validateFirebaseIdTokenMiddleware, withUserGraphQLClientMiddleware, ppc.generatePpc);
+router.post("/job-updated", eventAuthorizationMiddleware, jobUpdated);

 module.exports = router;
--- a/server/utils/ioHelpers.js
+++ b/server/utils/ioHelpers.js
@@ -0,0 +1,17 @@
+const applyIOHelpers = ({ app, api, io, logger }) => {
+  const getBodyshopRoom = (bodyshopID) => `bodyshop-broadcast-room:${bodyshopID}`;
+
+  const ioHelpersAPI = {
+    getBodyshopRoom
+  };
+
+  // Helper middleware
+  app.use((req, res, next) => {
+    req.ioHelpers = ioHelpersAPI;
+    next();
+  });
+
+  return ioHelpersAPI;
+};
+
+module.exports = { applyIOHelpers };
--- a/server/utils/redisHelpers.js
+++ b/server/utils/redisHelpers.js
@@ -0,0 +1,229 @@
+/**
+ * Apply Redis helper functions
+ * @param pubClient
+ * @param app
+ * @param logger
+ */
+const applyRedisHelpers = ({ pubClient, app, logger }) => {
+  // Store session data in Redis
+  const setSessionData = async (socketId, key, value) => {
+    try {
+      await pubClient.hset(`socket:${socketId}`, key, JSON.stringify(value)); // Use Redis pubClient
+    } catch (error) {
+      logger.log(`Error Setting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Retrieve session data from Redis
+  const getSessionData = async (socketId, key) => {
+    try {
+      const data = await pubClient.hget(`socket:${socketId}`, key);
+      return data ? JSON.parse(data) : null;
+    } catch (error) {
+      logger.log(`Error Getting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Clear session data from Redis
+  const clearSessionData = async (socketId) => {
+    try {
+      await pubClient.del(`socket:${socketId}`);
+    } catch (error) {
+      logger.log(`Error Clearing Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Store multiple session data in Redis
+  const setMultipleSessionData = async (socketId, keyValues) => {
+    try {
+      // keyValues is expected to be an object { key1: value1, key2: value2, ... }
+      const entries = Object.entries(keyValues).map(([key, value]) => [key, JSON.stringify(value)]);
+      await pubClient.hset(`socket:${socketId}`, ...entries.flat());
+    } catch (error) {
+      logger.log(`Error Setting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Retrieve multiple session data from Redis
+  const getMultipleSessionData = async (socketId, keys) => {
+    try {
+      const data = await pubClient.hmget(`socket:${socketId}`, keys);
+      // Redis returns an object with null values for missing keys, so we parse the non-null ones
+      return Object.fromEntries(keys.map((key, index) => [key, data[index] ? JSON.parse(data[index]) : null]));
+    } catch (error) {
+      logger.log(`Error Getting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  const setMultipleFromArraySessionData = async (socketId, keyValueArray) => {
+    try {
+      // Use Redis multi/pipeline to batch the commands
+      const multi = pubClient.multi();
+      keyValueArray.forEach(([key, value]) => {
+        multi.hset(`socket:${socketId}`, key, JSON.stringify(value));
+      });
+      await multi.exec(); // Execute all queued commands
+    } catch (error) {
+      logger.log(`Error Setting Multiple Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Helper function to add an item to the end of the Redis list
+  const addItemToEndOfList = async (socketId, key, newItem) => {
+    try {
+      await pubClient.rpush(`socket:${socketId}:${key}`, JSON.stringify(newItem));
+    } catch (error) {
+      logger.log(`Error adding item to the end of the list for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Helper function to add an item to the beginning of the Redis list
+  const addItemToBeginningOfList = async (socketId, key, newItem) => {
+    try {
+      await pubClient.lpush(`socket:${socketId}:${key}`, JSON.stringify(newItem));
+    } catch (error) {
+      logger.log(`Error adding item to the beginning of the list for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Helper function to clear a list in Redis
+  const clearList = async (socketId, key) => {
+    try {
+      await pubClient.del(`socket:${socketId}:${key}`);
+    } catch (error) {
+      logger.log(`Error clearing list for socket ${socketId}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  // Add methods to manage room users
+  const addUserToRoom = async (room, user) => {
+    try {
+      await pubClient.sadd(room, JSON.stringify(user));
+    } catch (error) {
+      logger.log(`Error adding user to room ${room}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  const removeUserFromRoom = async (room, user) => {
+    try {
+      await pubClient.srem(room, JSON.stringify(user));
+    } catch (error) {
+      logger.log(`Error removing user to room ${room}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  const getUsersInRoom = async (room) => {
+    try {
+      const users = await pubClient.smembers(room);
+      return users.map((user) => JSON.parse(user));
+    } catch (error) {
+      logger.log(`Error getting users in room ${room}: ${error}`, "ERROR", "redis");
+    }
+  };
+
+  const api = {
+    setSessionData,
+    getSessionData,
+    clearSessionData,
+    setMultipleSessionData,
+    getMultipleSessionData,
+    setMultipleFromArraySessionData,
+    addItemToEndOfList,
+    addItemToBeginningOfList,
+    clearList,
+    addUserToRoom,
+    removeUserFromRoom,
+    getUsersInRoom
+  };
+
+  Object.assign(module.exports, api);
+
+  app.use((req, res, next) => {
+    req.sessionUtils = api;
+    next();
+  });
+
+  // Demo to show how all the helper functions work
+  // const demoSessionData = async () => {
+  //   const socketId = "testSocketId";
+  //
+  //   // 1. Test setSessionData and getSessionData
+  //   await setSessionData(socketId, "field1", "Hello, Redis!");
+  //   const field1Value = await getSessionData(socketId, "field1");
+  //   console.log("Retrieved single field value:", field1Value);
+  //
+  //   // 2. Test setMultipleSessionData and getMultipleSessionData
+  //   await setMultipleSessionData(socketId, { field2: "Second Value", field3: "Third Value" });
+  //   const multipleFields = await getMultipleSessionData(socketId, ["field2", "field3"]);
+  //   console.log("Retrieved multiple field values:", multipleFields);
+  //
+  //   // 3. Test setMultipleFromArraySessionData
+  //   await setMultipleFromArraySessionData(socketId, [
+  //     ["field4", "Fourth Value"],
+  //     ["field5", "Fifth Value"]
+  //   ]);
+  //
+  //   // Retrieve and log all fields
+  //   const allFields = await getMultipleSessionData(socketId, ["field1", "field2", "field3", "field4", "field5"]);
+  //   console.log("Retrieved all field values:", allFields);
+  //
+  //   // 4. Test list functions
+  //   // Add item to the end of a Redis list
+  //   await addItemToEndOfList(socketId, "logEvents", { event: "Log Event 1", timestamp: new Date() });
+  //   await addItemToEndOfList(socketId, "logEvents", { event: "Log Event 2", timestamp: new Date() });
+  //
+  //   // Add item to the beginning of a Redis list
+  //   await addItemToBeginningOfList(socketId, "logEvents", { event: "First Log Event", timestamp: new Date() });
+  //
+  //   // Retrieve the entire list
+  //   const logEventsData = await pubClient.lrange(`socket:${socketId}:logEvents`, 0, -1);
+  //   const logEvents = logEventsData.map((item) => JSON.parse(item));
+  //   console.log("Log Events List:", logEvents);
+  //
+  //   // 5. Test clearList
+  //   await clearList(socketId, "logEvents");
+  //   console.log("Log Events List cleared.");
+  //
+  //   // Retrieve the list after clearing to confirm it's empty
+  //   const logEventsAfterClear = await pubClient.lrange(`socket:${socketId}:logEvents`, 0, -1);
+  //   console.log("Log Events List after clearing:", logEventsAfterClear); // Should be an empty array
+  //
+  //   // 6. Test clearSessionData
+  //   await clearSessionData(socketId);
+  //   console.log("Session data cleared.");
+  //
+  //   // 7. Test room functions
+  //   const roomName = "testRoom";
+  //   const user1 = { id: 1, name: "Alice" };
+  //   const user2 = { id: 2, name: "Bob" };
+  //
+  //   // Add users to room
+  //   await addUserToRoom(roomName, user1);
+  //   await addUserToRoom(roomName, user2);
+  //
+  //   // Get users in room
+  //   const usersInRoom = await getUsersInRoom(roomName);
+  //   console.log(`Users in room ${roomName}:`, usersInRoom);
+  //
+  //   // Remove a user from room
+  //   await removeUserFromRoom(roomName, user1);
+  //
+  //   // Get users in room after removal
+  //   const usersInRoomAfterRemoval = await getUsersInRoom(roomName);
+  //   console.log(`Users in room ${roomName} after removal:`, usersInRoomAfterRemoval);
+  //
+  //   // Clean up: remove remaining users from room
+  //   await removeUserFromRoom(roomName, user2);
+  //
+  //   // Verify room is empty
+  //   const usersInRoomAfterCleanup = await getUsersInRoom(roomName);
+  //   console.log(`Users in room ${roomName} after cleanup:`, usersInRoomAfterCleanup); // Should be empty
+  // };
+  // if (process.env.NODE_ENV === "development") {
+  //   demoSessionData();
+  // }
+
+  return api;
+};
+
+module.exports = { applyRedisHelpers };
--- a/server/web-sockets/redisSocketEvents.js
+++ b/server/web-sockets/redisSocketEvents.js
@@ -0,0 +1,143 @@
+const { admin } = require("../firebase/firebase-handler");
+
+const redisSocketEvents = ({
+  io,
+  redisHelpers: { setSessionData, clearSessionData }, // Note: Used if we persist user to Redis
+  ioHelpers: { getBodyshopRoom },
+  logger
+}) => {
+  // Logging helper functions
+  const createLogEvent = (socket, level, message) => {
+    console.log(`[IOREDIS LOG EVENT] - ${socket?.user?.email} - ${socket.id} - ${message}`);
+    logger.log("ioredis-log-event", level, socket?.user?.email, null, { wsmessage: message });
+  };
+
+  // Socket Auth Middleware
+  const authMiddleware = (socket, next) => {
+    try {
+      if (socket.handshake.auth.token) {
+        admin
+          .auth()
+          .verifyIdToken(socket.handshake.auth.token)
+          .then((user) => {
+            socket.user = user;
+            // Note: if we ever want to capture user data across sockets
+            // Uncomment the following line and then remove the next() to a second then()
+            // return setSessionData(socket.id, "user", user);
+            next();
+          })
+          .catch((error) => {
+            next(new Error(`Authentication error: ${error.message}`));
+          });
+      } else {
+        next(new Error("Authentication error - no authorization token."));
+      }
+    } catch (error) {
+      console.log("Uncaught connection error:::", error);
+      logger.log("websocket-connection-error", "error", null, null, {
+        ...error
+      });
+      next(new Error(`Authentication error ${error}`));
+    }
+  };
+
+  // Register Socket Events
+  const registerSocketEvents = (socket) => {
+    createLogEvent(socket, "DEBUG", `Registering RedisIO Socket Events.`);
+
+    // Token Update Events
+    const registerUpdateEvents = (socket) => {
+      const updateToken = async (newToken) => {
+        try {
+          // noinspection UnnecessaryLocalVariableJS
+          const user = await admin.auth().verifyIdToken(newToken, true);
+          socket.user = user;
+
+          // If We ever want to persist user Data across workers
+          // await setSessionData(socket.id, "user", user);
+
+          createLogEvent(socket, "INFO", "Token updated successfully");
+
+          socket.emit("token-updated", { success: true });
+        } catch (error) {
+          if (error.code === "auth/id-token-expired") {
+            createLogEvent(socket, "WARNING", "Stale token received, waiting for new token");
+            socket.emit("token-updated", {
+              success: false,
+              error: "Stale token."
+            });
+          } else {
+            createLogEvent(socket, "ERROR", `Token update failed: ${error.message}`);
+            socket.emit("token-updated", { success: false, error: error.message });
+            // For any other errors, optionally disconnect the socket
+            socket.disconnect();
+          }
+        }
+      };
+      socket.on("update-token", updateToken);
+    };
+    // Room Broadcast Events
+    const registerRoomAndBroadcastEvents = (socket) => {
+      const joinBodyshopRoom = (bodyshopUUID) => {
+        try {
+          const room = getBodyshopRoom(bodyshopUUID);
+          socket.join(room);
+          createLogEvent(socket, "DEBUG", `Client joined bodyshop room: ${room}`);
+        } catch (error) {
+          createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
+        }
+      };
+
+      const leaveBodyshopRoom = (bodyshopUUID) => {
+        try {
+          const room = getBodyshopRoom(bodyshopUUID);
+          socket.leave(room);
+          createLogEvent(socket, "DEBUG", `Client left bodyshop room: ${room}`);
+        } catch (error) {
+          createLogEvent(socket, "ERROR", `Error joining room: ${error}`);
+        }
+      };
+
+      const broadcastToBodyshopRoom = (bodyshopUUID, message) => {
+        try {
+          const room = getBodyshopRoom(bodyshopUUID);
+          io.to(room).emit("bodyshop-message", message);
+          createLogEvent(socket, "DEBUG", `Broadcast message to bodyshop ${room}`);
+        } catch (error) {
+          createLogEvent(socket, "ERROR", `Error getting room: ${error}`);
+        }
+      };
+
+      socket.on("join-bodyshop-room", joinBodyshopRoom);
+      socket.on("leave-bodyshop-room", leaveBodyshopRoom);
+      socket.on("broadcast-to-bodyshop", broadcastToBodyshopRoom);
+    };
+    // Disconnect Events
+    const registerDisconnectEvents = (socket) => {
+      const disconnect = () => {
+        createLogEvent(socket, "DEBUG", `User disconnected.`);
+        const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
+        for (const room of rooms) {
+          socket.leave(room);
+        }
+        // If we ever want to persist the user across workers
+        // clearSessionData(socket.id);
+      };
+
+      socket.on("disconnect", disconnect);
+    };
+
+    // Call Handlers
+    registerRoomAndBroadcastEvents(socket);
+    registerUpdateEvents(socket);
+    registerDisconnectEvents(socket);
+  };
+
+  // Associate Middleware and Handlers
+  io.use(authMiddleware);
+  io.on("connection", registerSocketEvents);
+};
+
+module.exports = {
+  redisSocketEvents
+};
Author	SHA1	Message	Date
Allan Carr	f50292f9bf	IO-2992 Bill Line column Width with Word Breaks Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-10-21 10:53:32 -07:00
Dave Richer	5b81912bd3	Merged in release/2024-10-18 (pull request #1828 ) Release/2024-10-18 into master-AIO - IO-2971, IO-2976, IO-2977, IO-2984, IO-2985, IO-2987, IO-2988, IO-2989	2024-10-19 03:47:08 +00:00
Dave Richer	3c98a94c38	Merged in feature/IO-2976-GlobalSearch-First-link-Navigate (pull request #1826 ) feature/IO-2976-GlobalSearch-First-link-Navigate - Fix global search so it goes to the first url if it is available, added an ID for rome tours.	2024-10-18 19:25:09 +00:00
Dave Richer	1d98de6d4d	feature/IO-2976-GlobalSearch-First-link-Navigate - Fix global search so it goes to the first url if it is available, added an ID for rome tours. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-18 15:22:56 -04:00
Allan Carr	0ce5d9063a	Merged in feature/IO-2989-jobexported-missing-translation (pull request #1823 ) IO-2989 jobexported missing en_us translation Approved-by: Dave Richer	2024-10-18 16:30:02 +00:00
Dave Richer	3b84e1d6ec	Merged in feature/IO-2977-Replace-On-Board-with-In-View (pull request #1824 ) feature/IO-2977-Replace-On-Board-with-In-View - Replace production board terminology for Imex, on board vs in view	2024-10-18 16:29:25 +00:00
Dave Richer	d62f6e2116	feature/IO-2977-Replace-On-Board-with-In-View - Replace production board terminology for Imex, on board vs in view Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-18 12:28:01 -04:00
Allan Carr	71a26cc4ac	IO-2989 jobexported missing en_us translation Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-10-18 08:45:13 -07:00
Allan Carr	32441e9406	Merged in feature/IO-2988-Jobline-Upsert-Undefined (pull request #1821 ) IO-2988 Jobline Upsert Undefined handling Approved-by: Dave Richer	2024-10-18 01:55:31 +00:00
Allan Carr	e6dade1206	IO-2988 Jobline Upsert Undefined handling Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-10-17 17:03:40 -07:00
Allan Carr	43d34cae07	Merged in feature/IO-2987-Non-Production-Board-Status-Status-Change (pull request #1820 ) IO-2987 Non Production Board Status - Status Changes Approved-by: Dave Richer	2024-10-17 22:27:53 +00:00
Allan Carr	a72a7948fe	IO-2987 Non Production Board Status - Status Changes Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-10-17 15:22:05 -07:00
Dave Richer	a24f6639a1	Merged in feature/IO-2985-Production-List-View-Null-Handling (pull request #1818 ) IO-2985-Production-List-View-Null-Handling - Handle Null md_production_config	2024-10-17 17:09:48 +00:00
Allan Carr	b2a0af32e9	Merged in feature/IO-2984-Open-in-Explorer (pull request #1817 ) IO-2984 Open in Explorer correction Approved-by: Dave Richer	2024-10-17 17:09:36 +00:00
Allan Carr	cc58d14d32	Merged in feature/IO-2971-Export-Table-Size (pull request #1816 ) IO-2971 Export Table Size limit to 10 Approved-by: Dave Richer	2024-10-17 17:03:27 +00:00
Dave Richer	9ce419b949	feature/IO-2985-Production-List-View-Null-Handling - Handle Null md_production_config Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-17 11:42:03 -04:00
Allan Carr	5053816be7	IO-2984 Open in Explorer correction encodeURL Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-10-16 16:38:59 -07:00
Allan Carr	30ca34ea93	IO-2971 Export Table Size limit to 10 Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-10-16 13:43:25 -07:00
Dave Richer	68d1a404b3	release/2024-10-18: Fixes from Docker meeting Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-16 15:28:04 -04:00
Dave Richer	85e82b85ea	Merged in release/2024-10-11 (pull request #1815 ) release/2024-10-11: Remove Task Emails Cleanup	2024-10-16 17:19:52 +00:00
Dave Richer	23467280b4	release/2024-10-11: Remove Task Emails Cleanup Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-16 13:18:48 -04:00
Dave Richer	aedad1c48f	Merged in release/2024-10-11 (pull request #1814 ) release/2024-10-11: Hotfix	2024-10-12 16:28:40 +00:00
Dave Richer	05cc4dd188	release/2024-10-11: Hotfix Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-12 12:26:30 -04:00
Dave Richer	ea6351ea06	Merged in release/2024-10-11 (pull request #1813 ) release/2024-10-11: Hotfix	2024-10-12 16:06:06 +00:00
Dave Richer	87d3ceb408	release/2024-10-11: Hotfix Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-12 12:05:13 -04:00
Dave Richer	d08dd2b506	Merged in release/2024-10-11 (pull request #1812 ) release/2024-10-11: Final touchups	2024-10-12 03:59:37 +00:00
Dave Richer	8a047d14a1	release/2024-10-11: Final touchups Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-11 23:51:39 -04:00
Dave Richer	e103772aa4	Merged in release/2024-10-11 (pull request #1811 ) Release/2024-10-11 into master-AIO - IO-2791, IO-2962, IO-2971, IO-2972, IO-2979	2024-10-12 03:09:09 +00:00
Dave Richer	c332699dc8	Merge branch 'release/2024-10-11' of bitbucket.org:snaptsoft/bodyshop into release/2024-10-11	2024-10-11 23:02:17 -04:00
Dave Richer	25e6e61d10	release/2024-10-11: Final touchups Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-11 22:59:44 -04:00
Patrick Fic	cdcd6b636a	Merged in feature/IO-2971-export-mutation-refactor (pull request #1809 ) IO-2791 Stop gap change to limit exports to 10 records at a time. Approved-by: Dave Richer	2024-10-11 20:07:59 +00:00
Patrick Fic	7879591bcf	IO-2971 add null coalescing	2024-10-11 16:05:30 -04:00
Patrick Fic	7fc6556866	IO-2791 Stop gap change to limit exports to 10 records at a time.	2024-10-11 16:03:40 -04:00
Dave Richer	3f5489ce7e	Merged in feature/IO-2979-DST-Handling (pull request #1808 ) feature/IO-2979-DST-Handling - Checkpoint	2024-10-11 17:18:33 +00:00
Dave Richer	5a90854861	feature/IO-2979-DST-Handling - Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-10 13:01:36 -04:00
Dave Richer	8347a8c098	Merged in feature/IO-2979-DST-Handling (pull request #1806 ) feature/IO-2979-DST-Handling - Add LocalStack and Adjust local Emailing	2024-10-09 17:03:19 +00:00
Dave Richer	2bf074d85a	feature/IO-2979-DST-Handling - Add LocalStack and Adjust local Emailing Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-09 13:00:16 -04:00
Dave Richer	50d47cd679	Merged in feature/IO-2962-Task-Email-Footer-Timestamps (pull request #1804 ) feature/IO-2962-Task-Email-Footer-Timestamps - Localize Date in Task Email Footer	2024-10-07 20:22:13 +00:00
Dave Richer	3a4e06eaa2	Merged in feature/IO-2972-Final-Redis-Sockets-Fixes (pull request #1803 ) Feature/IO-2972 Final Redis Sockets Fixes	2024-10-07 20:21:41 +00:00
Dave Richer	4be71726d4	feature/IO-2972-Final-Redis-Sockets-Add Redis Cluster aware logic Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-07 16:18:11 -04:00
Dave Richer	c78db7eb08	feature/IO-2972-Final-Redis-Sockets-Fixes - Cleanup Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-04 13:52:09 -04:00
Dave Richer	e4dc711481	docker-redis - final cleanup Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-04 13:43:45 -04:00
Dave Richer	5114138c67	docker-redis - final cleanup Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-03 16:30:15 -04:00
Dave Richer	68b8743002	docker-redis - improve lockfile for redis, add redis-insights, make sure app image has all it needs to build canvas Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-03 13:17:04 -04:00
Dave Richer	8f312bfffb	docker-redis - local refactors Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-03 13:12:42 -04:00
Dave Richer	7e7e109cfe	docker-redis - local refactors Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-03 11:59:42 -04:00
Dave Richer	05e5545466	docker-redis - local tests Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-02 01:04:05 -04:00
Dave Richer	ddb0990645	docker-redis - local tests Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-02 00:50:40 -04:00
Dave Richer	04dec6d91c	docker-redis - local tests Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-02 00:27:11 -04:00
Dave Richer	a883b817b0	release/2024-10-04: Hotfix Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-10-01 13:37:34 -04:00
Dave Richer	b7423aebf6	Merged in release/2024-09-27 (pull request #1800 ) Release/2024 09 27 into master-AIO - IO-2967	2024-09-27 22:36:31 +00:00
Dave Richer	ee70aeb952	release/2024-09-27 - Remove cors line Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 18:33:01 -04:00
Dave Richer	74d95e7cbb	feature/IO-2962-Task-Email-Footer-Timestamps - Localize Date in Task Email Footer Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 16:27:41 -04:00
Dave Richer	f6f6fab5ba	Merged in feature/IO-2967-Better-Refetch-Handling (pull request #1799 ) Feature/IO-2967 Better Refetch Handling Approved-by: Patrick Fic	2024-09-27 19:20:20 +00:00
Dave Richer	699ffc822a	feature/IO-2967-Better-Refetch-Handling - Remove unused include Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 15:07:35 -04:00
Dave Richer	4e35f5402c	feature/IO-2967-Better-Refetch-Handling - Add note to server.js Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 15:06:52 -04:00
Dave Richer	9b997d0924	feature/IO-2967-Better-Refetch-Handling - match broadcast room name to match redis naming convention Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 15:00:25 -04:00
Dave Richer	d705f8211e	feature/IO-2967-Better-Refetch-Handling - Bug fixes and hardening Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 14:52:38 -04:00
Dave Richer	03761bbb2a	feature/IO-2967-Better-Refetch-Handling - Implementation Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-27 13:32:59 -04:00
Patrick Fic	4d0794e90e	Merged in feature/IO-2924-Refactor-Production-board-to-use-Socket-Provider (pull request #1798 ) Add try catch to PBS/CDK and main.	2024-09-27 16:25:54 +00:00
Patrick Fic	e615c4a55b	Add try catch to PBS/CDK and main.	2024-09-27 09:18:20 -07:00
Patrick Fic	51eb3423f3	Merged in release/2024-09-27 (pull request #1796 ) IO-2924 update correct CORS URL.	2024-09-27 02:35:09 +00:00
Dave Richer	f6318666d9	Merged in feature/IO-2924-Refactor-Production-board-to-use-Socket-Provider (pull request #1794 ) IO-2924 update correct CORS URL.	2024-09-26 23:46:24 +00:00
Patrick Fic	544d4b8136	IO-2924 update correct CORS URL.	2024-09-26 16:44:42 -07:00
Patrick Fic	edf4846d55	Merged in release/2024-09-27 (pull request #1793 ) Release/2024 09 27 IO-2924, IO-2931, IO-2935, IO-2938	2024-09-26 23:07:20 +00:00
Patrick Fic	f3754de843	Merged in feature/IO-2924-Refactor-Production-board-to-use-Socket-Provider (pull request #1791 ) IO-2924 add state sync on reconnect, correct treatment, and add status. Approved-by: Dave Richer	2024-09-26 22:31:52 +00:00
Patrick Fic	3d920ad151	Merge branch 'hotfix/2024-09-26-remove-ioevent' into release/2024-09-27	2024-09-26 15:04:42 -07:00
Patrick Fic	575f056360	IO-2924 add state sync on reconnect, correct treatment, and add status.	2024-09-26 15:03:27 -07:00
Patrick Fic	716d9affb5	Merged in hotfix/2024-09-26-remove-ioevent (pull request #1788 ) Remove IO events.	2024-09-26 20:01:28 +00:00
Patrick Fic	b01dd52da2	Remove IO events.	2024-09-26 13:00:33 -07:00
Dave Richer	c75fddc2c0	Merged in feature/IO-2924-Refactor-Production-board-to-use-Socket-Provider (pull request #1786 ) Feature/IO-2924 Refactor Production board to use Socket Provider Approved-by: Patrick Fic	2024-09-26 18:40:02 +00:00
Dave Richer	db0c16f31d	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-26 14:03:27 -04:00
Dave Richer	b286ab2439	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-26 11:21:26 -04:00
Dave Richer	fa57828ebd	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-26 11:13:08 -04:00
Dave Richer	8052767002	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-26 11:03:46 -04:00
Dave Richer	932f572fb5	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-26 10:56:48 -04:00
Dave Richer	328a64eb90	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-25 21:46:39 -04:00
Dave Richer	c661fce8f1	IO-2924-Refactor-Production-board-to-use-Socket-Provider: Finalize Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-25 21:34:43 -04:00
Dave Richer	60d1396011	IO-2924-Refactor-Production-board-to-use-Socket-Provider: rough in backend logic Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-25 21:05:27 -04:00
Dave Richer	3b647dfd37	IO-2924-Refactor-Production-board-to-use-Socket-Provider: rough in split logic / production-board-kanban.container.jsx logic Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-25 17:44:53 -04:00
Patrick Fic	50fe588949	Merged in feature/IO-2935-Add-Enhanced-Websocket-Provider (pull request #1784 ) IO-2935 Correct CORS entries.	2024-09-25 19:33:00 +00:00
Patrick Fic	0ced053d21	IO-2935 Correct CORS entries.	2024-09-25 12:29:23 -07:00
Patrick Fic	b8cf4a4d75	Merged in feature/IO-2935-Add-Enhanced-Websocket-Provider (pull request #1782 ) IO-2935 Resolve roll up issues.	2024-09-25 19:17:21 +00:00
Patrick Fic	ff72657a82	IO-2935 Resolve roll up issues.	2024-09-25 12:16:51 -07:00
Patrick Fic	92a96fdae6	Merged in feature/IO-2935-Add-Enhanced-Websocket-Provider (pull request #1780 ) IO-2935 Comment unused visualizer during build.	2024-09-25 19:04:46 +00:00
Patrick Fic	b1a96d55ad	IO-2935 Comment unused visualizer during build.	2024-09-25 12:04:24 -07:00
Patrick Fic	49657816c6	Merged in feature/IO-2935-Add-Enhanced-Websocket-Provider (pull request #1778 ) IO-2935 improve chunking for vite build.	2024-09-25 19:00:36 +00:00
Patrick Fic	7094b6ffbf	IO-2935 improve chunking for vite build.	2024-09-25 11:59:33 -07:00
Dave Richer	ed7c2574eb	Merged in feature/IO-2935-Add-Enhanced-Websocket-Provider (pull request #1776 ) IO-2935-Add-Enhanced-Websocket-Provider - Add Firebase token refresh	2024-09-25 18:13:51 +00:00
Dave Richer	45a9e37342	IO-2935-Add-Enhanced-Websocket-Provider - Add Firebase token refresh Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-25 14:12:31 -04:00
Dave Richer	9e6a458203	Merged in feature/IO-2935-Add-Enhanced-Websocket-Provider (pull request #1774 ) IO-2935-Add-Enhanced-Websocket-Provider - Add another web socket provider, front end wiring, vite wiring (proxy and secure vite), bumped deps	2024-09-25 17:38:56 +00:00
Dave Richer	55a279a700	IO-2935-Add-Enhanced-Websocket-Provider - add emit from io-logging event to create additional useage Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-25 13:36:47 -04:00
Dave Richer	82e2e332cf	IO-2935-Add-Enhanced-Websocket-Provider - fixes Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 20:54:14 -04:00
Dave Richer	103d7c2bb2	IO-2935-Add-Enhanced-Websocket-Provider - Add additional try catch statements Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 20:10:15 -04:00
Dave Richer	f5f0b75617	IO-2935-Add-Enhanced-Websocket-Provider - PR notes, Admin UI, Expanded Join/Leave room functionality, moved test button to the client id (Imex / Rome) in footer, so it is still there, just invisible. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 19:59:29 -04:00
Dave Richer	c163554c3f	IO-2935-Add-Enhanced-Websocket-Provider - Add another web socket provider, front end wiring, vite wiring (proxy and secure vite), bumped deps Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 16:28:44 -04:00
Patrick Fic	bd75f593c2	Merged in feature/IO-2938-rome-zoho-id (pull request #1773 ) IO-2938 Add zoho id for rome.	2024-09-24 20:13:08 +00:00
Patrick Fic	fbc1866363	IO-2938 Add zoho id for rome.	2024-09-24 13:11:51 -07:00
Dave Richer	6480f7f2aa	Merge remote-tracking branch 'origin/release/2024-09-27' into feature/IO-2935-Deploy-New-WSS	2024-09-24 14:48:15 -04:00
Patrick Fic	4cb3a79429	Merged in feature/IO-2597-task-reminders (pull request #1769 ) Feature/IO-2597 task reminders Approved-by: Dave Richer	2024-09-24 14:37:33 +00:00
Dave Richer	ca521eaeba	Merged in feature/IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices (pull request #1771 ) IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices - Remove reference to /public on apple-touch-icon	2024-09-24 14:36:39 +00:00
Dave Richer	f287ba2dac	IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices - Remove reference to /public on apple-touch-icon Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-24 10:35:46 -04:00
Patrick Fic	ff46bbbb3f	Merged in feature/IO-2597-task-reminders (pull request #1770 ) IO-2957 Resolve task reminders not sending with incorrect references.	2024-09-24 01:24:18 +00:00
Dave Richer	9803841617	Merged in feature/IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices (pull request #1766 ) IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices - Add additional fixes / optimizations, from parent repo	2024-09-23 23:27:44 +00:00
Dave Richer	4dffbfe6fa	IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices - Add additional fixes / optimizations, from parent repo Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-23 19:26:40 -04:00
Dave Richer	1b5cddd371	Merged in feature/IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices (pull request #1761 ) IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices - Fix Drag and Drop on Android and IOS devices.	2024-09-23 20:43:49 +00:00
Dave Richer	6a7005299a	IO-2931-Visual-Production-Board-Drag-and-Drop-on-Touch-Devices - Fix Drag and Drop on Android and IOS devices. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-23 16:41:06 -04:00