IO-3262 Correction for v_year in Project Mexico

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

_reference/localEmailViewer/index.js

@@ -1,116 +1,96 @@
 // index.js
 
-import express from 'express';
-import fetch from 'node-fetch';
-import {simpleParser} from 'mailparser';
+import express from "express";
+import fetch from "node-fetch";
+import { simpleParser } from "mailparser";
 
 const app = express();
 const PORT = 3334;
 
-app.get('/', async (req, res) => {
-    try {
-        const response = await fetch('http://localhost:4566/_aws/ses');
-        if (!response.ok) {
-            throw new Error('Network response was not ok');
-        }
-        const data = await response.json();
-        const messagesHtml = await parseMessages(data.messages);
-        res.send(renderHtml(messagesHtml));
-    } catch (error) {
-        console.error('Error fetching messages:', error);
-        res.status(500).send('Error fetching messages');
+app.get("/", async (req, res) => {
+  try {
+    const response = await fetch("http://localhost:4566/_aws/ses");
+    if (!response.ok) {
+      throw new Error("Network response was not ok");
     }
+    const data = await response.json();
+    const messagesHtml = await parseMessages(data.messages);
+    res.send(renderHtml(messagesHtml));
+  } catch (error) {
+    console.error("Error fetching messages:", error);
+    res.status(500).send("Error fetching messages");
+  }
 });
 
 async function parseMessages(messages) {
-    const parsedMessages = await Promise.all(
-        messages.map(async (message, index) => {
-            try {
-                const parsed = await simpleParser(message.RawData);
-                return `
-                    <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: lightgray">
-                     <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: white">
-                        <div class="mb-2">
-                            <span class="font-bold text-lg">Message ${index + 1}</span>
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">From:</span> ${message.Source}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Region:</span> ${message.Region}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
-                        </div>
-                     </div>
-                        <div class="prose">
-                            ${parsed.html || parsed.textAsHtml || 'No HTML content available'}
-                        </div>
-                    </div>
-                `;
-            } catch (error) {
-                console.error('Error parsing email:', error);
-                return `
-                    <div class="bg-white shadow-md rounded-lg p-4 mb-6">
-                        <div class="mb-2">
-                            <span class="font-bold text-lg">Message ${index + 1}</span>
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">From:</span> ${message.Source}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Region:</span> ${message.Region}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
-                        </div>
-                        <div class="text-red-500">
-                            Error parsing email content
-                        </div>
-                    </div>
-                `;
-            }
-        })
-    );
-    return parsedMessages.join('');
+  const parsedMessages = await Promise.all(
+    messages.map(async (message, index) => {
+      try {
+        const parsed = await simpleParser(message.RawData);
+        return `
+          <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: lightgray">
+            <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: white">
+              <div class="mb-2"><span class="font-bold text-lg">Message ${index + 1}</span></div>
+              <div class="mb-2"><span class="font-semibold">From:</span> ${message.Source}</div>
+              <div class="mb-2"><span class="font-semibold">To:</span> ${parsed.to.text || "No To Address"}</div>
+              <div class="mb-2"><span class="font-semibold">Subject:</span> ${parsed.subject || "No Subject"}</div>
+              <div class="mb-2"><span class="font-semibold">Region:</span> ${message.Region}</div>
+              <div class="mb-2"><span class="font-semibold">Timestamp:</span> ${message.Timestamp}</div>
+            </div>
+            <div class="prose">${parsed.html || parsed.textAsHtml || "No HTML content available"}</div>
+          </div>
+        `;
+      } catch (error) {
+        console.error("Error parsing email:", error);
+        return `
+          <div class="bg-white shadow-md rounded-lg p-4 mb-6">
+            <div class="mb-2"><span class="font-bold text-lg">Message ${index + 1}</span></div>
+            <div class="mb-2"><span class="font-semibold">From:</span> ${message.Source}</div>
+            <div class="mb-2"><span class="font-semibold">Region:</span> ${message.Region}</div>
+            <div class="mb-2"><span class="font-semibold">Timestamp:</span> ${message.Timestamp}</div>
+            <div class="text-red-500">Error parsing email content</div>
+          </div>
+        `;
+      }
+    })
+  );
+  return parsedMessages.join("");
 }
 
 function renderHtml(messagesHtml) {
-    return `
-        <!DOCTYPE html>
-        <html lang="en">
-        <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <title>Email Messages Viewer</title>
-            <script src="https://cdn.tailwindcss.com"></script>
-            <style>
-                body {
-                    background-color: #f3f4f6;
-                    font-family: Arial, sans-serif;
-                }
-                .container {
-                    max-width: 800px;
-                    margin: 50px auto;
-                    padding: 20px;
-                }
-                .prose {
-                    line-height: 1.6;
-                }
-            </style>
-        </head>
-        <body>
-            <div class="container bg-white shadow-lg rounded-lg p-6">
-                <h1 class="text-2xl font-bold text-center mb-6">Email Messages Viewer</h1>
-                <div id="messages-container">
-                    ${messagesHtml}
-                </div>
-            </div>
-        </body>
-        </html>
-    `;
+  return `
+    <!DOCTYPE html>
+    <html lang="en">
+      <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Email Messages Viewer</title>
+        <script src="https://cdn.tailwindcss.com"></script>
+        <style>
+          body {
+            background-color: #f3f4f6;
+            font-family: Arial, sans-serif;
+          }
+          .container {
+            max-width: 800px;
+            margin: 50px auto;
+            padding: 20px;
+          }
+          .prose {
+            line-height: 1.6;
+          }
+        </style>
+      </head>
+      <body>
+        <div class="container bg-white shadow-lg rounded-lg p-6">
+          <h1 class="text-2xl font-bold text-center mb-6">Email Messages Viewer</h1>
+          <div id="messages-container">${messagesHtml}</div>
+        </div>
+      </body>
+    </html>
+  `;
 }
 
 app.listen(PORT, () => {
-    console.log(`Server is running on http://localhost:${PORT}`);
-});
+  console.log(`Server is running on http://localhost:${PORT}`);
+});

_reference/localEmailViewer/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "express": "^5.1.0",
-        "mailparser": "^3.7.2",
+        "mailparser": "^3.7.4",
         "node-fetch": "^3.3.2"
       }
     },
@@ -634,9 +634,9 @@
       "license": "MIT"
     },
     "node_modules/libmime": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.3.6.tgz",
-      "integrity": "sha512-j9mBC7eiqi6fgBPAGvKCXJKJSIASanYF4EeA4iBzSG0HxQxmXnR3KbyWqTn4CwsKSebqCv2f5XZfAO6sKzgvwA==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.3.7.tgz",
+      "integrity": "sha512-FlDb3Wtha8P01kTL3P9M+ZDNDWPKPmKHWaU/cG/lg5pfuAwdflVpZE+wm9m7pKmC5ww6s+zTxBKS1p6yl3KpSw==",
       "license": "MIT",
       "dependencies": {
         "encoding-japanese": "2.2.0",
@@ -661,31 +661,31 @@
       }
     },
     "node_modules/mailparser": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.7.2.tgz",
-      "integrity": "sha512-iI0p2TCcIodR1qGiRoDBBwboSSff50vQAWytM5JRggLfABa4hHYCf3YVujtuzV454xrOP352VsAPIzviqMTo4Q==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.7.4.tgz",
+      "integrity": "sha512-Beh4yyR4jLq3CZZ32asajByrXnW8dLyKCAQD3WvtTiBnMtFWhxO+wa93F6sJNjDmfjxXs4NRNjw3XAGLqZR3Vg==",
       "license": "MIT",
       "dependencies": {
         "encoding-japanese": "2.2.0",
         "he": "1.2.0",
         "html-to-text": "9.0.5",
         "iconv-lite": "0.6.3",
-        "libmime": "5.3.6",
+        "libmime": "5.3.7",
         "linkify-it": "5.0.0",
-        "mailsplit": "5.4.2",
-        "nodemailer": "6.9.16",
+        "mailsplit": "5.4.5",
+        "nodemailer": "7.0.4",
         "punycode.js": "2.3.1",
-        "tlds": "1.255.0"
+        "tlds": "1.259.0"
       }
     },
     "node_modules/mailsplit": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.2.tgz",
-      "integrity": "sha512-4cczG/3Iu3pyl8JgQ76dKkisurZTmxMrA4dj/e8d2jKYcFTZ7MxOzg1gTioTDMPuFXwTrVuN/gxhkrO7wLg7qA==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.5.tgz",
+      "integrity": "sha512-oMfhmvclR689IIaQmIcR5nODnZRRVwAKtqFT407TIvmhX2OLUBnshUTcxzQBt3+96sZVDud9NfSe1NxAkUNXEQ==",
       "license": "(MIT OR EUPL-1.1+)",
       "dependencies": {
         "libbase64": "1.3.0",
-        "libmime": "5.3.6",
+        "libmime": "5.3.7",
         "libqp": "2.1.1"
       }
     },
@@ -793,9 +793,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.9.16",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz",
-      "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.4.tgz",
+      "integrity": "sha512-9O00Vh89/Ld2EcVCqJ/etd7u20UhME0f/NToPfArwPEe1Don1zy4mAIz6ariRr7mJ2RDxtaDzN0WJVdVXPtZaw==",
       "license": "MIT-0",
       "engines": {
         "node": ">=6.0.0"
@@ -1114,9 +1114,9 @@
       }
     },
     "node_modules/tlds": {
-      "version": "1.255.0",
-      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.255.0.tgz",
-      "integrity": "sha512-tcwMRIioTcF/FcxLev8MJWxCp+GUALRhFEqbDoZrnowmKSGqPrl5pqS+Sut2m8BgJ6S4FExCSSpGffZ0Tks6Aw==",
+      "version": "1.259.0",
+      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.259.0.tgz",
+      "integrity": "sha512-AldGGlDP0PNgwppe2quAvuBl18UcjuNtOnDuUkqhd6ipPqrYYBt3aTxK1QTsBVknk97lS2JcafWMghjGWFtunw==",
       "license": "MIT",
       "bin": {
         "tlds": "bin.js"

_reference/localEmailViewer/package.json

@@ -12,7 +12,7 @@
   "description": "",
   "dependencies": {
     "express": "^5.1.0",
-    "mailparser": "^3.7.2",
+    "mailparser": "^3.7.4",
     "node-fetch": "^3.3.2"
   }
 }

_reference/partsManagement/PATCH_parts-management-job-status.md

@@ -0,0 +1,61 @@
+# PATCH /integrations/parts-management/job/:id/status
+
+Update (patch) the status of a job created under parts management. This endpoint is only available
+for jobs whose parent bodyshop has an `external_shop_id` (i.e., is provisioned for parts
+management).
+
+## Endpoint
+
+```
+PATCH /integrations/parts-management/job/:id/status
+```
+
+- `:id` is the UUID of the job to update.
+
+## Request Headers
+
+- `Authorization`: (if required by your integration middleware)
+- `Content-Type: application/json`
+
+## Request Body
+
+Send a JSON object with the following field:
+
+- `status` (string, required): The new status for the job.
+
+Example:
+
+```
+PATCH /integrations/parts-management/job/123e4567-e89b-12d3-a456-426614174000/status
+Content-Type: application/json
+
+{
+  "status": "IN_PROGRESS"
+}
+```
+
+## Success Response
+
+- **200 OK**
+- Returns the updated job object with the new status.
+
+```
+{
+  "id": "123e4567-e89b-12d3-a456-426614174000",
+  "status": "IN_PROGRESS",
+  ...
+}
+```
+
+## Error Responses
+
+- **400 Bad Request**: Missing status field, or parent bodyshop does not have an `external_shop_id`.
+- **404 Not Found**: No job found with the given ID.
+- **500 Internal Server Error**: Unexpected error.
+
+## Notes
+
+- Only jobs whose parent bodyshop has an `external_shop_id` can be patched via this route.
+- Fields other than `status` will be ignored if included in the request body.
+- The route is protected by the same middleware as other parts management endpoints.
+

_reference/partsManagement/PATCH_parts-management-provision.md

@@ -0,0 +1,86 @@
+# PATCH /integrations/parts-management/provision/:id
+
+Update (patch) select fields for a parts management bodyshop. Only available for shops that have an
+`external_shop_id` (i.e., are provisioned for parts management).
+
+## Endpoint
+
+```
+PATCH /integrations/parts-management/provision/:id
+```
+
+- `:id` is the UUID of the bodyshop to update.
+
+## Request Headers
+
+- `Authorization`: (if required by your integration middleware)
+- `Content-Type: application/json`
+
+## Request Body
+
+Send a JSON object with one or more of the following fields to update:
+
+- `shopname` (string)
+- `address1` (string)
+- `address2` (string, optional)
+- `city` (string)
+- `state` (string)
+- `zip_post` (string)
+- `country` (string)
+- `email` (string, shop's email, not user email)
+- `timezone` (string)
+- `phone` (string)
+- `logo_img_path` (object, e.g. `{ src, width, height, headerMargin }`)
+
+Any fields not included in the request body will remain unchanged.
+
+## Example Request
+
+```
+PATCH /integrations/parts-management/provision/123e4567-e89b-12d3-a456-426614174000
+Content-Type: application/json
+
+{
+  "shopname": "New Shop Name",
+  "address1": "123 Main St",
+  "city": "Springfield",
+  "state": "IL",
+  "zip_post": "62704",
+  "country": "USA",
+  "email": "shop@example.com",
+  "timezone": "America/Chicago",
+  "phone": "555-123-4567",
+  "logo_img_path": {
+    "src": "https://example.com/logo.png",
+    "width": "200",
+    "height": "100",
+    "headerMargin": 10
+  }
+}
+```
+
+## Success Response
+
+- **200 OK**
+- Returns the updated shop object with the patched fields.
+
+```
+{
+  "id": "123e4567-e89b-12d3-a456-426614174000",
+  "shopname": "New Shop Name",
+  ...
+}
+```
+
+## Error Responses
+
+- **400 Bad Request**: No valid fields provided, or shop does not have an `external_shop_id`.
+- **404 Not Found**: No shop found with the given ID.
+- **500 Internal Server Error**: Unexpected error.
+
+## Notes
+
+- Only shops with an `external_shop_id` can be patched via this route.
+- Fields not listed above will be ignored if included in the request body.
+- The route is protected by the same middleware as other parts management endpoints.
+

bodyshop_translations.babel

@@ -5305,6 +5305,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>ro_posting</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>sendmaterialscosting</name>
                                                 <definition_loaded>false</definition_loaded>

client/.env.development.imex

@@ -15,4 +15,6 @@ VITE_APP_INSTANCE=IMEX
 TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891

client/.env.development.rome

@@ -17,4 +17,6 @@ VITE_APP_INSTANCE=ROME
 TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78

client/.env.production.imex

@@ -14,4 +14,6 @@ VITE_APP_REPORTS_SERVER_URL=https://reports.imex.online
 VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=IMEX
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891

client/.env.production.rome

@@ -14,4 +14,6 @@ VITE_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
 VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=ROME
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78

client/.env.test.imex

@@ -14,4 +14,6 @@ VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891

client/.env.test.rome

@@ -14,4 +14,6 @@ VITE_APP_IS_TEST=true
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=ROME
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
-VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78

client/package.json

@@ -8,56 +8,56 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.23.5",
+    "@amplitude/analytics-browser": "^2.25.2",
     "@ant-design/pro-layout": "^7.22.6",
     "@apollo/client": "^3.13.9",
     "@emotion/is-prop-valid": "^1.4.0",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
     "@firebase/analytics": "^0.10.17",
-    "@firebase/app": "^0.14.2",
+    "@firebase/app": "^0.14.3",
     "@firebase/auth": "^1.10.8",
-    "@firebase/firestore": "^4.9.1",
+    "@firebase/firestore": "^4.9.2",
     "@firebase/messaging": "^0.12.22",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.9.0",
-    "@sentry/cli": "^2.53.0",
+    "@sentry/cli": "^2.56.0",
     "@sentry/react": "^9.43.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@splitsoftware/splitio-react": "^2.3.1",
+    "@splitsoftware/splitio-react": "^2.5.0",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.27.3",
+    "antd": "^5.27.4",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^4.4.0",
     "autosize": "^6.0.1",
-    "axios": "^1.11.0",
+    "axios": "^1.12.2",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.18",
     "dayjs-business-days2": "^1.3.0",
     "dinero.js": "^1.9.1",
-    "dotenv": "^17.2.2",
+    "dotenv": "^17.2.3",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
     "graphql": "^16.11.0",
-    "i18next": "^25.5.2",
+    "i18next": "^25.5.3",
     "i18next-browser-languagedetector": "^8.2.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.15",
+    "libphonenumber-js": "^1.12.23",
+    "lightningcss": "^1.30.2",
     "logrocket": "^9.0.2",
-    "markerjs2": "^2.32.6",
+    "markerjs2": "^2.32.7",
     "memoize-one": "^6.0.0",
-    "normalize-url": "^8.0.2",
+    "normalize-url": "^8.1.0",
     "object-hash": "^3.0.0",
     "phone": "^3.1.67",
-    "posthog-js": "^1.261.7",
+    "posthog-js": "^1.271.0",
     "prop-types": "^15.8.1",
-    "query-string": "^9.2.2",
+    "query-string": "^9.3.1",
     "raf-schd": "^4.0.3",
     "react": "^18.3.1",
     "react-big-calendar": "^1.19.4",
     "react-color": "^2.19.3",
     "react-cookie": "^8.0.1",
-    "lightningcss": "^1.30.1",
     "react-dom": "^18.3.1",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
@@ -73,7 +73,7 @@
     "react-resizable": "^3.0.5",
     "react-router-dom": "^6.30.0",
     "react-sticky": "^6.0.3",
-    "react-virtuoso": "^4.14.0",
+    "react-virtuoso": "^4.14.1",
     "recharts": "^2.15.2",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
@@ -81,7 +81,7 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.92.0",
+    "sass": "^1.93.2",
     "socket.io-client": "^4.8.1",
     "styled-components": "^6.1.19",
     "subscriptions-transport-ws": "^0.11.0",
@@ -133,33 +133,33 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^6.0.0",
+    "@ant-design/icons": "^6.1.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.49.0",
+    "@dotenvx/dotenvx": "^1.51.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.33.0",
-    "@playwright/test": "^1.55.0",
-    "@sentry/webpack-plugin": "^4.1.1",
+    "@eslint/js": "^9.37.0",
+    "@playwright/test": "^1.56.0",
+    "@sentry/webpack-plugin": "^4.3.0",
     "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.8.0",
+    "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@vitejs/plugin-react": "^4.6.0",
-    "browserslist": "^4.25.3",
+    "browserslist": "^4.26.3",
     "browserslist-to-esbuild": "^2.1.1",
-    "chalk": "^5.6.0",
-    "eslint": "^9.33.0",
+    "chalk": "^5.6.2",
+    "eslint": "^9.37.0",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "jsdom": "^26.0.0",
-    "memfs": "^4.36.3",
+    "memfs": "^4.48.1",
     "os-browserify": "^0.3.0",
-    "playwright": "^1.55.0",
+    "playwright": "^1.56.0",
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^7.1.3",
+    "vite": "^7.1.9",
     "vite-plugin-babel": "^1.3.2",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.24.0",

client/src/App/App.container.jsx

@@ -12,6 +12,7 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import { setDarkMode } from "../redux/application/application.actions";
 import { selectDarkMode } from "../redux/application/application.selectors";
 import { selectCurrentUser } from "../redux/user/user.selectors.js";
+import { signOutStart } from "../redux/user/user.actions";
 import client from "../utils/GraphQLClient";
 import App from "./App";
 import getTheme from "./themeProvider";
@@ -20,14 +21,13 @@ import getTheme from "./themeProvider";
 const config = {
   core: {
     authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
-    key: "anon" // Default key, overridden dynamically by SplitClientProvider
+    key: "anon"
   }
 };
 
-// Custom provider to manage the Split client key based on imexshopid from Redux
 function SplitClientProvider({ children }) {
-  const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
-  const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
+  const imexshopid = useSelector((state) => state.user.imexshopid);
+  const splitClient = useSplitClient({ key: imexshopid || "anon" });
   useEffect(() => {
     if (splitClient && imexshopid) {
       console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
@@ -36,40 +36,66 @@ function SplitClientProvider({ children }) {
   return children;
 }
 
-const mapDispatchToProps = (dispatch) => ({
-  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
-});
-
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-function AppContainer({ currentUser, setDarkMode }) {
+const mapDispatchToProps = (dispatch) => ({
+  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode)),
+  signOutStart: () => dispatch(signOutStart())
+});
+
+function AppContainer({ currentUser, setDarkMode, signOutStart }) {
   const { t } = useTranslation();
   const isDarkMode = useSelector(selectDarkMode);
   const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
 
-  // Update data-theme attribute when dark mode changes
+  // Global seamless logout listener with redirect to /signin
+  useEffect(() => {
+    const handleSeamlessLogout = (event) => {
+      if (event.data?.type !== "seamlessLogoutRequest") return;
+
+      const requestOrigin = event.origin;
+
+      if (currentUser?.authorized !== true) {
+        window.parent.postMessage(
+          { type: "seamlessLogoutResponse", status: "already_logged_out" },
+          requestOrigin || "*"
+        );
+        return;
+      }
+
+      signOutStart();
+      window.parent.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, requestOrigin || "*");
+    };
+
+    window.addEventListener("message", handleSeamlessLogout);
+    return () => {
+      window.removeEventListener("message", handleSeamlessLogout);
+    };
+  }, [signOutStart, currentUser]);
+
+  // Update data-theme attribute
   useEffect(() => {
     document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
     return () => document.documentElement.removeAttribute("data-theme");
   }, [isDarkMode]);
 
-  // Sync Redux darkMode with localStorage on user change
+  // Sync darkMode with localStorage
   useEffect(() => {
     if (currentUser?.uid) {
       const savedMode = localStorage.getItem(`dark-mode-${currentUser.uid}`);
       if (savedMode !== null) {
         setDarkMode(JSON.parse(savedMode));
       } else {
-        setDarkMode(false); // default to light mode
+        setDarkMode(false);
       }
     } else {
       setDarkMode(false);
     }
-  }, [currentUser?.uid]);
+  }, [currentUser?.uid, setDarkMode]);
 
-  // Persist darkMode to localStorage when it or user changes
+  // Persist darkMode
   useEffect(() => {
     if (currentUser?.uid) {
       localStorage.setItem(`dark-mode-${currentUser.uid}`, JSON.stringify(isDarkMode));

client/src/App/App.jsx

@@ -24,6 +24,7 @@ import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
 import { NotificationProvider } from "../contexts/Notifications/notificationContext.jsx";
 import SocketProvider from "../contexts/SocketIO/socketProvider.jsx";
+import SoundWrapper from "./SoundWrapper.jsx";
 
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -72,9 +73,6 @@ export function App({
     setIsPartsEntry(isParts);
   }, [setIsPartsEntry]);
 
-  //const b = Grid.useBreakpoint();
-  // console.log("Breakpoints:", b);
-
   // Associate event listeners, memoize to prevent multiple listeners being added
   useEffect(() => {
     const offlineListener = () => {
@@ -164,87 +162,87 @@ export function App({
       />
 
       <NotificationProvider>
-        <Routes>
-          <Route
-            path="*"
-            element={
-              <ErrorBoundary>
-                <LandingPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/signin"
-            element={
-              <ErrorBoundary>
-                <SignInPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/resetpassword"
-            element={
-              <ErrorBoundary>
-                <ResetPassword />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/csi/:surveyId"
-            element={
-              <ErrorBoundary>
-                <CsiPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/disclaimer"
-            element={
-              <ErrorBoundary>
-                <DisclaimerPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/manage/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+        <SoundWrapper bodyshop={bodyshop}>
+          <Routes>
+            <Route
+              path="*"
+              element={
+                <ErrorBoundary>
+                  <LandingPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/signin"
+              element={
+                <ErrorBoundary>
+                  <SignInPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/resetpassword"
+              element={
+                <ErrorBoundary>
+                  <ResetPassword />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/csi/:surveyId"
+              element={
+                <ErrorBoundary>
+                  <CsiPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/disclaimer"
+              element={
+                <ErrorBoundary>
+                  <DisclaimerPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/manage/*"
+              element={
+                <ErrorBoundary>
+                  <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                    <PrivateRoute isAuthorized={currentUser.authorized} />
+                  </SocketProvider>
+                </ErrorBoundary>
+              }
+            >
+              <Route path="*" element={<ManagePage />} />
+            </Route>
+            <Route
+              path="/tech/*"
+              element={
+                <ErrorBoundary>
+                  <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                    <PrivateRoute isAuthorized={currentUser.authorized} />
+                  </SocketProvider>
+                </ErrorBoundary>
+              }
+            >
+              <Route path="*" element={<TechPageContainer />} />
+            </Route>
+            <Route
+              path="/parts/*"
+              element={
+                <ErrorBoundary>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<ManagePage />} />
-          </Route>
-          <Route
-            path="/tech/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
-                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<TechPageContainer />} />
-          </Route>
-          <Route
-            path="/parts/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
-                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<SimplifiedPartsPageContainer />} />
-          </Route>
-          <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
-            <Route path="*" element={<DocumentEditorContainer />} />
-          </Route>
-        </Routes>
+                </ErrorBoundary>
+              }
+            >
+              <Route path="*" element={<SimplifiedPartsPageContainer />} />
+            </Route>
+            <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
+              <Route path="*" element={<DocumentEditorContainer />} />
+            </Route>
+          </Routes>
+        </SoundWrapper>
       </NotificationProvider>
     </Suspense>
   );

client/src/App/App.styles.scss

@@ -272,23 +272,23 @@
 }
 
 // Scrollbar styles (uncomment if needed, updated for dark mode)
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  border-radius: 0.2rem;
-  background-color: var(--table-stripe-bg);
-}
+// ::-webkit-scrollbar-track {
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   border-radius: 0.2rem;
+//   background-color: var(--table-stripe-bg);
+// }
 
-::-webkit-scrollbar {
-  width: 0.25rem;
-  max-height: 0.25rem;
-  background-color: var(--table-stripe-bg);
-}
+// ::-webkit-scrollbar {
+//   width: 0.25rem;
+//   max-height: 0.25rem;
+//   background-color: var(--table-stripe-bg);
+// }
 
-::-webkit-scrollbar-thumb {
-  border-radius: 0.2rem;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  background-color: var(--alert-color);
-}
+// ::-webkit-scrollbar-thumb {
+//   border-radius: 0.2rem;
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   background-color: var(--alert-color);
+// }
 
 .ant-input-number-input,
 .ant-input-number,

client/src/App/SoundWrapper.jsx

@@ -0,0 +1,43 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { useNotification } from "../contexts/Notifications/notificationContext.jsx";
+import { initNewMessageSound, unlockAudio } from "./../utils/soundManager";
+import { initSingleTabAudioLeader } from "../utils/singleTabAudioLeader";
+
+export default function SoundWrapper({ children, bodyshop }) {
+  const { t } = useTranslation();
+  const notification = useNotification();
+
+  useEffect(() => {
+    if (!bodyshop?.id) return;
+
+    // 1) Init single-tab leader election (only one tab should play sounds), scoped by bodyshopId
+    const cleanupLeader = initSingleTabAudioLeader(bodyshop.id);
+
+    // 2) Initialize base audio
+    initNewMessageSound("https://images.imex.online/app/messageTone.wav", 0.7);
+
+    // 3) Show a one-time prompt when autoplay blocks first play
+    const onNeedsUnlock = () => {
+      notification.info({
+        description: t("audio.manager.description"),
+        duration: 3
+      });
+    };
+    window.addEventListener("sound-needs-unlock", onNeedsUnlock);
+
+    // 4) Proactively unlock on first gesture (once per session)
+    const gesture = () => unlockAudio(bodyshop.id);
+    window.addEventListener("click", gesture, { once: true, passive: true });
+    window.addEventListener("touchstart", gesture, { once: true, passive: true });
+    window.addEventListener("keydown", gesture, { once: true });
+
+    return () => {
+      cleanupLeader();
+      window.removeEventListener("sound-needs-unlock", onNeedsUnlock);
+      // gesture listeners were added with {once:true}
+    };
+  }, [notification, t, bodyshop?.id]); // include bodyshop.id so this runs when org changes
+
+  return <>{children}</>;
+}

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -142,7 +142,16 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
             refetch={refetch}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
-            <Button>{t("jobs.labels.viewallocations")}</Button>
+            <Button
+              style={{
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap",
+                verticalAlign: "middle"
+              }}
+            >
+              {t("jobs.labels.viewallocations")}
+            </Button>
           </Link>
         </Space>
       )

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -26,6 +26,7 @@ import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -450,7 +451,9 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           setEnterAgain(false);
         }}
       >
-        <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        <RbacWrapper action="bills:enter">
+          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        </RbacWrapper>
       </Form>
     </Modal>
   );

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -45,7 +45,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-        width: "20rem",
+        minWidth: "10rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}joblinename`,
@@ -71,9 +71,9 @@ export function BillEnterModalLinesComponent({
             disabled={disabled}
             options={lineData}
             style={{
-              width: "20rem",
-              maxWidth: "20rem",
-              minWidth: "10rem",
+              //width: "10rem",
+              // maxWidth: "20rem",
+              minWidth: "20rem",
               whiteSpace: "normal",
               height: "auto",
               minHeight: "32px" // default height of Ant Design inputs
@@ -110,7 +110,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.line_desc"),
         dataIndex: "line_desc",
         editable: true,
-        width: "20rem",
+        minWidth: "10rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}line_desc`,
@@ -232,7 +232,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.actual_cost"),
         dataIndex: "actual_cost",
         editable: true,
-        width: "8rem",
+        width: "10rem",
 
         formItemProps: (field) => {
           return {
@@ -357,6 +357,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.labels.deductedfromlbr"),
         dataIndex: "deductedfromlbr",
         editable: true,
+        width: "40px",
         formItemProps: (field) => {
           return {
             valuePropName: "checked",
@@ -464,7 +465,7 @@ export function BillEnterModalLinesComponent({
             title: t("billlines.fields.federal_tax_applicable"),
             dataIndex: "applicable_taxes.federal",
             editable: true,
-
+            width: "40px",
             formItemProps: (field) => {
               return {
                 key: `${field.index}fedtax`,
@@ -485,7 +486,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.state_tax_applicable"),
         dataIndex: "applicable_taxes.state",
         editable: true,
-
+        width: "40px",
         formItemProps: (field) => {
           return {
             key: `${field.index}statetax`,
@@ -503,7 +504,7 @@ export function BillEnterModalLinesComponent({
             title: t("billlines.fields.local_tax_applicable"),
             dataIndex: "applicable_taxes.local",
             editable: true,
-
+            width: "40px",
             formItemProps: (field) => {
               return {
                 key: `${field.index}localtax`,

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -39,30 +39,32 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
           style: {
             ...(item.removed ? { textDecoration: "line-through" } : {})
           },
-          name: `${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-            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}` : ""
-                }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
-              </span>
-              {InstanceRenderMgr({
-                rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
-                  <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
-                )
-              })}
-              <span style={{ float: "right", paddingleft: "1rem" }}>
-                {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
-              </span>
-            </div>
-          )
+          name: generateLineName(item),
+          label: generateLineName(item)
         }))
       ]}
       {...restProps}
     ></Select>
   );
 };
+
+function generateLineName(item) {
+  return (
+    <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
+      <span>
+        {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+          item.oem_partno ? ` - ${item.oem_partno}` : ""
+        }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
+      </span>
+      {InstanceRenderMgr({
+        rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
+          <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
+        )
+      })}
+      <span style={{ float: "right", paddingleft: "1rem" }}>
+        {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
+      </span>
+    </div>
+  );
+}
 export default forwardRef(BillLineSearchSelect);

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -75,6 +76,7 @@ export function BillsListTableComponent({
       <Button
         title={t("tasks.buttons.create")}
         onClick={() => {
+          logImEXEvent("bills_create_task", {});
           setTaskUpsertContext({
             context: {
               jobid: job.id,
@@ -109,6 +111,13 @@ export function BillsListTableComponent({
       key: "vendorname",
       sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
       sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      filters: bills
+        ? [...new Set(bills.map((bill) => bill.vendor.name))].map((name) => ({
+            text: name,
+            value: name
+          }))
+        : [],
+      onFilter: (value, record) => record.vendor.name === value,
       render: (text, record) => <span>{record.vendor.name}</span>
     },
     {
@@ -160,6 +169,7 @@ export function BillsListTableComponent({
 
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
   };
 
   const filteredBills = bills
@@ -201,6 +211,7 @@ export function BillsListTableComponent({
               <Button
                 disabled={!hasBillsAccess}
                 onClick={() => {
+                  logImEXEvent("bills_reconcile", {});
                   setReconciliationContext({
                     actions: { refetch: billsQuery.refetch },
                     context: {

client/src/components/card-payment-modal/card-payment-modal.component.jsx

@@ -14,7 +14,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-import { getCurrentUser } from "../../firebase/firebase.utils";
+import { getCurrentUser, logImEXEvent } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
@@ -124,6 +124,7 @@ const CardPaymentModalComponent = ({
     const { payments } = form.getFieldsValue();
 
     try {
+      logImEXEvent("payment_cc_lightbox");
       const response = await axios.post("/intellipay/lightbox_credentials", {
         bodyshop,
         refresh: !!window.intellipay,
@@ -171,6 +172,7 @@ const CardPaymentModalComponent = ({
 
     try {
       const { payments } = form.getFieldsValue();
+      logImEXEvent("payment_cc_shortlink");
       const response = await axios.post("/intellipay/generate_payment_url", {
         bodyshop,
         amount: payments.reduce((acc, val) => acc + (val?.amount || 0), 0),

client/src/components/chat-affix/chat-affix.container.jsx

@@ -9,13 +9,13 @@ import "./chat-affix.styles.scss";
 import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
-export function ChatAffixContainer({ bodyshop, chatVisible }) {
+export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
   const { t } = useTranslation();
   const client = useApolloClient();
   const { socket } = useSocket();
 
   useEffect(() => {
-    if (!bodyshop || !bodyshop.messagingservicesid) return;
+    if (!bodyshop?.messagingservicesid) return;
 
     async function SubscribeToTopicForFCMNotification() {
       try {
@@ -35,8 +35,8 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
     SubscribeToTopicForFCMNotification();
 
     // Register WebSocket handlers
-    if (socket && socket.connected) {
-      registerMessagingHandlers({ socket, client });
+    if (socket?.connected) {
+      registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });
 
       return () => {
         unregisterMessagingHandlers({ socket });
@@ -44,11 +44,11 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
     }
   }, [bodyshop, socket, t, client]);
 
-  if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
+  if (!bodyshop?.messagingservicesid) return <></>;
 
   return (
     <div className={`chat-affix ${chatVisible ? "chat-affix-open" : ""}`}>
-      {bodyshop && bodyshop.messagingservicesid ? <ChatPopupComponent /> : null}
+      {bodyshop?.messagingservicesid ? <ChatPopupComponent /> : null}
     </div>
   );
 }

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -1,6 +1,11 @@
-import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
 import { gql } from "@apollo/client";
 
+import { playNewMessageSound } from "../../utils/soundManager.js";
+import { isLeaderTab } from "../../utils/singleTabAudioLeader";
+
+import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
+import { QUERY_ACTIVE_ASSOCIATION_SOUND } from "../../graphql/user.queries";
+
 const logLocal = (message, ...args) => {
   if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
     console.log(`==================== ${message} ====================`);
@@ -26,16 +31,48 @@ const enrichConversation = (conversation, isOutbound) => ({
   __typename: "conversations"
 });
 
-export const registerMessagingHandlers = ({ socket, client }) => {
+// Can be uncommonted to test the playback of the notification sound
+// window.testTone = () => {
+//   const notificationSound = new Audio(newMessageSound);
+//   notificationSound.play().catch((error) => {
+//     console.error("Error playing notification sound:", error);
+//   });
+// };
+
+export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
   if (!(socket && client)) return;
 
   const handleNewMessageSummary = async (message) => {
     const { conversationId, newConversation, existingConversation, isoutbound } = message;
 
+    // True only when DB value is strictly true; falls back to true on cache miss
+    const isNewMessageSoundEnabled = (client) => {
+      try {
+        const email = currentUser?.email;
+        if (!email) return true; // default allow if we can't resolve user
+        const res = client.readQuery({
+          query: QUERY_ACTIVE_ASSOCIATION_SOUND,
+          variables: { email }
+        });
+        const flag = res?.associations?.[0]?.new_message_sound;
+        return flag === true; // strictly true => enabled
+      } catch {
+        // If the query hasn't been seeded in cache yet, default ON
+        return true;
+      }
+    };
+
     logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });
 
     const queryVariables = { offset: 0 };
 
+    if (!isoutbound) {
+      // Play notification sound for new inbound message (scoped to bodyshop)
+      if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
+        playNewMessageSound(bodyshop.id);
+      }
+    }
+
     if (!existingConversation && conversationId) {
       // Attempt to read from the cache to determine if this is actually a new conversation
       try {
@@ -291,8 +328,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {
 
         case "conversation-unarchived":
         case "conversation-archived":
-          // Would like to someday figure out how to get this working without refetch queries,
-          // But I have but a solid 4 hours into it, and there are just too many weird occurrences
           try {
             const listQueryVariables = { offset: 0 };
             const detailsQueryVariables = { conversationId };
@@ -328,7 +363,8 @@ export const registerMessagingHandlers = ({ socket, client }) => {
           }
           break;
 
-        case "tag-added": { // Ensure `job_conversations` is properly formatted
+        case "tag-added": {
+          // Ensure `job_conversations` is properly formatted
           const formattedJobConversations = job_conversations.map((jc) => ({
             __typename: "job_conversations",
             jobid: jc.jobid || jc.job?.id,

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -40,7 +40,11 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
     variables: {
       jobId: conversation.job_conversations[0]?.jobid
     },
-    skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
+    skip:
+      !open ||
+      !conversation.job_conversations ||
+      conversation.job_conversations.length === 0 ||
+      bodyshop.uselocalmediaserver
   });
 
   const handleVisibleChange = (change) => {
@@ -48,7 +52,8 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
   };
 
   useEffect(() => {
-    setSelectedMedia([]);
+    // Instead of wiping the array (which holds media objects), just clear selection flags
+    setSelectedMedia((prev) => prev.map((m) => ({ ...m, isSelected: false })));
   }, [setSelectedMedia, conversation]);
 
   //Knowingly taking on the technical debt of poor implementation below. Done this way to avoid an edge case where no component may be displayed.
@@ -75,6 +80,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
             <JobDocumentsLocalGalleryExternal
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={conversation.job_conversations[0]?.jobid}
+              context="chat"
             />
           )}
         </>
@@ -90,6 +96,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
             <JobDocumentsLocalGalleryExternal
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={conversation.job_conversations[0]?.jobid}
+              context="chat"
             />
           )}
         </>
@@ -110,6 +117,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
       trigger="click"
       open={open}
       onOpenChange={handleVisibleChange}
+      destroyOnHidden
       classNames={{ root: "media-selector-popover" }}
     >
       <Badge count={selectedMedia.filter((s) => s.isSelected).length}>

client/src/components/contracts-find-modal/contracts-find-modal.container.jsx

@@ -34,7 +34,6 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
     logImEXEvent("contract_finder_search");
 
     //Execute contract find
-
     callSearch({
       variables: {
         plate: (values.plate && values.plate !== "" && values.plate) || undefined,

client/src/components/dashboard-grid/createDashboardQuery.js

@@ -2,11 +2,13 @@ import { gql } from "@apollo/client";
 import dayjs from "../../utils/day.js";
 import componentList from "./componentList.js";
 
-const createDashboardQuery = (state) => {
+const createDashboardQuery = (items) => {
   const componentBasedAdditions =
-    state &&
-    Array.isArray(state.layout) &&
-    state.layout.map((item) => componentList[item.i].gqlFragment || "").join("");
+    Array.isArray(items) &&
+    items
+      .map((item) => (componentList[item.i] && componentList[item.i].gqlFragment) || "")
+      .filter(Boolean)
+      .join("");
   return gql`
     query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
       monthly_sales: jobs(where: {_and: [

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -1,17 +1,17 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
-import { cloneDeep, isEmpty } from "lodash";
 import { useMutation, useQuery } from "@apollo/client";
 import { Button, Dropdown, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useMemo, useState } from "react";
+import { useMemo, useState, useEffect } from "react";
 import { Responsive, WidthProvider } from "react-grid-layout";
 import { useTranslation } from "react-i18next";
 import { MdClose } from "react-icons/md";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { UPDATE_DASHBOARD_LAYOUT, QUERY_USER_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
+import { QUERY_DASHBOARD_BODYSHOP } from "../../graphql/bodyshop.queries";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { GenerateDashboardData } from "./dashboard-grid.utils";
@@ -24,93 +24,173 @@ import "./dashboard-grid.styles.scss";
 const ResponsiveReactGridLayout = WidthProvider(Responsive);
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop
+  currentUser: selectCurrentUser
 });
 
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function DashboardGridComponent({ currentUser, bodyshop }) {
+export function DashboardGridComponent({ currentUser }) {
   const { t } = useTranslation();
-  const [state, setState] = useState({
-    ...(bodyshop.associations[0].user.dashboardlayout
-      ? bodyshop.associations[0].user.dashboardlayout
-      : { items: [], layout: {}, layouts: [] })
-  });
   const notification = useNotification();
 
-  const { loading, error, data, refetch } = useQuery(createDashboardQuery(state), {
+  // Constants for layout defaults
+  const DEFAULT_COLS = 12;
+  const DEFAULT_Y_POSITION = 1000;
+  const GRID_BREAKPOINTS = { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 };
+  const GRID_COLS = { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 };
+
+  // Fetch dashboard layout data
+  const { data: layoutData } = useQuery(QUERY_USER_DASHBOARD_LAYOUT, {
+    variables: { email: currentUser.email },
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+    skip: !currentUser?.email
+  });
+
+  // Fetch minimal bodyshop data for components
+  const {
+    loading,
+    error,
+    data: bodyshopData
+  } = useQuery(QUERY_DASHBOARD_BODYSHOP, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
 
   const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
 
-  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
+  // Memoize layout state initialization
+  const initialState = useMemo(() => {
+    const persisted = layoutData?.users?.[0]?.dashboardlayout;
+    if (persisted) {
+      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = persisted;
+      return {
+        items: Array.isArray(items) ? items : [],
+        layout: Array.isArray(layout) ? layout : [],
+        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
+        cols
+      };
+    }
+    return { items: [], layout: [], layouts: {}, cols: DEFAULT_COLS };
+  }, [layoutData]);
 
-    setState({ ...state, layout, layouts });
+  const [state, setState] = useState(initialState);
 
-    const result = await updateLayout({
-      variables: {
-        email: currentUser.email,
-        layout: { ...state, layout, layouts }
+  // Update state when layout data changes
+  useEffect(() => {
+    if (layoutData?.users?.[0]?.dashboardlayout) {
+      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = layoutData.users[0].dashboardlayout;
+      setState({
+        items: Array.isArray(items) ? items : [],
+        layout: Array.isArray(layout) ? layout : [],
+        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
+        cols
+      });
+    }
+  }, [layoutData]);
+
+  // Get bodyshop data for components
+  const bodyshop = bodyshopData?.dashboard_bodyshops?.[0];
+
+  // DRY helper function to update layout in database and cache
+  const updateLayoutAndCache = async (updatedLayout, errorContext = "updating layout") => {
+    try {
+      const { data: result } = await updateLayout({
+        variables: { email: currentUser.email, layout: updatedLayout }
+      });
+
+      const { errors = [] } = result?.update_users?.returning?.[0] || {};
+
+      if (errors.length) {
+        const errorMessages = errors.map(({ message }) => message || String(error));
+        notification.error({
+          message: t("dashboard.errors.updatinglayout", {
+            message: errorMessages.join("; ")
+          })
+        });
+        return false;
       }
-    });
 
-    if (!isEmpty(result?.errors)) {
+      return true;
+    } catch (err) {
+      console.error(`Dashboard ${errorContext} failed`, err);
       notification.error({
         message: t("dashboard.errors.updatinglayout", {
-          message: JSON.stringify(result.errors)
+          message: err?.message || String(err)
         })
       });
+      return false;
     }
   };
 
-  const handleRemoveComponent = (key) => {
+  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
+  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
+
+  const {
+    loading: dashboardLoading,
+    error: dashboardError,
+    data: dashboardQueryData,
+    refetch
+  } = useQuery(dashboardQueryDoc, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only"
+  });
+
+  const dashboardData = useMemo(() => GenerateDashboardData(dashboardQueryData), [dashboardQueryData]);
+
+  // Memoize existing layout keys to prevent unnecessary recalculations
+  const existingLayoutKeys = useMemo(() => state.items.map(({ i }) => i), [state.items]);
+
+  // Memoize menu items to prevent unnecessary recalculations
+  const menuItems = useMemo(
+    () =>
+      Object.entries(componentList).map(([key, { label }]) => ({
+        key,
+        label,
+        value: key,
+        disabled: existingLayoutKeys.includes(key)
+      })),
+    [existingLayoutKeys]
+  );
+
+  if (loading || dashboardLoading) return <LoadingSkeleton message={t("general.labels.loading")} />;
+  if (error || dashboardError) return <AlertComponent message={(error || dashboardError).message} type="error" />;
+
+  const handleLayoutChange = async (layout, layouts) => {
+    logImEXEvent("dashboard_change_layout");
+    setState((prev) => ({ ...prev, layout, layouts }));
+    await updateLayoutAndCache({ ...state, layout, layouts }, "layout change");
+  };
+
+  const handleRemoveComponent = async (key) => {
     logImEXEvent("dashboard_remove_component", { name: key });
-    const idxToRemove = state.items.findIndex((i) => i.i === key);
-
-    const items = cloneDeep(state.items);
-
-    items.splice(idxToRemove, 1);
-    setState({ ...state, items });
+    const updatedState = { ...state, items: state.items.filter((item) => item.i !== key) };
+    setState(updatedState);
+    await updateLayoutAndCache(updatedState, "component removal");
   };
 
-  const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { name: e });
-    setState({
-      ...state,
-      items: [
-        ...state.items,
-        {
-          i: e.key,
-          x: (state.items.length * 2) % (state.cols || 12),
-          y: 99, // puts it at the bottom
-          w: componentList[e.key].w || 2,
-          h: componentList[e.key].h || 2
-        }
-      ]
-    });
+  const handleAddComponent = async ({ key }) => {
+    logImEXEvent("dashboard_add_component", { key });
+    const { minW = 1, minH = 1, w: baseW = 2, h: baseH = 2 } = componentList[key] || {};
+    const nextItems = [
+      ...state.items,
+      {
+        i: key,
+        x: (state.items.length * 2) % (state.cols || DEFAULT_COLS),
+        y: DEFAULT_Y_POSITION,
+        w: Math.max(baseW, minW),
+        h: Math.max(baseH, minH)
+      }
+    ];
+    const updatedState = { ...state, items: nextItems };
+    setState(updatedState);
+    await updateLayoutAndCache(updatedState, "component addition");
   };
 
-  const dashboardData = useMemo(() => GenerateDashboardData(data), [data]);
-
-  const existingLayoutKeys = state.items.map((i) => i.i);
-
-  const menuItems = Object.keys(componentList).map((key) => ({
-    key: key,
-    label: componentList[key].label,
-    value: key,
-    disabled: existingLayoutKeys.includes(key)
-  }));
-
   const menu = { items: menuItems, onClick: handleAddComponent };
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
-
   return (
     <div>
       <PageHeader
@@ -128,27 +208,32 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
 
       <ResponsiveReactGridLayout
         className="layout"
-        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
-        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
-        width="100%"
+        breakpoints={GRID_BREAKPOINTS}
+        cols={GRID_COLS}
         layouts={state.layouts}
         onLayoutChange={handleLayoutChange}
       >
         {state.items.map((item) => {
-          const TheComponent = componentList[item.i].component;
+          const { component: TheComponent, minW = 1, minH = 1, w: specW, h: specH } = componentList[item.i] || {};
+          const safeItem = {
+            ...item,
+            w: Math.max(item.w || specW || minW, minW),
+            h: Math.max(item.h || specH || minH, minH)
+          };
+
           return (
             <div
-              key={item.i}
+              key={safeItem.i}
               data-grid={{
-                ...item,
-                minH: componentList[item.i].minH || 1,
-                minW: componentList[item.i].minW || 1
+                ...safeItem,
+                minH,
+                minW
               }}
             >
               <LoadingSkeleton loading={loading}>
                 <Icon
                   component={MdClose}
-                  key={item.i}
+                  key={safeItem.i}
                   style={{
                     position: "absolute",
                     zIndex: "2",
@@ -156,9 +241,9 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
                     top: ".25rem",
                     cursor: "pointer"
                   }}
-                  onClick={() => handleRemoveComponent(item.i)}
+                  onClick={() => handleRemoveComponent(safeItem.i)}
                 />
-                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />
+                {TheComponent && <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />}
               </LoadingSkeleton>
             </div>
           );

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -92,6 +92,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
         rowKey="center"
         dataSource={allocationsSummary}
         locale={{ emptyText: t("dms.labels.refreshallocations") }}
+        scroll={{ x: true }}
         summary={() => {
           const totals =
             allocationsSummary &&

client/src/components/email-documents/email-documents.component.jsx

@@ -67,6 +67,7 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
             <JobsDocumentsLocalGalleryExternalComponent
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={emailConfig.jobid}
+              context="email"
             />
           )}
         </>
@@ -82,6 +83,7 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
             <JobsDocumentsLocalGalleryExternalComponent
               externalMediaState={[selectedMedia, setSelectedMedia]}
               jobId={emailConfig.jobid}
+              context="email"
             />
           )}
         </>

client/src/components/global-footer/global-footer.component.jsx

@@ -16,7 +16,7 @@ const mapStateToProps = createStructuredSelector({
 
 export function GlobalFooter({ isPartsEntry }) {
   const { t } = useTranslation();
-  
+
   if (isPartsEntry) {
     return (
       <Footer>
@@ -35,7 +35,6 @@ export function GlobalFooter({ isPartsEntry }) {
               rome: t("titles.romeonline")
             })} - ${import.meta.env.VITE_APP_GIT_SHA_DATE}`}
           </div>
-          <WssStatusDisplayComponent />
           <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
             Disclaimer & Notices
           </Link>

client/src/components/global-search/global-search-os.component.jsx

@@ -7,6 +7,7 @@ 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";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function GlobalSearchOs() {
   const { t } = useTranslation();
@@ -19,6 +20,8 @@ export default function GlobalSearchOs() {
     if (v && v && v !== "" && v.length >= 3) {
       try {
         setLoading(true);
+        logImEXEvent("global_search", { search: v });
+
         const searchData = await axios.post("/search", {
           search: v
         });

client/src/components/job-audit-trail/job-audit-trail.component.jsx

@@ -4,6 +4,7 @@ import { Button, Card, Col, Row, Table, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
@@ -125,6 +126,7 @@ export function JobAuditTrail({ bodyshop, jobId }) {
       render: (text, record) => (
         <Button
           onClick={() => {
+            logImEXEvent("jobs_audit_view_email", {});
             var win = window.open(
               "",
               "Title",

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -90,7 +90,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||
@@ -103,7 +103,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines || []} />
       </CardTemplate>
     </div>
   );

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -46,6 +46,7 @@ import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.con
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -96,7 +97,7 @@ export function JobLinesComponent({
     filteredInfo: {
       ...(isPartsEntry
         ? {
-            part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
+            part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"] //"PAO" Removed by request
           }
         : {})
     }
@@ -317,7 +318,7 @@ export function JobLinesComponent({
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||
@@ -397,6 +398,7 @@ export function JobLinesComponent({
       filteredInfo: filters,
       sortedInfo: sorter
     }));
+    logImEXEvent("joblines_table_change", { pagination, filters, sorter });
   };
 
   const handleMark = (e) => {
@@ -413,6 +415,7 @@ export function JobLinesComponent({
         ])
       );
     }
+    logImEXEvent("joblines_mark_lines", {});
   };
 
   const markMenu = {
@@ -616,12 +619,18 @@ export function JobLinesComponent({
             expanded ? (
               <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
             ) : (
-              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+              <PlusCircleTwoTone
+                onClick={(e) => {
+                  onExpand(record, e);
+                  logImEXEvent("joblines_expander", {});
+                }}
+              />
             )
         }}
         onRow={(record) => {
           return {
             onDoubleClick: () => {
+              logImEXEvent("joblines_double_click_select", {});
               const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
               notMatchingLines.length !== selectedLines.length
                 ? setSelectedLines(notMatchingLines)

client/src/components/job-lifecycle/job-lifecycle.component.jsx

@@ -1,18 +1,19 @@
-import { useCallback, useEffect, useState } from "react";
-import dayjs from "../../utils/day";
-import axios from "axios";
-import { Badge, Card, Space, Table, Tag } from "antd";
 import { gql, useQuery } from "@apollo/client";
-import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
+import { Badge, Card, Space, Table, Tag } from "antd";
+import axios from "axios";
 import { isEmpty } from "lodash";
+import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import "./job-lifecycle.styles.scss";
-import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
+import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import "./job-lifecycle.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -57,6 +58,7 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
           jobids: job.id,
           statuses: statuses.statuses
         });
+        logImEXEvent("jobs_lifecycle_data", {});
         const data = response.data.transition[job.id];
         setLifecycleData(data);
       } catch (err) {

client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx

@@ -10,6 +10,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -32,6 +33,7 @@ export function JoblineBulkAssign({ setSelectedLines, selectedLines, insertAudit
   const handleConvert = async (values) => {
     try {
       setLoading(true);
+      logImEXEvent("joblines_bulk_assign", {});
       const result = await assignLines({
         variables: {
           jobline: {

client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx

@@ -12,6 +12,7 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -46,6 +47,7 @@ export function JobLineDispatchButton({
     try {
       setLoading(true);
       //THIS HAS NOT YET BEEN TESTED. START BY FINISHING THIS FUNCTION.
+      logImEXEvent("joblines_dispatch", {});
       const result = await dispatchLines({
         variables: {
           partsDispatch: {

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -1,8 +1,9 @@
 import { useMemo } from "react";
-import { Col, Row, Tag, Tooltip } from "antd";
+import { Tag, Tooltip } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -10,64 +11,68 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
+
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
-export function JobPartsQueueCount({ bodyshop, parts, style }) {
+export function JobPartsQueueCount({ bodyshop, parts }) {
+  const { t } = useTranslation();
   const partsStatus = useMemo(() => {
     if (!parts) return null;
+    const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
     return parts.reduce(
       (acc, val) => {
         if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
         acc.total = acc.total + val.count;
         acc[val.status] = acc[val.status] + val.count;
-
         return acc;
       },
       {
         total: 0,
         null: 0,
-        [bodyshop.md_order_statuses.default_bo]: 0,
-        [bodyshop.md_order_statuses.default_ordered]: 0,
-        [bodyshop.md_order_statuses.default_received]: 0,
-        [bodyshop.md_order_statuses.default_returned]: 0
+        ...Object.fromEntries(statusKeys.map((key) => [bodyshop.md_order_statuses[key], 0]))
       }
     );
   }, [bodyshop, parts]);
 
   if (!parts) return null;
-
   return (
-    <Row style={style}>
-      <Col span={4}>
-        <Tooltip title="Total">
-          <Tag>{partsStatus.total}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title="No Status">
-          <Tag color="gold">{partsStatus["null"]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-          <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_received}>
-          <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-          <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col span={4}>
-        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-          <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
-        </Tooltip>
-      </Col>
-    </Row>
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
+        gap: "8px",
+        width: "100%",
+        justifyItems: "start"
+      }}
+    >
+      <Tooltip title="Total">
+        <Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
+      </Tooltip>
+      <Tooltip title={t("dashboard.errors.status_normal")}>
+        <Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus["null"]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_bo}>
+        <Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_bo]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
+        <Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_ordered]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_received}>
+        <Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_received]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_returned}>
+        <Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_returned]}
+        </Tag>
+      </Tooltip>
+    </div>
   );
 }

client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx

@@ -4,6 +4,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 export default function JobRemoveFromPartsQueue({ checked, jobId }) {
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -13,6 +14,8 @@ export default function JobRemoveFromPartsQueue({ checked, jobId }) {
 
   const handleChange = async (e) => {
     setLoading(true);
+    logImEXEvent("parts_queue_toggle", { estimators: e });
+
     const result = await updateJob({
       variables: { jobId: jobId, job: { queued_for_parts: e.target.checked } }
     });

client/src/components/jobs-available-scan/jobs-available-scan.component.jsx

@@ -8,6 +8,7 @@ import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { selectPartnerVersion } from "../../redux/application/application.selectors";
 import { alphaSort } from "../../utils/sorters";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -30,11 +31,15 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
   const notification = useNotification();
 
   const handleTableChange = (pagination, filters, sorter) => {
+    logImEXEvent("available_jobs_scan_sort_filter", { pagination, filters, sorter });
+
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
   const handleImport = async (filepath) => {
     setLoading(true);
+    logImEXEvent("available_jobs_scan", {});
+
     const response = await axios.post("http://localhost:1337/import/", {
       filepath
     });

client/src/components/jobs-available-table/jobs-available-table.component.jsx

@@ -12,6 +12,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -34,6 +35,7 @@ export function JobsAvailableComponent({ bodyshop, loading, data, refetch, addJo
 
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    logImEXEvent("available_jobs_sort_filter", { pagination, filters, sorter });
   };
 
   const columns = [

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx

@@ -14,6 +14,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser,
@@ -108,6 +109,9 @@ export function JobsDetailHeaderActionsToggleProduction({
                 DateTimeFormatterFunction(values.actual_completion)
               )
       });
+
+      logImEXEvent(scenario === "pre" ? "job_intake_quick" : "job-deliver-quick", {});
+
       setPopOverVisible(false);
       closeParentMenu();
       refetch();

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -77,6 +77,8 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
     .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
+  const employeeData = bodyshop.associations.find((a) => a.useremail === job.admin_clerk)?.user?.employee ?? null;
+
   // Handle checkbox changes
   const handleCheckboxChange = async (field, checked) => {
     const value = checked ? dayjs().toISOString() : null;
@@ -162,7 +164,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
                       {job.cccontracts.map((c, index) => (
                         <Space key={c.id} wrap>
                           <Link to={`/manage/courtesycars/contracts/${c.id}`}>
-                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
+                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model} ${c.courtesycar.plate} - ${t(c.status)}`}
                             {index !== job.cccontracts.length - 1 ? "," : null}
                           </Link>
                         </Space>
@@ -355,6 +357,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
             >
               <div>
                 <JobEmployeeAssignments job={job} />
+                {job.admin_clerk && (
+                  <>
+                    <Divider style={{ margin: ".5rem" }} />
+                    <DataLabel label={t("jobs.fields.admin_clerk")}>
+                      {employeeData?.displayName ?? job.admin_clerk}
+                    </DataLabel>
+                  </>
+                )}
                 <Divider style={{ margin: ".5rem" }} />
                 <DataLabel label={t("jobs.labels.labor_hrs")}>
                   {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} / {(bodyHrs + refinishHrs).toFixed(1)}

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx

@@ -1,11 +1,12 @@
-import { useEffect } from "react";
-import { Gallery } from "react-grid-gallery";
+import { useEffect, useMemo, useState, useCallback } from "react";
+import LocalMediaGrid from "./local-media-grid.component";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { getJobMedia } from "../../redux/media/media.actions";
 import { selectAllMedia } from "../../redux/media/media.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -18,41 +19,127 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobDocumentsLocalGalleryExternal);
 
-function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia }) {
+/**
+ * JobDocumentsLocalGalleryExternal
+ * Fetches and displays job-related image media using the custom LocalMediaGrid.
+ *
+ * Props:
+ *  - jobId: string | number (required to fetch media)
+ *  - externalMediaState: [imagesArray, setImagesFn] (state lifted to parent for shared selection)
+ *  - getJobMedia: dispatching function to retrieve media for a job
+ *  - allMedia: redux slice keyed by jobId containing raw media records
+ *  - context: "chat" | "email" | other string used to drive grid behavior
+ *
+ * Notes:
+ *  - The previous third-party gallery required a remount key (openVersion); custom grid no longer does.
+ *  - Selection flags are preserved when media refreshes.
+ *  - Loading state ends after transformation regardless of whether any images were found.
+ */
+function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia, context = "chat" }) {
   const [galleryImages, setgalleryImages] = externalMediaState;
-  const { t } = useTranslation();
+  const [isLoading, setIsLoading] = useState(false);
+  const { t } = useTranslation(); // i18n hook retained if future translations are added
+  const DEBUG_LOCAL_GALLERY = false; // flip to true for verbose console logging
 
+  // Transform raw media record into a normalized image object consumed by the grid.
+  const transformMediaToImages = useCallback((raw) => {
+    return raw
+      .filter((m) => m.type?.mime?.startsWith("image"))
+      .map((m) => ({
+        ...m,
+        src: m.thumbnail,
+        thumbnail: m.thumbnail,
+        fullsize: m.src,
+        width: 225,
+        height: 225,
+        thumbnailWidth: 225,
+        thumbnailHeight: 225,
+        caption: m.filename || m.key
+      }));
+  }, []);
+
+  // Fetch media when jobId changes (network request triggers Redux update -> documents memo recalculates).
   useEffect(() => {
-    if (jobId) {
-      getJobMedia(jobId);
-    }
+    if (!jobId) return;
+    setIsLoading(true);
+    getJobMedia(jobId);
   }, [jobId, getJobMedia]);
 
-  useEffect(() => {
-    let documents = allMedia?.[jobId]
-      ? allMedia[jobId].reduce((acc, val) => {
-          if (val.type?.mime && val.type.mime.startsWith("image")) {
-            acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
-          }
-          return acc;
-        }, [])
-      : [];
-    console.log(
-      "🚀 ~ file: jobs-documents-local-gallery.external.component.jsx:48 ~ useEffect ~ documents:",
-      documents
-    );
+  // Memo: transform raw redux media into gallery documents.
+  const documents = useMemo(
+    () => transformMediaToImages(allMedia?.[jobId] || []),
+    [allMedia, jobId, transformMediaToImages]
+  );
 
-    setgalleryImages(documents);
-  }, [allMedia, jobId, setgalleryImages, t]);
+  // Sync transformed documents into external state while preserving selection flags.
+  useEffect(() => {
+    const prevSelection = new Map(galleryImages.map((p) => [p.filename, p.isSelected]));
+    const nextImages = documents.map((d) => ({ ...d, isSelected: prevSelection.get(d.filename) || false }));
+    // Micro-optimization: if array length and each filename + selection flag match, skip creating a new array.
+    if (galleryImages.length === nextImages.length) {
+      let identical = true;
+      for (let i = 0; i < nextImages.length; i++) {
+        if (
+          galleryImages[i].filename !== nextImages[i].filename ||
+          galleryImages[i].isSelected !== nextImages[i].isSelected
+        ) {
+          identical = false;
+          break;
+        }
+      }
+      if (identical) {
+        setIsLoading(false); // ensure loading stops even on no-change
+        if (DEBUG_LOCAL_GALLERY) {
+          console.log("[LocalGallery] documents unchanged", { jobId, count: documents.length });
+        }
+        return;
+      }
+    }
+    setgalleryImages(nextImages);
+    setIsLoading(false); // stop loading after transform regardless of emptiness
+    if (DEBUG_LOCAL_GALLERY) {
+      console.log("[LocalGallery] documents transformed", { jobId, count: documents.length });
+    }
+  }, [documents, setgalleryImages, galleryImages, jobId, DEBUG_LOCAL_GALLERY]);
+
+  // Toggle handler (stable reference)
+  const handleToggle = useCallback(
+    (idx) => {
+      setgalleryImages((imgs) => imgs.map((g, gIdx) => (gIdx === idx ? { ...g, isSelected: !g.isSelected } : g)));
+    },
+    [setgalleryImages]
+  );
+
+  const messageStyle = { textAlign: "center", padding: "1rem" }; // retained for potential future states
+
+  if (!jobId) {
+    return (
+      <div aria-label="media gallery unavailable" style={{ position: "relative", minHeight: 80 }}>
+        <div style={messageStyle}>No job selected.</div>
+      </div>
+    );
+  }
 
   return (
-    <div className="clearfix">
-      <Gallery
-        images={galleryImages}
-        onSelect={(index) => {
-          setgalleryImages(galleryImages.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g)));
-        }}
-      />
+    <div
+      className="clearfix"
+      style={{ position: "relative", minHeight: 80 }}
+      data-jobid={jobId}
+      aria-label={`media gallery for job ${jobId}`}
+    >
+      {isLoading && galleryImages.length === 0 && (
+        <div className="local-gallery-loading" style={messageStyle} role="status" aria-live="polite">
+          <LoadingSpinner />
+        </div>
+      )}
+      {galleryImages.length > 0 && (
+        <LocalMediaGrid images={galleryImages} minColumns={4} context={context} onToggle={handleToggle} />
+      )}
+      {galleryImages.length > 0 && (
+        <div style={{ fontSize: 10, color: "#888", marginTop: 4 }} aria-live="off">
+          {`${t("general.labels.media")}: ${galleryImages.length}`}
+        </div>
+      )}
     </div>
   );
 }

client/src/components/jobs-documents-local-gallery/local-media-grid.component.jsx

@@ -0,0 +1,207 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+
+/**
+ * LocalMediaGrid
+ * Lightweight replacement for react-grid-gallery inside the chat popover.
+ * Props:
+ *  - images: Array<{ src, fullsize, filename?, isSelected? }>
+ *  - onToggle(index)
+ */
+export function LocalMediaGrid({
+  images,
+  onToggle,
+  thumbSize = 100,
+  gap = 8,
+  minColumns = 3,
+  maxColumns = 12,
+  context = "default"
+}) {
+  const containerRef = useRef(null);
+  const [cols, setCols] = useState(() => {
+    // Pre-calc initial columns to stabilize layout before images render
+    const count = images.length;
+    if (count === 0) return minColumns; // reserve minimal structure
+    if (count === 1 && context === "chat") return 1;
+    return Math.min(maxColumns, Math.max(minColumns, count));
+  });
+  const [justifyMode, setJustifyMode] = useState("start");
+  const [distributeExtra, setDistributeExtra] = useState(false);
+  const [loadedMap, setLoadedMap] = useState(() => new Map()); // filename -> boolean loaded
+
+  const handleImageLoad = useCallback((key) => {
+    setLoadedMap((prev) => {
+      if (prev.get(key)) return prev; // already loaded
+      const next = new Map(prev);
+      next.set(key, true);
+      return next;
+    });
+  }, []);
+
+  // Dynamically compute columns for all contexts to avoid auto-fit stretching gaps in email overlay
+  useEffect(() => {
+    const el = containerRef.current;
+    if (!el) return;
+    const compute = () => {
+      // For non-chat (email / default) we rely on CSS auto-fill; only chat needs explicit column calc & distribution logic.
+      if (context !== "chat") {
+        setCols(images.length || 0); // retain count for ARIA semantics; not used for template when non-chat.
+        setDistributeExtra(false);
+        return;
+      }
+      const width = el.clientWidth;
+      if (!width) return;
+      const perCol = thumbSize + gap; // track + gap space
+      const fitCols = Math.max(1, Math.floor((width + gap) / perCol));
+      // base desired columns: up to how many images we have and how many fit
+      let finalCols = Math.min(images.length || 1, fitCols, maxColumns);
+      // enforce minimum columns to reserve layout skeleton (except when fewer images)
+      if (finalCols < minColumns && images.length >= minColumns) {
+        finalCols = Math.min(fitCols, minColumns);
+      }
+      // chat-specific clamp
+      if (context === "chat") {
+        finalCols = Math.min(finalCols, 4);
+      }
+      if (finalCols < 1) finalCols = 1;
+      setCols(finalCols);
+      setJustifyMode("start");
+
+      // Determine if there is leftover horizontal space that can't fit another column.
+      // Only distribute when we're at the maximum allowed columns for the context and images exceed or meet that count.
+      const contextMax = context === "chat" ? 4 : maxColumns;
+      const baseWidthNeeded = finalCols * thumbSize + (finalCols - 1) * gap;
+      const leftover = width - baseWidthNeeded;
+      const atMaxColumns = finalCols === contextMax && images.length >= finalCols;
+      // leftover must be positive but less than space needed for an additional column (perCol)
+      if (atMaxColumns && leftover > 0 && leftover < perCol) {
+        setDistributeExtra(true);
+      } else {
+        setDistributeExtra(false);
+      }
+    };
+    compute();
+    const ro = new ResizeObserver(() => compute());
+    ro.observe(el);
+    return () => ro.disconnect();
+  }, [images.length, thumbSize, gap, minColumns, maxColumns, context]);
+
+  const gridTemplateColumns = useMemo(() => {
+    if (context === "chat") {
+      if (distributeExtra) {
+        return `repeat(${cols}, minmax(${thumbSize}px, 1fr))`;
+      }
+      return `repeat(${cols}, ${thumbSize}px)`;
+    }
+    // Non-chat contexts: allow browser to auto-fill columns; fixed min (thumbSize) ensures squares; tracks expand to distribute remaining space.
+    return `repeat(auto-fill, minmax(${thumbSize}px, 1fr))`;
+  }, [cols, thumbSize, distributeExtra, context]);
+  const stableWidth = undefined; // no fixed width
+
+  const handleKeyDown = useCallback(
+    (e, idx) => {
+      if (e.key === "Enter" || e.key === " ") {
+        e.preventDefault();
+        onToggle(idx);
+      }
+    },
+    [onToggle]
+  );
+
+  return (
+    <div
+      className="local-media-grid"
+      style={{
+        display: "grid",
+        gridTemplateColumns,
+        gap,
+        maxHeight: 420,
+        overflowY: "auto",
+        overflowX: "hidden",
+        padding: 4,
+        justifyContent: justifyMode,
+        width: stableWidth
+      }}
+      ref={containerRef}
+      role="list"
+      aria-label="media thumbnails"
+    >
+      {images.map((img, idx) => (
+        <div
+          key={img.filename || idx}
+          role="listitem"
+          tabIndex={0}
+          aria-label={img.filename || `image ${idx + 1}`}
+          onClick={() => onToggle(idx)}
+          onKeyDown={(e) => handleKeyDown(e, idx)}
+          style={{
+            position: "relative",
+            border: img.isSelected ? "2px solid #1890ff" : "1px solid #ccc",
+            outline: "none",
+            borderRadius: 4,
+            cursor: "pointer",
+            background: "#fafafa",
+            width: thumbSize,
+            height: thumbSize,
+            overflow: "hidden",
+            boxSizing: "border-box"
+          }}
+        >
+          {(() => {
+            const key = img.filename || idx;
+            const loaded = loadedMap.get(key) === true;
+            return (
+              <>
+                {!loaded && (
+                  <div
+                    aria-hidden="true"
+                    style={{
+                      position: "absolute",
+                      inset: 0,
+                      background: "#f0f0f0",
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
+                      fontSize: 10,
+                      color: "#bbb"
+                    }}
+                  >
+                    {/* simple skeleton; no shimmer to reduce cost */}…
+                  </div>
+                )}
+                <img
+                  src={img.src}
+                  alt={img.filename || img.caption || "thumbnail"}
+                  loading="lazy"
+                  onLoad={() => handleImageLoad(key)}
+                  style={{
+                    width: thumbSize,
+                    height: thumbSize,
+                    objectFit: "cover",
+                    display: "block",
+                    borderRadius: 4,
+                    opacity: loaded ? 1 : 0,
+                    transition: "opacity .25s ease"
+                  }}
+                />
+              </>
+            );
+          })()}
+          {img.isSelected && (
+            <div
+              aria-hidden="true"
+              style={{
+                position: "absolute",
+                inset: 0,
+                background: "rgba(24,144,255,0.45)",
+                borderRadius: 4
+              }}
+            />
+          )}
+        </div>
+      ))}
+      {/* No placeholders needed; layout uses auto-fit for non-chat or fixed columns for chat */}
+    </div>
+  );
+}
+
+export default LocalMediaGrid;

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -15,6 +15,7 @@ import { alphaSort, statusSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -177,6 +178,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
     }
     setFilter(filters);
     history({ search: queryString.stringify(search) });
+    logImEXEvent("jobs_all_list_sort_filter", { pagination, filters, sorter });
   };
 
   useEffect(() => {

client/src/components/jobs-list/jobs-list.component.jsx

@@ -17,6 +17,7 @@ import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -67,6 +68,7 @@ export function JobsList({ bodyshop }) {
     : [];
 
   const handleTableChange = (pagination, filters, sorter) => {
+    logImEXEvent("jobs_list_sort_filter", { pagination, filters, sorter });
     setState({ ...state, sortedInfo: sorter });
     setFilter(filters);
   };
@@ -164,7 +166,7 @@ export function JobsList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -165,7 +165,7 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })

client/src/components/notification-center/notification-center.container.jsx

@@ -39,11 +39,15 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
     return showUnreadOnly ? { ...baseWhereClause, read: { _is_null: true } } : baseWhereClause;
   }, [baseWhereClause, showUnreadOnly]);
 
+  // before you call useQuery, compute skip once so you can reuse it
+  const skipQuery = !userAssociationId || !isEmployee;
+
   const {
     data,
     fetchMore,
     loading: queryLoading,
-    refetch
+    refetch,
+    error
   } = useQuery(GET_NOTIFICATIONS, {
     variables: {
       limit: INITIAL_NOTIFICATIONS,
@@ -52,14 +56,26 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
     },
     fetchPolicy: "cache-and-network",
     notifyOnNetworkStatusChange: true,
+    errorPolicy: "all",
     pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId || !isEmployee,
-    onError: (err) => {
-      console.error(`Error polling Notifications: ${err?.message || ""}`);
-      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
-    }
+    skip: skipQuery
   });
 
+  // Replace onError with a side-effect that reacts to the hook’s `error`
+  useEffect(() => {
+    if (!error || skipQuery) return;
+
+    console.error(`Error polling Notifications: ${error?.message || ""}`);
+
+    const t = setTimeout(() => {
+      // Guard: if component unmounted or query now skipped, do nothing
+      if (!skipQuery) {
+        refetch().catch((e) => console.error("Refetch failed:", e?.message || e));
+      }
+    }, day.duration(2, "seconds").asMilliseconds());
+
+    return () => clearTimeout(t);
+  }, [error, refetch, skipQuery]);
   useEffect(() => {
     const handleClickOutside = (event) => {
       // Prevent open + close behavior from the header

client/src/components/owner-detail-form/owner-detail-form.container.jsx

@@ -1,17 +1,18 @@
-import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import { useApolloClient, useMutation } from "@apollo/client";
+import { Button, Form, Popconfirm } from "antd";
+import { phone } from "phone"; // Import phone utility for formatting
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors"; // Adjust path
 import { phoneNumberOptOutService } from "../../utils/phoneOptOutService.js"; // Adjust path
 import OwnerDetailFormComponent from "./owner-detail-form.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { phone } from "phone"; // Import phone utility for formatting
 
 // Connect to Redux to access bodyshop
 const mapStateToProps = createStructuredSelector({
@@ -55,6 +56,7 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {
 
   const handleDelete = async () => {
     setLoading(true);
+    logImEXEvent("owner_delete", {});
     try {
       const result = await deleteOwner({
         variables: { id: owner.id }
@@ -84,6 +86,7 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {
 
   const handleFinish = async (values) => {
     setLoading(true);
+    logImEXEvent("owner_update", {});
     try {
       const result = await updateOwner({
         variables: { ownerId: owner.id, owner: values }

client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx

@@ -1,7 +1,7 @@
 import { DownOutlined } from "@ant-design/icons";
 import { Dropdown, InputNumber, Space } from "antd";
 import { useTranslation } from "react-i18next";
-
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function PartsOrderModalPriceChange({ form, field }) {
   const { t } = useTranslation();
   const menu = {
@@ -63,6 +63,7 @@ export default function PartsOrderModalPriceChange({ form, field }) {
       }
     ],
     onClick: ({ key }) => {
+      logImEXEvent("parts_order_manual_discount", {});
       if (key === "custom") return;
       const values = form.getFieldsValue();
       const { parts_order_lines } = values;

client/src/components/parts-queue-card/parts-queue-card.component.jsx

@@ -8,6 +8,7 @@ import AlertComponent from "../alert/alert.component";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsQueueJobLinesComponent from "./parts-queue-job-lines.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function PartsQueueDetailCard() {
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
@@ -37,6 +38,8 @@ export default function PartsQueueDetailCard() {
   const { t } = useTranslation();
   const handleDrawerClose = () => {
     delete searchParams.selected;
+    logImEXEvent("parts_queue_drawer", {});
+
     history({
       search: queryString.stringify({
         ...searchParams

client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx

@@ -145,7 +145,7 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -20,6 +20,7 @@ import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.c
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -73,6 +74,7 @@ export function PartsQueueListComponent({ bodyshop }) {
     }
     setFilter(filters);
     history({ search: queryString.stringify(searchParams) });
+    logImEXEvent("parts_queue_sort_filter", { pagination, filters, sorter });
   };
 
   const handleOnRowClick = (record) => {
@@ -169,7 +171,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       filters:
         bodyshop.md_ro_statuses.active_statuses.map((s) => {
           return {
-            text: s || "No Status*",
+            text: s || t("dashboard.errors.status"),
             value: [s]
           };
         }) || [],
@@ -233,7 +235,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

client/src/components/production-board-filters/production-board-filters.component.jsx

@@ -10,6 +10,7 @@ import {
 } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -26,10 +27,12 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
 
   const toggleAlertFilter = () => {
     setFilter({ ...filter, alert: !filter.alert });
+    logImEXEvent("visual_board_filter_alert", {});
   };
 
   const toggleUnassignedFilter = () => {
     setFilter({ ...filter, unassigned: !filter.unassigned });
+    logImEXEvent("visual_board_filter_unassigned", {});
   };
 
   return (
@@ -40,6 +43,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
         placeholder={t("general.labels.search")}
         onChange={(e) => {
           setFilter({ ...filter, search: e.target.value });
+          logImEXEvent("visual_board_filter_search", { search: e.target.value });
         }}
       />
       <EmployeeSearchSelectComponent
@@ -47,7 +51,10 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
         options={bodyshop.employees.filter((e) => e.active)}
         value={filter.employeeId}
         placeholder={t("production.labels.employeesearch")}
-        onChange={(emp) => setFilter({ ...filter, employeeId: emp })}
+        onChange={(emp) => {
+          setFilter({ ...filter, employeeId: emp });
+          logImEXEvent("visual_board_filter_alert", { employeeId: emp });
+        }}
         allowClear
       />
       <Button

client/src/components/production-list-columns/production-list-columns.comment.component.jsx

@@ -5,6 +5,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnComment({ record }) {
   const { t } = useTranslation();
@@ -28,6 +29,7 @@ export default function ProductionListColumnComment({ record }) {
     }).then(() => {
       if (record.refetch) record.refetch();
     });
+    logImEXEvent("job_add_comment", { estimators: e });
   };
 
   const handleChange = (e) => {

client/src/components/production-list-columns/production-list-columns.data.jsx

@@ -34,8 +34,9 @@ const getEmployeeName = (employeeId, employees) => {
   return employee ? `${employee.first_name} ${employee.last_name}` : "";
 };
 
-const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
+const productionListColumnsData = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
   const { Enhanced_Payroll } = treatments;
+
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -313,7 +314,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
         activeStatuses
           ?.map((s) => {
             return {
-              text: s || "No Status*",
+              text: s || i18n.t("dashboard.errors.status"),
               value: [s]
             };
           })
@@ -584,4 +585,4 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
     }
   ];
 };
-export default r;
+export default productionListColumnsData;

client/src/components/production-list-table/production-list-table.component.jsx

@@ -18,6 +18,7 @@ import ProductionListDetail from "../production-list-detail/production-list-deta
 import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 import ProductionListPrint from "./production-list-print.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -114,6 +115,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
       setState(newState);
       setHasUnsavedChanges(true);
     }
+    logImEXEvent("production_list_sort_filter", { pagination, filters, sorter });
   };
 
   const onDragEnd = (fromIndex, toIndex) => {
@@ -134,6 +136,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
       setColumns(newColumns);
       setHasUnsavedChanges(true);
     }
+    logImEXEvent("production_list_remove_column", { key });
   };
 
   const handleResize =
@@ -156,6 +159,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
       setColumns(updatedColumns);
       setHasUnsavedChanges(true);
     }
+    logImEXEvent("production_list_add_column", { key: newColumn.key });
   };
 
   const headerItem = (col) => {

client/src/components/profile-my/profile-my.component.jsx

@@ -1,5 +1,5 @@
-import { Button, Card, Col, Form, Input } from "antd";
-import { LockOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Form, Input, Space, Switch, Tooltip, Typography } from "antd";
+import { AudioMutedOutlined, LockOutlined, SoundOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,6 +10,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx";
+import { useMutation, useQuery } from "@apollo/client";
+import { QUERY_ACTIVE_ASSOCIATION_SOUND, UPDATE_NEW_MESSAGE_SOUND } from "../../graphql/user.queries.js";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
@@ -48,6 +50,28 @@ export default connect(
     }
   };
 
+  // ---- Notification sound (associations.new_message_sound) ----
+  const email = currentUser?.email;
+  const { data: assocData, loading: assocLoading } = useQuery(QUERY_ACTIVE_ASSOCIATION_SOUND, {
+    variables: { email },
+    skip: !email,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "cache-first"
+  });
+  const association = assocData?.associations?.[0];
+  // Treat null/undefined as ON for backward-compat
+  const soundEnabled = association?.new_message_sound === true;
+
+  const [updateNewMessageSound, { loading: updatingSound }] = useMutation(UPDATE_NEW_MESSAGE_SOUND, {
+    update(cache, { data }) {
+      const updated = data?.update_associations_by_pk;
+      if (!updated) return;
+      cache.modify({
+        id: cache.identify({ __typename: "associations", id: updated.id }),
+        fields: { new_message_sound: () => updated.new_message_sound }
+      });
+    }
+  });
   return (
     <>
       <Col span={24}>
@@ -80,6 +104,7 @@ export default connect(
           </Card>
         </Form>
       </Col>
+
       <Col span={24}>
         <Form onFinish={handleChangePassword} autoComplete={"no"} initialValues={currentUser} layout="vertical">
           <Card
@@ -119,6 +144,52 @@ export default connect(
           </Card>
         </Form>
       </Col>
+
+      {association && (
+        <Col span={24}>
+          <Card title={t("user.labels.user_settings")}>
+            <Space align="center" size="large">
+              <Typography.Text>{t("user.labels.play_sound_for_new_messages")}</Typography.Text>
+              <Tooltip
+                title={soundEnabled ? t("user.labels.notification_sound_on") : t("user.labels.notification_sound_off")}
+              >
+                <Switch
+                  checkedChildren={<SoundOutlined />}
+                  unCheckedChildren={<AudioMutedOutlined />}
+                  checked={!!soundEnabled}
+                  loading={assocLoading || updatingSound}
+                  onChange={(checked) => {
+                    updateNewMessageSound({
+                      variables: { id: association.id, value: checked },
+                      optimisticResponse: {
+                        update_associations_by_pk: {
+                          __typename: "associations",
+                          id: association.id,
+                          new_message_sound: checked
+                        }
+                      }
+                    })
+                      .then(() => {
+                        notification.success({
+                          message: checked
+                            ? t("user.labels.notification_sound_enabled")
+                            : t("user.labels.notification_sound_disabled")
+                        });
+                      })
+                      .catch((e) => {
+                        notification.error({ message: e.message || "Failed to update setting" });
+                      });
+                  }}
+                />
+              </Tooltip>
+            </Space>
+            <Typography.Paragraph type="secondary" style={{ marginTop: 8 }}>
+              {t("user.labels.notification_sound_help")}
+            </Typography.Paragraph>
+          </Card>
+        </Col>
+      )}
+
       {scenarioNotificationsOn && (
         <Col span={24}>
           <NotificationSettingsForm />

client/src/components/qbo-authorize/qbo-authorize.component.jsx

@@ -5,6 +5,7 @@ import { useEffect } from "react";
 import { useCookies } from "react-cookie";
 import { useLocation, useNavigate } from "react-router-dom";
 import QboSignIn from "../../assets/qbo/C2QB_green_btn_med_default.svg";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function QboAuthorizeComponent() {
   const location = useLocation();
@@ -12,6 +13,7 @@ export default function QboAuthorizeComponent() {
   const [setCookie] = useCookies(["access_token", "refresh_token"]);
 
   const handleQbSignIn = async () => {
+    logImEXEvent("qbo_sign_in_clicked");
     const result = await Axios.post("/qbo/authorize");
     window.location.href = result.data;
   };

client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx

@@ -9,6 +9,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { upsellEnum, UpsellMaskWrapper } from "../upsell/upsell.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -79,7 +80,12 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
   );
 
   return (
-    <Popover trigger="hover" placement="bottom" content={popContent}>
+    <Popover
+      trigger="hover"
+      placement="bottom"
+      onOpenChange={(open) => open && logImEXEvent("schedule_spider_graph", {})}
+      content={popContent}
+    >
       <RadarChartOutlined />
     </Popover>
   );

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx

@@ -19,6 +19,7 @@ import OwnerNameDisplay from "../owner-name-display/owner-name-display.component
 import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -142,6 +143,7 @@ export function ScheduleCalendarHeaderComponent({ bodyshop, label, refetch, date
           content={jobsInPopup}
           trigger="hover"
           title={t("appointments.labels.arrivingjobs")}
+          onOpenChange={(open) => open && logImEXEvent("schedule_popover_arriving_jobs", {})}
         >
           <Space size="small">
             <Icon component={MdFileDownload} style={{ color: "green" }} />
@@ -159,6 +161,7 @@ export function ScheduleCalendarHeaderComponent({ bodyshop, label, refetch, date
           content={jobsOutPopup}
           trigger="hover"
           title={t("appointments.labels.completingjobs")}
+          onOpenChange={(open) => open && logImEXEvent("schedule_popover_departing_jobs", {})}
         >
           <Space size="small">
             <Icon component={MdFileUpload} style={{ color: "red" }} />

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -13,6 +13,7 @@ import Event from "../job-at-change/schedule-event.container";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import local from "./localizer";
 import HeaderComponent from "./schedule-calendar-header.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import "./schedule-calendar.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
@@ -139,6 +140,8 @@ export function ScheduleCalendarWrapperComponent({
         }}
         onView={(view) => {
           search.view = view;
+          logImEXEvent("schedule_change_view", { view });
+
           history({ search: queryString.stringify(search) });
         }}
         step={15}

client/src/components/schedule-calendar/schedule-calendar.component.jsx

@@ -14,6 +14,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import _ from "lodash";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -80,6 +81,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                 value={[...estimatorsFilter]}
                 onChange={(e) => {
                   setEstimatiorsFilter(e);
+                  logImEXEvent("schedule_filter_by_estimator", { estimators: e });
                 }}
                 options={estimators.map((e) => ({
                   label: e,
@@ -95,6 +97,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                 value={filter?.ins_co_nm ? filter.ins_co_nm : []}
                 onChange={(e) => {
                   setFilter({ ...filter, ins_co_nm: e });
+                  logImEXEvent("schedule_filter_by_ins_co_nm", { ins_co_nm: e });
                 }}
                 options={bodyshop.md_ins_cos.map((i) => ({
                   label: i.name,

client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 export default function ScoreboardEntryEdit({ entry }) {
   const [open, setOpen] = useState(false);
@@ -16,6 +17,7 @@ export default function ScoreboardEntryEdit({ entry }) {
 
   const handleFinish = async (values) => {
     setLoading(true);
+    logImEXEvent("scoreboard_edit_job", {});
     values.date = dayjs(values.date).format("YYYY-MM-DD");
     const result = await updateScoreboardentry({
       variables: { sbId: entry.id, sbInput: values }

client/src/components/share-to-teams/share-to-teams.component.jsx

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -52,6 +53,7 @@ const ShareToTeamsComponent = ({
   const teamsShareUrl = `https://teams.microsoft.com/share?href=${currentUrl}&preText=${messageText}&title=${pageTitle}`;
   // Function to open the centered share link in a new window/tab
   const handleShare = () => {
+    logImEXEvent("share_to_teams", {});
     const screenWidth = window.screen.width;
     const screenHeight = window.screen.height;
     const windowWidth = 600;

client/src/components/shop-info/shop-info.general.component.jsx

@@ -425,7 +425,15 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                     ]
                   : [])
               ]
-            : [])
+            : []),
+          <Form.Item
+            key="accumulatePayableLines"
+            name={["accountingconfig", "accumulatePayableLines"]}
+            label={t("bodyshop.fields.accumulatePayableLines")}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
         ]}
       </LayoutFormRow>
       <FeatureWrapper featureName="scoreboard" noauth={() => null}>

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -138,6 +138,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                   <Switch />
                 </Form.Item>
               )}
+              {bodyshop.pbs_serialnumber && (
+                <Form.Item
+                  label={t("bodyshop.fields.dms.ro_posting")}
+                  valuePropName="checked"
+                  name={["pbs_configuration", "ro_posting"]}
+                >
+                  <Switch />
+                </Form.Item>
+              )}
               {bodyshop.pbs_serialnumber && (
                 <Form.Item
                   label={t("bodyshop.fields.dms.appostingaccount")}

client/src/components/shop-info/shop-info.speedprint.component.jsx

@@ -4,10 +4,18 @@ import { useTranslation } from "react-i18next";
 import { TemplateList } from "../../utils/TemplateConstants";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function ShopInfoSpeedPrint() {
   const { t } = useTranslation();
-  const TemplateListGenerated = TemplateList("job");
+  const allTemplates = TemplateList("job");
+  const TemplateListGenerated = InstanceRenderManager({
+    imex: Object.fromEntries(
+      Object.entries(allTemplates).filter(([, { enhanced_payroll }]) => !enhanced_payroll)
+    ),
+    rome: allTemplates
+  });
+
   return (
     <Form.List name={["speedprint"]}>
       {(fields, { add, remove, move }) => {

client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx

@@ -96,14 +96,14 @@ export function SimplifiedPartsJobsListComponent({
 
       ellipsis: true,
       sorter: search?.search
-        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.parts_active_statuses)
+        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses?.parts_active_statuses)
         : true,
       sortOrder: sortcolumn === "status" && sortorder,
       render: (text, record) => {
         return record.status || t("general.labels.na");
       },
       filteredValue: filter?.status || null,
-      filters: bodyshop.md_ro_statuses.parts_statuses.map((s) => {
+      filters: bodyshop?.md_ro_statuses?.parts_statuses?.map((s) => {
         return { text: s, value: [s] };
       }),
       onFilter: (value, record) => value.includes(record.status)
@@ -147,7 +147,7 @@ export function SimplifiedPartsJobsListComponent({
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount style={{ minWidth: "10rem" }} parts={record.joblines_status} />
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
     },
     {
       title: t("jobs.fields.comment"),

client/src/components/task-list/task-list.component.jsx

@@ -19,6 +19,7 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter.jsx"
 import dayjs from "../../utils/day";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import PriorityLabel from "../../utils/tasksPriorityLabel.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 /**
  * Task List Component
@@ -289,6 +290,7 @@ function TaskListComponent({
       } else {
         delete search[param];
       }
+      logImEXEvent("tasks_filter", { key: param });
       history({ search: queryString.stringify(search) });
     },
     [history, search]

client/src/components/task-list/task-list.container.jsx

@@ -13,6 +13,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import dayjs from "../../utils/day";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -107,6 +108,7 @@ export function TaskListContainer({
           })
         );
       }
+      logImEXEvent("task_completed", {});
 
       notification["success"]({
         message: t("tasks.successes.completed")
@@ -160,6 +162,7 @@ export function TaskListContainer({
         );
       }
 
+      logImEXEvent("task_deleted", {});
       notification["success"]({
         message: t("tasks.successes.deleted")
       });

client/src/components/task-upsert-modal/task-upsert-modal.container.jsx

@@ -17,6 +17,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import { isEqual } from "lodash";
 import refetchRouteMappings from "./task-upsert-modal.route.mappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -180,7 +181,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
     notification["success"]({
       message: t("tasks.successes.updated")
     });
-
+    logImEXEvent("task_update", {});
     toggleModalVisible();
   };
 
@@ -217,7 +218,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
 
     form.resetFields();
     toggleModalVisible();
-
+    logImEXEvent("task_insert", {});
     notification["success"]({
       message: t("tasks.successes.created")
     });

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

@@ -16,7 +16,7 @@ const mapDispatchToProps = () => ({
 export function TechHeader({ technician }) {
   const { t } = useTranslation();
   return (
-    <Header style={{ textAlign: "center" }}>
+    <Header style={{ textAlign: "center", height: "auto", overflow: "visible" }}>
       <Typography.Title style={{ color: "#fff" }}>
         {technician
           ? t("tech.labels.loggedin", {

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Card, Col, Form, InputNumber, Popover, Row, Select } from "antd";
+import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd";
 import axios from "axios";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -124,103 +124,12 @@ export function TechClockOffButton({
             cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
           }}
         >
-          <Row gutter={[16, 16]}>
-            <Col span={!isShiftTicket ? 8 : 24}>
-              {!isShiftTicket ? (
-                <div>
-                  <Form.Item
-                    label={t("timetickets.fields.actualhrs")}
-                    name="actualhrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                  <Form.Item
-                    label={t("timetickets.fields.productivehrs")}
-                    name="productivehrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      },
-                      ({ getFieldValue }) => ({
-                        validator(rule, value) {
-                          if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                            return Promise.resolve();
-                          }
-                          if (!value || getFieldValue("cost_center") === null || !lineTicketData)
-                            return Promise.resolve();
-
-                          //Check the cost center,
-                          const totals = CalculateAllocationsTotals(
-                            bodyshop,
-                            lineTicketData.joblines,
-                            lineTicketData.timetickets,
-                            lineTicketData.jobs_by_pk.lbr_adjustments
-                          );
-
-                          const fieldTypeToCheck =
-                            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
-
-                          const costCenterDiff =
-                            Math.round(
-                              totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
-                                ?.difference * 10
-                            ) / 10;
-
-                          if (value > costCenterDiff)
-                            return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
-                          else {
-                            return Promise.resolve();
-                          }
-                        }
-                      })
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                </div>
-              ) : null}
-              <Form.Item
-                name="cost_center"
-                label={t("timetickets.fields.cost_center")}
-                rules={[
-                  {
-                    required: true
-                    //message: t("general.validation.required"),
-                  }
-                ]}
-              >
-                <Select disabled={isShiftTicket}>
-                  {isShiftTicket ? (
-                    <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
-                  ) : (
-                    emps &&
-                    emps.rates.map((item) => (
-                      <Select.Option key={item.cost_center}>
-                        {item.cost_center === "timetickets.labels.shift"
-                          ? t(item.cost_center)
-                          : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-                            ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                            : item.cost_center}
-                      </Select.Option>
-                    ))
-                  )}
-                </Select>
-              </Form.Item>
-
-              {isShiftTicket ? (
-                <div></div>
-              ) : (
+          <Space direction="vertical">
+            {!isShiftTicket ? (
+              <div>
                 <Form.Item
-                  name="status"
-                  label={t("jobs.fields.status")}
-                  initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                  label={t("timetickets.fields.actualhrs")}
+                  name="actualhrs"
                   rules={[
                     {
                       required: true
@@ -228,35 +137,117 @@ export function TechClockOffButton({
                     }
                   ]}
                 >
-                  <Select>
-                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
-                      <Select.Option key={item}></Select.Option>
-                    ))}
-                  </Select>
+                  <InputNumber min={0} precision={1} />
                 </Form.Item>
-              )}
-              <Button type="primary" htmlType="submit" loading={loading}>
-                {t("general.actions.save")}
-              </Button>
-              <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
-            </Col>
-            {!isShiftTicket && (
-              <Col span={16}>
-                <LaborAllocationContainer
-                  jobid={jobId || null}
-                  loading={queryLoading}
-                  lineTicketData={lineTicketData}
-                />
-              </Col>
+                <Form.Item
+                  label={t("timetickets.fields.productivehrs")}
+                  name="productivehrs"
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    },
+                    ({ getFieldValue }) => ({
+                      validator(rule, value) {
+                        if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                          return Promise.resolve();
+                        }
+                        if (!value || getFieldValue("cost_center") === null || !lineTicketData)
+                          return Promise.resolve();
+                        //Check the cost center,
+                        const totals = CalculateAllocationsTotals(
+                          bodyshop,
+                          lineTicketData.joblines,
+                          lineTicketData.timetickets,
+                          lineTicketData.jobs_by_pk.lbr_adjustments
+                        );
+                        const fieldTypeToCheck =
+                          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
+                        const costCenterDiff =
+                          Math.round(
+                            totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
+                              ?.difference * 10
+                          ) / 10;
+                        if (value > costCenterDiff)
+                          return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
+                        else {
+                          return Promise.resolve();
+                        }
+                      }
+                    })
+                  ]}
+                >
+                  <InputNumber min={0} precision={1} />
+                </Form.Item>
+              </div>
+            ) : null}
+            <Form.Item
+              name="cost_center"
+              label={t("timetickets.fields.cost_center")}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select disabled={isShiftTicket}>
+                {isShiftTicket ? (
+                  <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
+                ) : (
+                  emps &&
+                  emps.rates.map((item) => (
+                    <Select.Option key={item.cost_center}>
+                      {item.cost_center === "timetickets.labels.shift"
+                        ? t(item.cost_center)
+                        : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                          : item.cost_center}
+                    </Select.Option>
+                  ))
+                )}
+              </Select>
+            </Form.Item>
+            {isShiftTicket ? (
+              <div></div>
+            ) : (
+              <Form.Item
+                name="status"
+                label={t("jobs.fields.status")}
+                initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                    <Select.Option key={item}></Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
             )}
-          </Row>
+            <Button type="primary" htmlType="submit" loading={loading}>
+              {t("general.actions.save")}
+            </Button>
+            <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+            {!isShiftTicket && (
+              <LaborAllocationContainer jobid={jobId || null} loading={queryLoading} lineTicketData={lineTicketData} />
+            )}
+          </Space>
         </Form>
       </div>
     </Card>
   );
 
   return (
-    <Popover content={overlay} trigger="click">
+    <Popover 
+      content={<div style={{ maxHeight: "75vh", overflowY: "auto" }}>{overlay}</div>} 
+      trigger="click"
+      getPopupContainer={() => document.querySelector('#time-ticket-modal')}
+    >
       <Button loading={loading} {...otherBtnProps}>
         {t("timetickets.actions.clockout")}
       </Button>

client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx

@@ -111,7 +111,7 @@ export function TechLookupJobsList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx

@@ -1,13 +1,14 @@
-import { useState } from "react";
-import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation } from "@apollo/client";
-import VehicleDetailFormComponent from "./vehicle-detail-form.component";
+import { Button, Form, Popconfirm } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import dayjs from "../../utils/day";
-import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
 import { useNavigate } from "react-router-dom";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
+import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import dayjs from "../../utils/day";
+import VehicleDetailFormComponent from "./vehicle-detail-form.component";
 
 function VehicleDetailFormContainer({ vehicle, refetch }) {
   const { t } = useTranslation();
@@ -20,6 +21,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
 
   const handleDelete = async () => {
     setLoading(true);
+    logImEXEvent("vehicle_delete", {});
     const result = await deleteVehicle({
       variables: { id: vehicle.id }
     });
@@ -42,6 +44,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
 
   const handleFinish = async (values) => {
     setLoading(true);
+    logImEXEvent("vehicle_update", {});
     const result = await updateVehicle({
       variables: { vehId: vehicle.id, vehicle: values }
     });

client/src/firebase/firebase.utils.js

@@ -4,7 +4,7 @@ import { getAuth, updatePassword, updateProfile } from "@firebase/auth";
 import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
-import * as amplitude from '@amplitude/analytics-browser';
+//import * as amplitude from '@amplitude/analytics-browser';
 import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
@@ -76,9 +76,11 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   try {
 
     const state = stateProp || store.getState();
+
     const eventParams = {
       shop: (state.user && state.user.bodyshop && state.user.bodyshop.shopname) || null,
       user: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
+      partsManagementOnly: state?.user?.partsManagementOnly,
       ...additionalParams
     };
     // axios.post("/ioevent", {
@@ -96,7 +98,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     //   eventParams
     // );
     logEvent(analytics, eventName, eventParams);
-    amplitude.track(eventName, eventParams);
+    //amplitude.track(eventName, eventParams);
     posthog.capture(eventName, eventParams);
 
   } finally {

client/src/graphql/bills.queries.js

@@ -20,8 +20,8 @@ export const DELETE_BILL = gql`
 `;
 
 export const QUERY_ALL_BILLS_PAGINATED = gql`
-  query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!) {
-    bills(offset: $offset, limit: $limit, order_by: $order) {
+  query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!, $where: bills_bool_exp) {
+    bills(offset: $offset, limit: $limit, order_by: $order, where: $where) {
       id
       vendorid
       vendor {
@@ -42,7 +42,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
         ro_number
       }
     }
-    bills_aggregate {
+    bills_aggregate(where: $where) {
       aggregate {
         count(distinct: true)
       }

client/src/graphql/bodyshop.queries.js

@@ -363,3 +363,25 @@ export const GET_ACTIVE_EMPLOYEES_IN_SHOP = gql`
     }
   }
 `;
+export const QUERY_MINIMAL_BODYSHOP = gql`
+  query QUERY_MINIMAL_BODYSHOP {
+    bodyshops(where: { associations: { active: { _eq: true } } }) {
+      id
+      shopname
+      associations(where: { active: { _eq: true } }) {
+        user {
+          email
+        }
+      }
+    }
+  }
+`;
+export const QUERY_DASHBOARD_BODYSHOP = gql`
+  query QUERY_DASHBOARD_BODYSHOP {
+    dashboard_bodyshops: bodyshops(where: { associations: { active: { _eq: true } } }) {
+      id
+      prodtargethrs
+      md_ro_statuses
+    }
+  }
+`;

client/src/graphql/jobs.queries.js

@@ -424,6 +424,7 @@ export const GET_JOB_BY_PK = gql`
       actual_delivery
       actual_in
       acv_amount
+      admin_clerk
       adjustment_bottom_line
       alt_transport
       area_of_damage
@@ -2347,12 +2348,13 @@ export const MARK_JOB_AS_UNINVOICED = gql`
   mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, $default_delivered: String!) {
     update_jobs_by_pk(
       pk_columns: { id: $jobId }
-      _set: { date_exported: null, date_invoiced: null, status: $default_delivered }
+      _set: { date_exported: null, date_invoiced: null, status: $default_delivered, admin_clerk: null }
     ) {
       id
       date_exported
       date_invoiced
       status
+      admin_clerk
     }
   }
 `;

client/src/graphql/user.queries.js

@@ -5,6 +5,7 @@ export const QUERY_SHOP_ASSOCIATIONS = gql`
     associations(where: { shopid: { _eq: $shopid } }) {
       id
       authlevel
+      new_message_sound
       shopid
       user {
         email
@@ -28,6 +29,26 @@ export const UPDATE_ASSOCIATION = gql`
   }
 `;
 
+// Query to load the active association for a given user and get the new_message_sound flag
+export const QUERY_ACTIVE_ASSOCIATION_SOUND = gql`
+  query QUERY_ACTIVE_ASSOCIATION_SOUND($email: String!) {
+    associations(where: { _and: { useremail: { _eq: $email }, active: { _eq: true } } }) {
+      id
+      new_message_sound
+    }
+  }
+`;
+
+// Mutation to update just the new_message_sound field
+export const UPDATE_NEW_MESSAGE_SOUND = gql`
+  mutation UPDATE_NEW_MESSAGE_SOUND($id: uuid!, $value: Boolean) {
+    update_associations_by_pk(pk_columns: { id: $id }, _set: { new_message_sound: $value }) {
+      id
+      new_message_sound
+    }
+  }
+`;
+
 export const INSERT_EULA_ACCEPTANCE = gql`
   mutation INSERT_EULA_ACCEPTANCE($eulaAcceptance: eula_acceptances_insert_input!) {
     insert_eula_acceptances_one(object: $eulaAcceptance) {
@@ -77,6 +98,7 @@ export const QUERY_KANBAN_SETTINGS = gql`
     }
   }
 `;
+
 export const UPDATE_KANBAN_SETTINGS = gql`
   mutation UPDATE_KANBAN_SETTINGS($id: uuid!, $ks: jsonb) {
     update_associations_by_pk(pk_columns: { id: $id }, _set: { kanban_settings: $ks }) {
@@ -113,3 +135,12 @@ export const UPDATE_NOTIFICATIONS_AUTOADD = gql`
     }
   }
 `;
+
+export const QUERY_USER_DASHBOARD_LAYOUT = gql`
+  query QUERY_USER_DASHBOARD_LAYOUT($email: String!) {
+    users(where: { email: { _eq: $email } }) {
+      email
+      dashboardlayout
+    }
+  }
+`;

client/src/index.jsx

@@ -14,7 +14,7 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
-import * as amplitude from "@amplitude/analytics-browser";
+//import * as amplitude from "@amplitude/analytics-browser";
 import { PostHogProvider } from "posthog-js/react";
 import posthog from "posthog-js";
 
@@ -26,22 +26,23 @@ registerSW({ immediate: true });
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
-amplitude.init("6228a598e57cd66875cfd41604f1f891", {
-  defaultTracking: true
-  //  {
-  //     attribution: {
-  //       excludeReferrers: true,
-  //       initialEmptyValue: true,
-  //       resetSessionOnNewCampaign: true,
-  //     },
-  //     fileDownloads: true,
-  //     formInteractions: true,
-  //     pageViews: {
-  //       trackHistoryChanges: 'all'
-  //     },
-  //     sessions: true
-  //   }
-});
+// amplitude.init(import.meta.env.VITE_APP_AMP_KEY, {
+//   defaultTracking: true,
+//   serverUrl: import.meta.env.VITE_APP_AMP_URL
+//   //  {
+//   //     attribution: {
+//   //       excludeReferrers: true,
+//   //       initialEmptyValue: true,
+//   //       resetSessionOnNewCampaign: true,
+//   //     },
+//   //     fileDownloads: true,
+//   //     formInteractions: true,
+//   //     pageViews: {
+//   //       trackHistoryChanges: 'all'
+//   //     },
+//   //     sessions: true
+//   //   }
+// });
 
 posthog.init(import.meta.env.VITE_PUBLIC_POSTHOG_KEY, {
   autocapture: false,

client/src/pages/bills/bills.page.component.jsx

@@ -1,5 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd";
+import { useQuery } from "@apollo/client";
 import axios from "axios";
 import queryString from "query-string";
 import { useEffect, useState } from "react";
@@ -15,43 +16,36 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import useLocalStorage from "../../utils/useLocalStorage";
+import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 
 const mapDispatchToProps = (dispatch) => ({
   setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
 });
 
-export function BillsListPage({ loading, data, refetch, total, setBillEnterContext }) {
+export function BillsListPage({ loading, data, refetch, total, setBillEnterContext, handleTableChange, sortedInfo }) {
   const search = queryString.parse(useLocation().search);
   const [openSearchResults, setOpenSearchResults] = useState([]);
   const [searchLoading, setSearchLoading] = useState(false);
   const { page } = search;
   const history = useNavigate();
-  const [state, setState] = useLocalStorage("bills_list_sort", {
-    sortedInfo: {},
-    filteredInfo: { text: "" }
-  });
   const Templates = TemplateList("bill");
   const { t } = useTranslation();
+
+  const { data: vendorsData } = useQuery(QUERY_ALL_VENDORS);
+
   const columns = [
     {
       title: t("bills.fields.vendorname"),
       dataIndex: "vendorname",
       key: "vendorname",
-      // sortObject: (direction) => {
-      //   return {
-      //     vendor: {
-      //       name: direction
-      //         ? direction === "descend"
-      //           ? "desc"
-      //           : "asc"
-      //         : "desc",
-      //     },
-      //   };
-      // },
-      // sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
-      // sortOrder:
-      //   state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
+      sortObject: (order) => ({
+        vendor: { name: order === "descend" ? "desc" : "asc" }
+      }),
+      filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
+      filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
+      sortOrder: sortedInfo.columnKey === "vendorname" && sortedInfo.order,
       render: (text, record) => <span>{record.vendor.name}</span>
     },
     {
@@ -59,26 +53,17 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "invoice_number",
       key: "invoice_number",
       sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
+      sortOrder: sortedInfo.columnKey === "invoice_number" && sortedInfo.order
     },
     {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      // sortObject: (direction) => {
-      //   return {
-      //     job: {
-      //       ro_number: direction
-      //         ? direction === "descend"
-      //           ? "desc"
-      //           : "asc"
-      //         : "desc",
-      //     },
-      //   };
-      // },
-      // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      // sortOrder:
-      //   state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      sortObject: (order) => ({
+        job: { ro_number: order === "descend" ? "desc" : "asc" }
+      }),
+      sortOrder: sortedInfo.columnKey === "ro_number" && sortedInfo.order,
       render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
     },
     {
@@ -86,7 +71,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "date",
       key: "date",
       sorter: (a, b) => dateSort(a.date, b.date),
-      sortOrder: state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "date" && sortedInfo.order,
       render: (text, record) => <DateFormatter>{record.date}</DateFormatter>
     },
     {
@@ -94,7 +79,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "total",
       key: "total",
       sorter: (a, b) => a.total - b.total,
-      sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "total" && sortedInfo.order,
       render: (text, record) => <CurrencyFormatter>{record.total}</CurrencyFormatter>
     },
     {
@@ -102,7 +87,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "is_credit_memo",
       key: "is_credit_memo",
       sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
-      sortOrder: state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "is_credit_memo" && sortedInfo.order,
       render: (text, record) => <Checkbox checked={record.is_credit_memo} />
     },
     {
@@ -110,7 +95,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
       dataIndex: "exported",
       key: "exported",
       sorter: (a, b) => a.exported - b.exported,
-      sortOrder: state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "exported" && sortedInfo.order,
       render: (text, record) => <Checkbox checked={record.exported} />
     },
     {
@@ -174,19 +159,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
     }
   ];
 
-  const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-    search.page = pagination.current;
-    if (sorter && sorter.column && sorter.column.sortObject) {
-      search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
-    } else {
-      delete search.searchObj;
-      search.sortcolumn = sorter.order ? sorter.columnKey : null;
-      search.sortorder = sorter.order;
-    }
-    search.sort = JSON.stringify({ [sorter.columnKey]: sorter.order });
-    history({ search: queryString.stringify(search) });
-  };
+  // (State & URL handling moved to container - Option C)
 
   useEffect(() => {
     if (search.search && search.search.trim() !== "") {
@@ -201,6 +174,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
         search: value || search.search,
         index: "bills"
       });
+      logImEXEvent("bills_search", { search: value || search.search, results: searchData?.data?.hits?.hits?.length });
       setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
     } catch (error) {
       console.log("Error while fetching search results", error);

client/src/pages/bills/bills.page.container.jsx

@@ -3,13 +3,14 @@ import queryString from "query-string";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
 import BillDetailEditContainer from "../../components/bill-detail-edit/bill-detail-edit.container";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_BILLS_PAGINATED } from "../../graphql/bills.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import BillsPageComponent from "./bills.page.component";
+import useLocalStorage from "../../utils/useLocalStorage";
 import { pageLimit } from "../../utils/config";
 import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -23,7 +24,9 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
-  const searchParams = queryString.parse(useLocation().search);
+  const location = useLocation();
+  const history = useNavigate();
+  const searchParams = queryString.parse(location.search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
   useEffect(() => {
@@ -37,6 +40,12 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
     setBreadcrumbs([{ link: "/manage/bills", label: t("titles.bc.bills-list") }]);
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
+  // Persisted table state (sorting & filtering)
+  const [persistState, setPersistState] = useLocalStorage("bills_list_sort", {
+    sortedInfo: {},
+    filteredInfo: { vendorname: [] }
+  });
+
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_BILLS_PAGINATED, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -49,10 +58,95 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
           : {
               [sortcolumn || "date"]: sortorder ? (sortorder === "descend" ? "desc" : "asc") : "desc"
             }
-      ]
+      ],
+      where: searchParams.vendorIds ? { vendorid: { _in: searchParams.vendorIds.split(",") } } : undefined
     }
   });
 
+  const handleTableChange = (pagination, filters, sorter) => {
+    const search = queryString.parse(location.search);
+
+    const vendorArr = filters?.vendorname ?? [];
+    const newVendorIds = vendorArr.length ? vendorArr.join(",") : undefined;
+    const vendorFilterChanged = search.vendorIds !== newVendorIds;
+
+    search.page = vendorFilterChanged || !search.page ? 1 : pagination.current;
+    newVendorIds ? (search.vendorIds = newVendorIds) : delete search.vendorIds;
+
+    const { columnKey, order, column } = sorter || {};
+    if (column?.sortObject) {
+      search.searchObj = JSON.stringify(column.sortObject(order));
+      delete search.sortcolumn;
+      delete search.sortorder;
+    } else {
+      delete search.searchObj;
+      search.sortcolumn = order ? columnKey : null;
+      search.sortorder = order ?? null; // keep explicit null to mirror prior behavior
+    }
+
+    setPersistState({
+      sortedInfo: sorter || {},
+      filteredInfo: { vendorname: vendorArr }
+    });
+
+    history({ search: queryString.stringify(search) });
+  };
+
+  useEffect(() => {
+    const search = queryString.parse(location.search);
+    let changed = false;
+
+    const vendorPersisted = persistState.filteredInfo.vendorname || [];
+    if (!search.vendorIds && vendorPersisted.length) {
+      search.vendorIds = vendorPersisted.join(",");
+      search.page = 1; // reset page when injecting filter
+      changed = true;
+    }
+
+    const { sortedInfo } = persistState;
+    if (!search.searchObj && !search.sortcolumn && sortedInfo?.order) {
+      const { columnKey, order } = sortedInfo;
+      if (columnKey) {
+        const dir = order === "descend" ? "desc" : "asc";
+        if (columnKey === "vendorname") {
+          search.searchObj = JSON.stringify({ vendor: { name: dir } });
+        } else if (columnKey === "ro_number") {
+          search.searchObj = JSON.stringify({ job: { ro_number: dir } });
+        } else {
+          search.sortcolumn = columnKey;
+          search.sortorder = order;
+        }
+        changed = true;
+      }
+    }
+
+    if (changed) {
+      history({ search: queryString.stringify(search) });
+      return;
+    }
+
+    const hasPersistSort = !!sortedInfo?.order;
+    const hasUrlSort = !!(search.searchObj || (search.sortcolumn && search.sortorder));
+    if (!hasPersistSort && hasUrlSort) {
+      let derived = {};
+      if (search.searchObj) {
+        try {
+          const o = JSON.parse(search.searchObj);
+          if (o.vendor?.name) {
+            derived = { columnKey: "vendorname", order: o.vendor.name === "desc" ? "descend" : "ascend" };
+          } else if (o.job?.ro_number) {
+            derived = { columnKey: "ro_number", order: o.job.ro_number === "desc" ? "descend" : "ascend" };
+          }
+        } catch {
+          /* ignore parse errors */
+        }
+      } else {
+        derived = { columnKey: search.sortcolumn, order: search.sortorder };
+      }
+      if (derived.order) setPersistState((prev) => ({ ...prev, sortedInfo: derived }));
+    }
+  }, [location.search]);
+
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
     <FeatureWrapperComponent
@@ -70,6 +164,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
             loading={loading}
             refetch={refetch}
             total={data ? data.bills_aggregate.aggregate.count : 0}
+            handleTableChange={handleTableChange}
+            sortedInfo={persistState.sortedInfo || {}}
           />
 
           <BillDetailEditContainer />

client/src/pages/contract-create/contract-create.page.container.jsx

@@ -15,6 +15,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import ContractCreatePageComponent from "./contract-create.page.component";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -57,6 +58,7 @@ export function ContractCreatePageContainer({ bodyshop, setBreadcrumbs, setSelec
 
       if (!result.errors) {
         //Update the courtesy car to have the damage.
+        logImEXEvent("courtesy_car_contract_created", {});
         notification["success"]({
           message: t("contracts.successes.saved")
         });

client/src/pages/dms/dms.container.jsx

@@ -48,7 +48,7 @@ export const socket = SocketIO(
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
   const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState("DEBUG");
+  const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
   const history = useNavigate();
   const [logs, setLogs] = useState([]);
   const search = queryString.parse(useLocation().search);

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

@@ -39,13 +39,14 @@ import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions.js";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly
+  jobRO: selectJobReadOnly,
+  currentUser: selectCurrentUser
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -59,7 +60,7 @@ const mapDispatchToProps = (dispatch) => ({
     )
 });
 
-export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext }) {
+export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext, currentUser }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const client = useApolloClient();
@@ -97,6 +98,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
           kmin: values.kmin,
           kmout: values.kmout,
           dms_allocation: values.dms_allocation,
+          admin_clerk: currentUser.email,
           ...(removefromproduction ? { inproduction: false } : {}),
           ...(values.qb_multiple_payers ? { qb_multiple_payers: values.qb_multiple_payers } : {})
         }

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -14,7 +14,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-
+import { logImEXEvent } from "../../firebase/firebase.utils";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
@@ -70,6 +70,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
         label: t("titles.bc.jobs-new")
       }
     ]);
+    logImEXEvent("manual_job_create_start", {});
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
   const runInsertJob = (job) => {
@@ -81,6 +82,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
           error: null,
           newJobId: resp.data.insert_jobs.returning[0].id
         });
+        logImEXEvent("manual_job_create_completed", {});
       })
       .catch((error) => {
         notification["error"]({

client/src/pages/manage/manage.page.component.jsx

@@ -20,7 +20,12 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
-import { selectBodyshop, selectInstanceConflict, selectPartsManagementOnly } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+  selectInstanceConflict,
+  selectPartsManagementOnly
+} from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import useAlertsNotifications from "../../hooks/useAlertsNotifications.jsx";
 import { selectDarkMode } from "../../redux/application/application.selectors.js";
@@ -109,10 +114,11 @@ const mapStateToProps = createStructuredSelector({
   conflict: selectInstanceConflict,
   bodyshop: selectBodyshop,
   partsManagementOnly: selectPartsManagementOnly,
-  isDarkMode: selectDarkMode
+  isDarkMode: selectDarkMode,
+  currentUser: selectCurrentUser
 });
 
-export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode }) {
+export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode, currentUser }) {
   const { t } = useTranslation();
   const [chatVisible] = useState(false);
   const didMount = useRef(false);
@@ -588,7 +594,7 @@ export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode })
 
   return (
     <>
-      <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
+      <ChatAffixContainer bodyshop={bodyshop} currentUser={currentUser} chatVisible={chatVisible} />
       <Layout style={{ minHeight: "100vh" }} className="layout-container">
         <UpdateAlert />
         <HeaderContainer />

client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx

@@ -97,7 +97,7 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/redux/media/media.reducer.js

@@ -19,29 +19,19 @@ const mediaReducer = (state = INITIAL_STATE, action) => {
     case MediaActionTypes.TOGGLE_MEDIA_SELECTED:
       return {
         ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          if (p.filename === action.payload.filename) {
-            p.isSelected = !p.isSelected;
-          }
-          return p;
-        })
+        [action.payload.jobid]: state[action.payload.jobid].map((p) =>
+          p.filename === action.payload.filename ? { ...p, isSelected: !p.isSelected } : p
+        )
       };
     case MediaActionTypes.SELECT_ALL_MEDIA_FOR_JOB:
       return {
         ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          p.isSelected = true;
-
-          return p;
-        })
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: true }))
       };
     case MediaActionTypes.DESELECT_ALL_MEDIA_FOR_JOB:
       return {
         ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          p.isSelected = false;
-          return p;
-        })
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: false }))
       };
     default:
       return state;

client/src/redux/media/media.sagas.js

@@ -17,9 +17,10 @@ export function* getJobMedia({ payload: jobid }) {
       const imagesFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/jobs/list`,
         {
-          jobid
+          jobid,
+
         },
-        { headers: { ims_token: bodyshop.localmediatoken } }
+        { headers: { ims_token: bodyshop.localmediatoken, bodyshopid: bodyshop.id } }
       );
       const documentsFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/bills/list`,

client/src/redux/media/media.selectors.js

@@ -2,4 +2,5 @@ import { createSelector } from "reselect";
 
 const selectMedia = (state) => state.media;
 
-export const selectAllMedia = createSelector([selectMedia], (media) => media);
+// Return a shallow copy to avoid identity selector warning and allow memoization to detect actual changes.
+export const selectAllMedia = createSelector([selectMedia], (media) => ({ ...media }));

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

@@ -49,7 +49,7 @@ import {
   validatePasswordResetSuccess
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import * as amplitude from '@amplitude/analytics-browser';
+//import * as amplitude from '@amplitude/analytics-browser';
 import posthog from 'posthog-js';
 
 const fpPromise = FingerprintJS.load();
@@ -92,7 +92,7 @@ export function* isUserAuthenticated() {
     }
 
     LogRocket.identify(user.email);
-    amplitude.setUserId(user.email);
+    //amplitude.setUserId(user.email);
     posthog.identify(user.email);
 
     const eulaQuery = yield client.query({
@@ -139,7 +139,7 @@ export function* signOutStart() {
         imexshopid: state.user.bodyshop.imexshopid,
         type: "messaging"
       });
-      amplitude.reset();
+      //amplitude.reset();
     } catch {
       console.log("No FCM token. Skipping unsubscribe.");
     }
@@ -365,7 +365,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
-      amplitude.setGroup('Shop', payload.shopname);
+      //amplitude.setGroup('Shop', payload.shopname);
       window.$crisp.push(["set", "user:company", [payload.shopname]]);
       if (authRecord[0] && authRecord[0].user.validemail) {
         window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);