Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2776-cdk-fortellis

2025-11-13 14:27:43 -08:00
parent a16c680d04 6b41d6f2a2
commit a8dcc542cc
69 changed files with 2816 additions and 2163 deletions
--- a/.platform-disabled/hooks/predeploy/01-install-dd.sh
+++ b/.platform-disabled/hooks/predeploy/01-install-dd.sh
--- a/_reference/partsManagement/PATCH_parts-management-job-status.md
+++ b/_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.
+
--- a/_reference/partsManagement/PATCH_parts-management-provision.md
+++ b/_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.
+
--- a/server/integrations/partsManagement/swagger.yaml
+++ b/server/integrations/partsManagement/swagger.yaml
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/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",
--- a/client/src/App/App.container.jsx
+++ b/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));
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/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`,
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -39,10 +39,17 @@ 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: (
+          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}${
@@ -58,11 +65,6 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
        {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
      </span>
    </div>
-          )
-        }))
-      ]}
-      {...restProps}
-    ></Select>
  );
-};
+}
 export default forwardRef(BillLineSearchSelect);
--- a/client/src/components/chat-media-selector/chat-media-selector.component.jsx
+++ b/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}>
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -1,17 +1,17 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
-import { cloneDeep } 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,122 +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(() => {
-    const persisted = bodyshop.associations[0].user.dashboardlayout;
-    // Normalize persisted structure to avoid malformed shapes that can cause recursive layout recalculations
-    if (persisted) {
-      return {
-        items: Array.isArray(persisted.items) ? persisted.items : [],
-        layout: Array.isArray(persisted.layout) ? persisted.layout : [],
-        layouts: typeof persisted.layouts === "object" && !Array.isArray(persisted.layouts) ? persisted.layouts : {},
-        cols: persisted.cols
-      };
-    }
-    return { items: [], layout: [], layouts: {}, cols: 12 };
-  });
  const notification = useNotification();

-  // 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]);
+  // 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 };

-  const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
+  // 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) => {
-    try {
-      logImEXEvent("dashboard_change_layout");
-
-      setState((prev) => ({ ...prev, layout, layouts }));
-
-      const result = await updateLayout({
-        variables: {
-          email: currentUser.email,
-          layout: { ...state, layout, layouts }
+  // 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]);
+
+  const [state, setState] = useState(initialState);
+
+  // 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 }
      });

-      if (result?.errors && result.errors.length) {
-        const errorMessages = result.errors.map((e) => e?.message || String(e));
+      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;
      }
+
+      return true;
    } catch (err) {
-      // Catch any unexpected errors (including potential cyclic JSON issues) so the promise never rejects unhandled
-      console.error("Dashboard layout update failed", err);
+      console.error(`Dashboard ${errorContext} failed`, err);
      notification.error({
        message: t("dashboard.errors.updatinglayout", {
          message: err?.message || String(err)
        })
      });
+      return false;
    }
  };

-  const handleRemoveComponent = (key) => {
-    logImEXEvent("dashboard_remove_component", { name: key });
-    const idxToRemove = state.items.findIndex((i) => i.i === 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 items = cloneDeep(state.items);
+  const {
+    loading: dashboardLoading,
+    error: dashboardError,
+    data: dashboardQueryData,
+    refetch
+  } = useQuery(dashboardQueryDoc, {
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only"
+  });

-    items.splice(idxToRemove, 1);
-    setState({ ...state, items });
+  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 handleAddComponent = (e) => {
-    // Avoid passing the full AntD menu click event (contains circular refs) to analytics
-    logImEXEvent("dashboard_add_component", { key: e.key });
-    const compSpec = componentList[e.key] || {};
-    const minW = compSpec.minW || 1;
-    const minH = compSpec.minH || 1;
-    const baseW = compSpec.w || 2;
-    const baseH = compSpec.h || 2;
-    setState((prev) => {
+  const handleRemoveComponent = async (key) => {
+    logImEXEvent("dashboard_remove_component", { name: key });
+    const updatedState = { ...state, items: state.items.filter((item) => item.i !== key) };
+    setState(updatedState);
+    await updateLayoutAndCache(updatedState, "component removal");
+  };
+
+  const handleAddComponent = async ({ key }) => {
+    logImEXEvent("dashboard_add_component", { key });
+    const { minW = 1, minH = 1, w: baseW = 2, h: baseH = 2 } = componentList[key] || {};
    const nextItems = [
-        ...prev.items,
+      ...state.items,
      {
-          i: e.key,
-          // Position near bottom: use a large y so RGL places it last without triggering cascading relayout loops
-          x: (prev.items.length * 2) % (prev.cols || 12),
-          y: 1000,
+        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)
      }
    ];
-      return { ...prev, items: nextItems };
-    });
+    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
@@ -157,22 +208,19 @@ 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 }}
+        breakpoints={GRID_BREAKPOINTS}
+        cols={GRID_COLS}
        layouts={state.layouts}
        onLayoutChange={handleLayoutChange}
      >
        {state.items.map((item) => {
-          const spec = componentList[item.i] || {};
-          const TheComponent = spec.component;
-          const minW = spec.minW || 1;
-          const minH = spec.minH || 1;
-          // Ensure current width/height respect minimums to avoid react-grid-layout prop warnings
+          const { component: TheComponent, minW = 1, minH = 1, w: specW, h: specH } = componentList[item.i] || {};
          const safeItem = {
            ...item,
-            w: Math.max(item.w || spec.w || minW, minW),
-            h: Math.max(item.h || spec.h || minH, minH)
+            w: Math.max(item.w || specW || minW, minW),
+            h: Math.max(item.h || specH || minH, minH)
          };
+
          return (
            <div
              key={safeItem.i}
--- a/client/src/components/email-documents/email-documents.component.jsx
+++ b/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"
            />
          )}
        </>
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -97,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
          }
        : {})
    }
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/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)}
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx
+++ b/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) {
+    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>
  );
 }
--- a/client/src/components/jobs-documents-local-gallery/local-media-grid.component.jsx
+++ b/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;
--- a/client/src/graphql/bodyshop.queries.js
+++ b/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
+    }
+  }
+`;
--- a/client/src/graphql/jobs.queries.js
+++ b/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
    }
  }
 `;
--- a/client/src/graphql/user.queries.js
+++ b/client/src/graphql/user.queries.js
@@ -135,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
+    }
+  }
+`;
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/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 } : {})
        }
--- a/client/src/redux/media/media.reducer.js
+++ b/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;
--- a/client/src/redux/media/media.sagas.js
+++ b/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`,
--- a/client/src/redux/media/media.selectors.js
+++ b/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 }));
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1678,6 +1678,7 @@
        "actual_delivery": "Actual Delivery",
        "actual_in": "Actual In",
        "acv_amount": "ACV Amount",
+        "admin_clerk": "Admin Clerk",
        "adjustment_bottom_line": "Adjustments",
        "adjustmenthours": "Adjustment Hours",
        "alt_transport": "Alt. Trans.",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1679,6 +1679,7 @@
        "actual_in": "Real en",
        "acv_amount": "",
        "adjustment_bottom_line": "Ajustes",
+        "admin_clerk": "",
        "adjustmenthours": "",
        "alt_transport": "",
        "area_of_damage_impact": {
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1678,6 +1678,7 @@
        "actual_delivery": "Livraison réelle",
        "actual_in": "En réel",
        "acv_amount": "",
+        "admin_clerk": "",
        "adjustment_bottom_line": "Ajustements",
        "adjustmenthours": "",
        "alt_transport": "",
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -15,10 +15,9 @@ export const EmailSettings = {

 export const TemplateList = (type, context) => {
  //const { bodyshop } = store.getState().user;
-  return {
-    //If there's no type or the type is job, send it back.
-    ...(!type || type === "job"
-      ? {
+
+  const casl = InstanceRenderManager({
+    imex: {
      casl_authorization: {
        title: i18n.t("printcenter.jobs.casl_authorization"),
        description: "",
@@ -29,7 +28,16 @@ export const TemplateList = (type, context) => {
        regions: {
          CA: true
        }
+      }
    },
+    rome: {}
+  });
+
+  return {
+    //If there's no type or the type is job, send it back.
+    ...(!type || type === "job"
+      ? {
+          ...casl,
          fippa_authorization: {
            title: i18n.t("printcenter.jobs.fippa_authorization"),
            description: "",
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3615,6 +3615,7 @@
          - adj_strdis
          - adj_towdis
          - adjustment_bottom_line
+          - admin_clerk
          - agt_addr1
          - agt_addr2
          - agt_city
@@ -3890,6 +3891,7 @@
          - adj_strdis
          - adj_towdis
          - adjustment_bottom_line
+          - admin_clerk
          - agt_addr1
          - agt_addr2
          - agt_city
@@ -4178,6 +4180,7 @@
          - adj_strdis
          - adj_towdis
          - adjustment_bottom_line
+          - admin_clerk
          - agt_addr1
          - agt_addr2
          - agt_city
@@ -4705,6 +4708,34 @@
          - key
          - value
        filter: {}
+- table:
+    name: media_analytics
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+  array_relationships:
+    - name: media_analytics_details
+      using:
+        foreign_key_constraint_on:
+          column: media_analytics_id
+          table:
+            name: media_analytics_detail
+            schema: public
+- table:
+    name: media_analytics_detail
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+    - name: job
+      using:
+        foreign_key_constraint_on: jobid
+    - name: media_analytic
+      using:
+        foreign_key_constraint_on: media_analytics_id
 - table:
    name: messages
    schema: public
--- a/hasura/migrations/1762378985244_create_table_public_media_analytics/down.sql
+++ b/hasura/migrations/1762378985244_create_table_public_media_analytics/down.sql
@@ -0,0 +1 @@
+DROP TABLE "public"."media_analytics";
--- a/hasura/migrations/1762378985244_create_table_public_media_analytics/up.sql
+++ b/hasura/migrations/1762378985244_create_table_public_media_analytics/up.sql
@@ -0,0 +1,18 @@
+CREATE TABLE "public"."media_analytics" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "bodyshopid" uuid NOT NULL, "total_jobs" integer NOT NULL DEFAULT 0, "total_documents" integer NOT NULL DEFAULT 0, "file_type_stats" jsonb NOT NULL DEFAULT jsonb_build_object(), PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict);COMMENT ON TABLE "public"."media_analytics" IS E'LMS Media Analytics';
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_media_analytics_updated_at"
+BEFORE UPDATE ON "public"."media_analytics"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_media_analytics_updated_at" ON "public"."media_analytics"
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- a/hasura/migrations/1762380389542_create_table_public_media_analytics_detail/down.sql
+++ b/hasura/migrations/1762380389542_create_table_public_media_analytics_detail/down.sql
@@ -0,0 +1 @@
+DROP TABLE "public"."media_analytics_detail";
--- a/hasura/migrations/1762380389542_create_table_public_media_analytics_detail/up.sql
+++ b/hasura/migrations/1762380389542_create_table_public_media_analytics_detail/up.sql
@@ -0,0 +1,2 @@
+CREATE TABLE "public"."media_analytics_detail" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "media_analytics_id" uuid NOT NULL, "jobid" uuid NOT NULL, "bodyshopid" uuid NOT NULL, "document_count" integer NOT NULL, "total_size_bytes" integer NOT NULL, "file_type_stats" jsonb NOT NULL DEFAULT jsonb_build_object(), PRIMARY KEY ("id") , FOREIGN KEY ("media_analytics_id") REFERENCES "public"."media_analytics"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict);
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- a/hasura/migrations/1762393769918_alter_table_public_jobs_add_column_admin_clerk/down.sql
+++ b/hasura/migrations/1762393769918_alter_table_public_jobs_add_column_admin_clerk/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "admin_clerk" text
+--  null;
--- a/hasura/migrations/1762393769918_alter_table_public_jobs_add_column_admin_clerk/up.sql
+++ b/hasura/migrations/1762393769918_alter_table_public_jobs_add_column_admin_clerk/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "admin_clerk" text
+ null;
--- a/hasura/migrations/1762461945311_alter_table_public_media_analytics_add_column_total_size_bytes/down.sql
+++ b/hasura/migrations/1762461945311_alter_table_public_media_analytics_add_column_total_size_bytes/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "total_size_bytes" integer
+--  null;
--- a/hasura/migrations/1762461945311_alter_table_public_media_analytics_add_column_total_size_bytes/up.sql
+++ b/hasura/migrations/1762461945311_alter_table_public_media_analytics_add_column_total_size_bytes/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "total_size_bytes" integer
+ null;
--- a/hasura/migrations/1762461962953_alter_table_public_media_analytics_add_column_total_size_mb/down.sql
+++ b/hasura/migrations/1762461962953_alter_table_public_media_analytics_add_column_total_size_mb/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "total_size_mb" numeric
+--  null;
--- a/hasura/migrations/1762461962953_alter_table_public_media_analytics_add_column_total_size_mb/up.sql
+++ b/hasura/migrations/1762461962953_alter_table_public_media_analytics_add_column_total_size_mb/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "total_size_mb" numeric
+ null;
--- a/hasura/migrations/1762464155142_alter_table_public_media_analytics_detail_add_column_total_size_mb/down.sql
+++ b/hasura/migrations/1762464155142_alter_table_public_media_analytics_detail_add_column_total_size_mb/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics_detail" add column "total_size_mb" numeric
+--  null;
--- a/hasura/migrations/1762464155142_alter_table_public_media_analytics_detail_add_column_total_size_mb/up.sql
+++ b/hasura/migrations/1762464155142_alter_table_public_media_analytics_detail_add_column_total_size_mb/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."media_analytics_detail" add column "total_size_mb" numeric
+ null;
--- a/hasura/migrations/1762464955745_alter_table_public_media_analytics_detail_alter_column_jobid/down.sql
+++ b/hasura/migrations/1762464955745_alter_table_public_media_analytics_detail_alter_column_jobid/down.sql
@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" alter column "jobid" set not null;
--- a/hasura/migrations/1762464955745_alter_table_public_media_analytics_detail_alter_column_jobid/up.sql
+++ b/hasura/migrations/1762464955745_alter_table_public_media_analytics_detail_alter_column_jobid/up.sql
@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" alter column "jobid" drop not null;
--- a/hasura/migrations/1762546299465_alter_table_public_media_analytics_alter_column_total_size_bytes/down.sql
+++ b/hasura/migrations/1762546299465_alter_table_public_media_analytics_alter_column_total_size_bytes/down.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics" ALTER COLUMN "total_size_bytes" TYPE integer;
--- a/hasura/migrations/1762546299465_alter_table_public_media_analytics_alter_column_total_size_bytes/up.sql
+++ b/hasura/migrations/1762546299465_alter_table_public_media_analytics_alter_column_total_size_bytes/up.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics" ALTER COLUMN "total_size_bytes" TYPE numeric;
--- a/hasura/migrations/1762546323722_alter_table_public_media_analytics_detail_alter_column_total_size_bytes/down.sql
+++ b/hasura/migrations/1762546323722_alter_table_public_media_analytics_detail_alter_column_total_size_bytes/down.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics_detail" ALTER COLUMN "total_size_bytes" TYPE integer;
--- a/hasura/migrations/1762546323722_alter_table_public_media_analytics_detail_alter_column_total_size_bytes/up.sql
+++ b/hasura/migrations/1762546323722_alter_table_public_media_analytics_detail_alter_column_total_size_bytes/up.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."media_analytics_detail" ALTER COLUMN "total_size_bytes" TYPE numeric;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -18,41 +18,40 @@
    "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
  },
  "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.882.0",
-    "@aws-sdk/client-elasticache": "^3.882.0",
-    "@aws-sdk/client-s3": "^3.882.0",
-    "@aws-sdk/client-secrets-manager": "^3.882.0",
-    "@aws-sdk/client-ses": "^3.882.0",
-    "@aws-sdk/credential-provider-node": "^3.882.0",
-    "@aws-sdk/lib-storage": "^3.882.0",
-    "@aws-sdk/s3-request-presigner": "^3.882.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.901.0",
+    "@aws-sdk/client-elasticache": "^3.901.0",
+    "@aws-sdk/client-s3": "^3.901.0",
+    "@aws-sdk/client-secrets-manager": "^3.901.0",
+    "@aws-sdk/client-ses": "^3.901.0",
+    "@aws-sdk/credential-provider-node": "^3.901.0",
+    "@aws-sdk/lib-storage": "^3.903.0",
+    "@aws-sdk/s3-request-presigner": "^3.901.0",
    "@opensearch-project/opensearch": "^2.13.0",
    "@socket.io/admin-ui": "^0.5.1",
    "@socket.io/redis-adapter": "^8.3.0",
    "archiver": "^7.0.1",
    "aws4": "^1.13.2",
-    "axios": "^1.11.0",
+    "axios": "^1.12.2",
    "axios-curlirize": "^2.0.0",
    "better-queue": "^3.8.12",
-    "bullmq": "^5.58.5",
+    "bullmq": "^5.61.0",
    "chart.js": "^4.5.0",
    "cloudinary": "^2.7.0",
    "compression": "^1.8.1",
    "cookie-parser": "^1.4.7",
    "cors": "^2.8.5",
    "crisp-status-reporter": "^1.2.2",
-    "dd-trace": "^5.65.0",
    "dinero.js": "^1.9.1",
-    "dotenv": "^17.2.2",
+    "dotenv": "^17.2.3",
    "express": "^4.21.1",
    "firebase-admin": "^13.5.0",
    "graphql": "^16.11.0",
    "graphql-request": "^6.1.0",
    "intuit-oauth": "^4.2.0",
-    "ioredis": "^5.7.0",
+    "ioredis": "^5.8.1",
    "json-2-csv": "^5.5.9",
    "jsonwebtoken": "^9.0.2",
-    "juice": "^11.0.1",
+    "juice": "^11.0.3",
    "lodash": "^4.17.21",
    "moment": "^2.30.1",
    "moment-timezone": "^0.6.0",
@@ -63,22 +62,22 @@
    "query-string": "7.1.3",
    "recursive-diff": "^1.0.9",
    "rimraf": "^6.0.1",
-    "skia-canvas": "^3.0.6",
-    "soap": "^1.3.0",
+    "skia-canvas": "^3.0.8",
+    "soap": "^1.5.0",
    "socket.io": "^4.8.1",
    "socket.io-adapter": "^2.5.5",
    "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.9.0",
+    "twilio": "^5.10.2",
    "uuid": "^11.1.0",
-    "winston": "^3.17.0",
+    "winston": "^3.18.3",
    "winston-cloudwatch": "^6.3.0",
    "xml2js": "^0.6.2",
    "xmlbuilder2": "^3.1.1",
    "yazl": "^3.3.1"
  },
  "devDependencies": {
-    "@eslint/js": "^9.35.0",
-    "eslint": "^9.35.0",
+    "@eslint/js": "^9.37.0",
+    "eslint": "^9.37.0",
    "eslint-plugin-react": "^7.37.5",
    "globals": "^15.15.0",
    "mock-require": "^3.0.3",
--- a/server.js
+++ b/server.js
@@ -4,14 +4,14 @@ require("dotenv").config({
  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
 });

-// Commented out due to stability issues
-if (process.env.NODE_ENV) {
-  require("dd-trace").init({
-    profiling: true,
-    env: process.env.NODE_ENV,
-    service: "bodyshop-api"
-  });
-}
+// DATADOG TRACE Implemention (Uncomment to enable tracing, requires dd-trace package)
+// if (process.env.NODE_ENV) {
+//   require("dd-trace").init({
+//     profiling: true,
+//     env: process.env.NODE_ENV,
+//     service: "bodyshop-api"
+//   });
+// }

 const cors = require("cors");
 const http = require("http");
--- a/server/accounting/qb-receivables-lines.js
+++ b/server/accounting/qb-receivables-lines.js
@@ -919,16 +919,16 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
          FullName: responsibilityCenters.ttl_tax_adjustment?.accountitem
        },
        Desc: "Tax Adjustment",
-        Quantity: 1,
+        //Quantity: 1,
        Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_tax_adjustment).toFormat(DineroQbFormat),
-        SalesTaxCodeRef: InstanceManager({
-          imex: {
-            FullName: "E"
-          },
-          rome: {
-            FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
-          }
-        })
+        // SalesTaxCodeRef: InstanceManager({
+        //   imex: {
+        //     FullName: "E"
+        //   },
+        //   rome: {
+        //     FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
+        //   }
+        // })
      });
    }
  }
--- a/server/data/analytics/documents.js
+++ b/server/data/analytics/documents.js
@@ -0,0 +1,37 @@
+const logger = require("../../utils/logger");
+const { client } = require('../../graphql-client/graphql-client');
+const { INSERT_MEDIA_ANALYTICS, GET_BODYSHOP_BY_ID } = require("../../graphql-client/queries");
+
+const documentAnalytics = async (req, res) => {
+    try {
+        const { data } = req.body;
+
+        //Check if the bodyshopid is real as a "security" measure
+        if (!data.bodyshopid) {
+            throw new Error("No bodyshopid provided in data");
+        }
+
+        const { bodyshops_by_pk } = await client.request(GET_BODYSHOP_BY_ID, {
+            id: data.bodyshopid
+        });
+
+        if (!bodyshops_by_pk) {
+            throw new Error("Invalid bodyshopid provided in data");
+        }
+
+        await client.request(INSERT_MEDIA_ANALYTICS, {
+            mediaObject: data
+        });
+
+        res.json({ status: "success" })
+    } catch (error) {
+        logger.log("document-analytics-error", "ERROR", req?.user?.email, null, {
+            error: error.message,
+            stack: error.stack
+        });
+        res.status(500).json({ error: error.message, stack: error.stack });
+    }
+};
+
+
+exports.default = documentAnalytics;
--- a/server/data/carfax-rps.js
+++ b/server/data/carfax-rps.js
@@ -277,6 +277,7 @@ const GenerateDetailLines = (line) => {
    line_desc: line.line_desc ? line.line_desc.replace(NON_ASCII_REGEX, "") : null,
    oem_partno: line.oem_partno ? line.oem_partno.replace(NON_ASCII_REGEX, "") : null,
    alt_partno: line.alt_partno ? line.alt_partno.replace(NON_ASCII_REGEX, "") : null,
+    op_code: line.lbr_op || null,
    op_code_desc: generateOpCodeDescription(line.lbr_op),
    lbr_ty: generateLaborType(line.mod_lbr_ty),
    lbr_hrs: line.mod_lb_hrs || 0,
--- a/server/data/carfax.js
+++ b/server/data/carfax.js
@@ -336,6 +336,7 @@ const GenerateDetailLines = (line) => {
    line_desc: line.line_desc ? line.line_desc.replace(NON_ASCII_REGEX, "") : null,
    oem_partno: line.oem_partno ? line.oem_partno.replace(NON_ASCII_REGEX, "") : null,
    alt_partno: line.alt_partno ? line.alt_partno.replace(NON_ASCII_REGEX, "") : null,
+    op_code: line.lbr_op || null,
    op_code_desc: line.op_code_desc ? line.op_code_desc.replace(NON_ASCII_REGEX, "") : null,
    lbr_ty: generateLaborType(line.mod_lbr_ty),
    lbr_hrs: line.mod_lb_hrs || 0,
--- a/server/data/data.js
+++ b/server/data/data.js
@@ -9,3 +9,4 @@ exports.emsUpload = require("./emsUpload").default;
 exports.carfax = require("./carfax").default;
 exports.carfaxRps = require("./carfax-rps").default;
 exports.vehicletype = require("./vehicletype/vehicletype").default;
+exports.documentAnalytics = require("./analytics/documents").default;
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -47,11 +47,6 @@ const logEmail = async (req, email) => {
 const sendServerEmail = async ({ subject, text, to = [] }) => {
  if (process.env.NODE_ENV === undefined) return;

-  let sentTo = ["support@imexsystems.ca"];
-  if (to?.length) {
-    sentTo = [...sentTo, ...to];
-  }
-
  try {
    mailer.sendMail(
      {
@@ -59,7 +54,7 @@ const sendServerEmail = async ({ subject, text, to = [] }) => {
          imex: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
          rome: `Rome Online API - ${process.env.NODE_ENV} <noreply@romeonline.io>`
        }),
-        to: sentTo,
+        to: ["support@imexsystems.ca", ...to],
        subject: subject,
        text: text,
        ses: {
--- a/server/graphql-client/graphql-client.js
+++ b/server/graphql-client/graphql-client.js
@@ -1,5 +1,3 @@
-const logger = require("../utils/logger");
-
 const GraphQLClient = require("graphql-request").GraphQLClient;

 //New bug introduced with Graphql Request.
@@ -14,17 +12,18 @@ const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
 });

 const rpsClient =
-  process.env.RPS_GRAPHQL_ENDPOINT && process.env.RPS_HASURA_ADMIN_SECRET ?
-    new GraphQLClient(process.env.RPS_GRAPHQL_ENDPOINT, {
+  process.env.RPS_GRAPHQL_ENDPOINT && process.env.RPS_HASURA_ADMIN_SECRET
+    ? new GraphQLClient(process.env.RPS_GRAPHQL_ENDPOINT, {
        headers: {
          "x-hasura-admin-secret": process.env.RPS_HASURA_ADMIN_SECRET
        }
-    }) : null;
+      })
+    : null;

 if (!rpsClient) {
  //System log to disable RPS functions
-  logger.log(`RPS secrets are not set. Client is not configured.`, "WARN", "redis", "api", {
-  });
+
+  console.log(`RPS secrets are not set. Client is not configured.`, "WARN", "redis", "api", {});
 }

 const unauthorizedClient = new GraphQLClient(process.env.GRAPHQL_ENDPOINT);
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -904,6 +904,7 @@ exports.CARFAX_QUERY = `query CARFAX_EXPORT($start: timestamptz, $bodyshopid: uu
      line_desc
      mod_lb_hrs
      mod_lbr_ty
+      lbr_op
      oem_partno
      op_code_desc
      part_type
@@ -2901,6 +2902,7 @@ exports.GET_BODYSHOP_BY_ID = `
      intellipay_config
      state
      notification_followers
+      timezone
    }
  }
 `;
@@ -2992,6 +2994,7 @@ query GET_JOBID_BY_MERCHANTID_RONUMBER($merchantID: String!, $roNumber: String!)
      id
      intellipay_config
      email
+      timezone
    }
  }
 }`;
@@ -3001,6 +3004,7 @@ query GET_BODYSHOP_BY_MERCHANTID($merchantID: String!) {
  bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) {
    id
    email
+    timezone
  }
 }`;

@@ -3147,3 +3151,12 @@ exports.DELETE_PHONE_NUMBER_OPT_OUT = `
    }
  }
 `;
+
+
+exports.INSERT_MEDIA_ANALYTICS = `
+mutation INSERT_MEDIA_ANALYTICS($mediaObject: media_analytics_insert_input!) {
+  insert_media_analytics_one(object: $mediaObject) {
+    id
+  }
+}
+`
--- a/server/integrations/partsManagement/endpoints/partsManagementProvisioning.js
+++ b/server/integrations/partsManagement/endpoints/partsManagementProvisioning.js
@@ -7,7 +7,8 @@ const {
  CREATE_SHOP,
  DELETE_VENDORS_BY_SHOP,
  DELETE_SHOP,
-  CREATE_USER
+  CREATE_USER,
+  UPDATE_BODYSHOP_BY_ID
 } = require("../partsManagement.queries");

 /**
@@ -131,6 +132,61 @@ const insertUserAssociation = async (uid, email, shopId) => {
  return resp.insert_users_one;
 };

+/**
+ * PATCH handler for updating bodyshop fields.
+ * Allows patching: shopname, address1, address2, city, state, zip_post, country, email, timezone, phone, logo_img_path
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+const patchPartsManagementProvisioning = async (req, res) => {
+  const { id } = req.params;
+  const allowedFields = [
+    "shopname",
+    "address1",
+    "address2",
+    "city",
+    "state",
+    "zip_post",
+    "country",
+    "email",
+    "timezone",
+    "phone",
+    "logo_img_path"
+  ];
+  const updateFields = {};
+  for (const field of allowedFields) {
+    if (req.body[field] !== undefined) {
+      updateFields[field] = req.body[field];
+    }
+  }
+  if (Object.keys(updateFields).length === 0) {
+    return res.status(400).json({ error: "No valid fields provided for update." });
+  }
+  // Check that the bodyshop has an external_shop_id before allowing patch
+  try {
+    // Fetch the bodyshop by id
+    const shopResp = await client.request(
+      `query GetBodyshop($id: uuid!) { bodyshops_by_pk(id: $id) { id external_shop_id } }`,
+      { id }
+    );
+    if (!shopResp.bodyshops_by_pk?.external_shop_id) {
+      return res.status(400).json({ error: "Cannot patch: bodyshop does not have an external_shop_id." });
+    }
+  } catch (err) {
+    return res.status(500).json({ error: "Failed to validate bodyshop external_shop_id.", detail: err });
+  }
+  try {
+    const resp = await client.request(UPDATE_BODYSHOP_BY_ID, { id, fields: updateFields });
+    if (!resp.update_bodyshops_by_pk) {
+      return res.status(404).json({ error: "Bodyshop not found." });
+    }
+    return res.json(resp.update_bodyshops_by_pk);
+  } catch (err) {
+    return res.status(500).json({ error: "Failed to update bodyshop.", detail: err });
+  }
+};
+
 /**
 * Handles provisioning a new shop for parts management.
 * @param req
@@ -259,4 +315,4 @@ const partsManagementProvisioning = async (req, res) => {
  }
 };

-module.exports = partsManagementProvisioning;
+module.exports = { partsManagementProvisioning, patchPartsManagementProvisioning };
--- a/server/integrations/partsManagement/partsManagement.queries.js
+++ b/server/integrations/partsManagement/partsManagement.queries.js
@@ -298,6 +298,25 @@ const UPDATE_JOBLINE_BY_PK = `
  }
 `;

+const UPDATE_BODYSHOP_BY_ID = `
+  mutation UpdateBodyshopById($id: uuid!, $fields: bodyshops_set_input!) {
+    update_bodyshops_by_pk(pk_columns: { id: $id }, _set: $fields) {
+      id
+      shopname
+      address1
+      address2
+      city
+      state
+      zip_post
+      country
+      email
+      timezone
+      phone
+      logo_img_path
+    }
+  }
+`;
+
 module.exports = {
  GET_BODYSHOP_STATUS,
  GET_VEHICLE_BY_SHOP_VIN,
@@ -329,5 +348,6 @@ module.exports = {
  DELETE_PARTS_ORDERS_BY_JOB_IDS,
  UPSERT_JOBLINES,
  GET_JOBLINE_IDS_BY_JOBID_UNQSEQ,
-  UPDATE_JOBLINE_BY_PK
+  UPDATE_JOBLINE_BY_PK,
+  UPDATE_BODYSHOP_BY_ID
 };
--- a/server/intellipay/lib/handleCommentBasedPayment.js
+++ b/server/intellipay/lib/handleCommentBasedPayment.js
@@ -48,7 +48,9 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta
      payer: "Customer",
      type: getPaymentType(ipMapping, values.cardtype),
      jobid: p.jobid,
-      date: moment(Date.now()),
+      date: moment()
+        .tz(bodyshop?.bodyshops_by_pk?.timezone ?? "UTC")
+        .format("YYYY-MM-DD"),
      payment_responses: {
        data: {
          amount: values.total,
--- a/server/intellipay/lib/handleInvoiceBasedPayment.js
+++ b/server/intellipay/lib/handleInvoiceBasedPayment.js
@@ -97,7 +97,9 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => {
      payer: "Customer",
      type: getPaymentType(ipMapping, values.cardtype),
      jobid: job.id,
-      date: moment(Date.now())
+      date: moment()
+        .tz(bodyshop?.timezone ?? "UTC")
+        .format("YYYY-MM-DD")
    }
  });

--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -405,7 +405,7 @@ function GenerateCostingData(job) {
            ) {
              const discountRate =
                Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
-                  ? job.parts_tax_rates_rates[val.part_type.toUpperCase()].prt_discp
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp
                  : job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
              const disc = partsAmount.percentage(discountRate).multiply(-1);
              partsAmount = partsAmount.add(disc);
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -24,7 +24,7 @@ exports.totalsSsu = async function (req, res) {
  const BearerToken = req.BearerToken;
  const client = req.userGraphQLClient;

-  logger.log("job-totals-ssu-USA", "DEBUG", req?.user?.email, id);
+  logger.log("job-totals-ssu-USA", "debug", req?.user?.email, id);

  try {
    const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {

    res.status(200).send();
  } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
+    logger.log("job-totals-ssu-USA-error", "error", req?.user?.email, id, {
      jobid: id,
      error: error.message,
      stack: error.stack
@@ -95,7 +95,7 @@ async function TotalsServerSide(req, res) {
        ret.totals.subtotal = ret.totals.subtotal.add(ret.totals.ttl_adjustment);
        ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_adjustment);
        ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_adjustment);
-        logger.log("job-totals-USA-ttl-adj", "DEBUG", null, job.id, {
+        logger.log("job-totals-USA-ttl-adj", "debug", null, job.id, {
          adjAmount: ttlDifference
        });
      }
@@ -116,7 +116,7 @@ async function TotalsServerSide(req, res) {
        ret.totals.ttl_tax_adjustment = Dinero({ amount: Math.round(ttlTaxDifference * 100) });
        ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_tax_adjustment);
        ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_tax_adjustment);
-        logger.log("job-totals-USA-ttl-tax-adj", "DEBUG", null, job.id, {
+        logger.log("job-totals-USA-ttl-tax-adj", "debug", null, job.id, {
          adjAmount: ttlTaxDifference
        });
      }
@@ -124,7 +124,7 @@ async function TotalsServerSide(req, res) {

    return ret;
  } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req.user?.email, job.id, {
+    logger.log("job-totals-ssu-USA-error", "error", req.user?.email, job.id, {
      jobid: job.id,
      error: error.message,
      stack: error.stack
@@ -142,7 +142,7 @@ async function Totals(req, res) {
  const logger = req.logger;
  const client = req.userGraphQLClient;

-  logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, job.id, {
+  logger.log("job-totals-ssu-USA", "debug", req.user.email, job.id, {
    jobid: job.id,
    id: id
  });
@@ -159,7 +159,7 @@ async function Totals(req, res) {

    res.status(200).json(ret);
  } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-USA-error", "error", req.user.email, job.id, {
      jobid: job.id,
      error: error.message,
      stack: error.stack
@@ -240,7 +240,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
          job.joblines.push(newAtsLine);
        }
      } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
          jobid: job.id,
          error: error.message,
          stack: error.stack
@@ -258,7 +258,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
          job.joblines[atsLineIndex].act_price = atsAmount;
        }
      } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
          jobid: job.id,
          atsLineIndex: atsLineIndex,
          atsAmount: atsAmount,
@@ -381,7 +381,7 @@ async function CalculateRatesTotals({ job, client }) {

    if (item.mod_lbr_ty) {
      //Check to see if it has 0 hours and a price instead.
-      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
        //Scenario where SGI may pay out hours using a part price.
        if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
          ret[item.mod_lbr_ty.toLowerCase()].base = Dinero();
@@ -1055,7 +1055,7 @@ function CalculateTaxesTotals(job, otherTotals) {
        }
      }
    } catch (error) {
-      logger.log("job-totals-USA Key with issue", "error", null, job.id, {
+      logger.log("job-totals-USA Key with issue", "warn", null, job.id, {
        key: key,
        error: error.message,
        stack: error.stack
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -23,7 +23,7 @@ exports.totalsSsu = async function (req, res) {
  const BearerToken = req.BearerToken;
  const client = req.userGraphQLClient;

-  logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
+  logger.log("job-totals-ssu", "debug", req.user.email, id, null);

  try {
    const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {

    res.status(200).send();
  } catch (error) {
-    logger.log("job-totals-ssu-error", "ERROR", req.user.email, id, {
+    logger.log("job-totals-ssu-error", "error", req.user.email, id, {
      jobid: id,
      error: error.message,
      stack: error.stack
@@ -73,7 +73,7 @@ async function TotalsServerSide(req, res) {

    return ret;
  } catch (error) {
-    logger.log("job-totals-ssu-error", "ERROR", req?.user?.email, job.id, {
+    logger.log("job-totals-ssu-error", "error", req?.user?.email, job.id, {
      jobid: job.id,
      error: error.message,
      stack: error.stack
@@ -91,7 +91,7 @@ async function Totals(req, res) {
  const logger = req.logger;
  const client = req.userGraphQLClient;

-  logger.log("job-totals-ssu", "DEBUG", req.user.email, job.id, {
+  logger.log("job-totals-ssu", "debug", req.user.email, job.id, {
    jobid: job.id,
    id: id
  });
@@ -108,7 +108,7 @@ async function Totals(req, res) {

    res.status(200).json(ret);
  } catch (error) {
-    logger.log("job-totals-ssu-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-error", "error", req.user.email, job.id, {
      jobid: job.id,
      error: error.message,
      stack: error.stack
@@ -189,7 +189,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
          job.joblines.push(newAtsLine);
        }
      } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
          jobid: job.id,
          error: error.message,
          stack: error.stack
@@ -207,7 +207,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
          job.joblines[atsLineIndex].act_price = atsAmount;
        }
      } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
          jobid: job.id,
          atsLineIndex: atsLineIndex,
          atsAmount: atsAmount,
@@ -315,7 +315,7 @@ function CalculateRatesTotals(ratesList) {
    if (item.mod_lbr_ty) {
      //Check to see if it has 0 hours and a price instead.
      //Extend for when there are hours and a price.
-      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
        //Scenario where SGI may pay out hours using a part price.
        if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
          ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
--- a/server/job/patchJobStatus.js
+++ b/server/job/patchJobStatus.js
@@ -0,0 +1,40 @@
+const client = require("../graphql-client/graphql-client").client;
+const { UPDATE_JOB_BY_ID } = require("../integrations/partsManagement/partsManagement.queries");
+
+/**
+ * PATCH handler to update job status (parts management only)
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+module.exports = async (req, res) => {
+  const { id } = req.params;
+  const { status } = req.body;
+  if (!status) {
+    return res.status(400).json({ error: "Missing required field: status" });
+  }
+  try {
+    // Fetch job to get shopid
+    const jobResp = await client.request(`query GetJob($id: uuid!) { jobs_by_pk(id: $id) { id shopid } }`, { id });
+    const job = jobResp.jobs_by_pk;
+    if (!job) {
+      return res.status(404).json({ error: "Job not found" });
+    }
+    // Fetch bodyshop to check external_shop_id
+    const shopResp = await client.request(
+      `query GetBodyshop($id: uuid!) { bodyshops_by_pk(id: $id) { id external_shop_id } }`,
+      { id: job.shopid }
+    );
+    if (!shopResp.bodyshops_by_pk || !shopResp.bodyshops_by_pk.external_shop_id) {
+      return res.status(400).json({ error: "Cannot patch: parent bodyshop does not have an external_shop_id." });
+    }
+    // Update job status
+    const updateResp = await client.request(UPDATE_JOB_BY_ID, { id, job: { status } });
+    if (!updateResp.update_jobs_by_pk) {
+      return res.status(404).json({ error: "Job not found after update" });
+    }
+    return res.json(updateResp.update_jobs_by_pk);
+  } catch (err) {
+    return res.status(500).json({ error: "Failed to update job status.", detail: err });
+  }
+};
--- a/server/notifications/queues/appQueue.js
+++ b/server/notifications/queues/appQueue.js
@@ -92,7 +92,7 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
            "consolidate-notifications",
            { jobId, recipients },
            {
-              jobId: `consolidate:${jobId}`,
+              jobId: `consolidate-${jobId}`,
              delay: APP_CONSOLIDATION_DELAY,
              attempts: 3,
              backoff: LOCK_EXPIRATION
@@ -288,7 +288,7 @@ const dispatchAppsToQueue = async ({ appsToDispatch }) => {
    await appQueue.add(
      "add-notification",
      { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
-      { jobId: `${jobId}:${Date.now()}` }
+      { jobId: `${jobId}-${Date.now()}` }
    );
    devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
  }
--- a/server/notifications/queues/emailQueue.js
+++ b/server/notifications/queues/emailQueue.js
@@ -86,7 +86,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
            "consolidate-emails",
            { jobId, jobRoNumber, bodyShopName, bodyShopTimezone },
            {
-              jobId: `consolidate:${jobId}`,
+              jobId: `consolidate-${jobId}`,
              delay: EMAIL_CONSOLIDATION_DELAY,
              attempts: 3,
              backoff: LOCK_EXPIRATION
@@ -252,7 +252,7 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
    await emailAddQueue.add(
      "add-email-notification",
      { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients },
-      { jobId: `${jobId}:${Date.now()}` }
+      { jobId: `${jobId}-${Date.now()}` }
    );
    devDebugLogger(`Added email notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
  }
--- a/server/routes/intergrationRoutes.js
+++ b/server/routes/intergrationRoutes.js
@@ -19,11 +19,15 @@ if (typeof VSSTA_INTEGRATION_SECRET === "string" && VSSTA_INTEGRATION_SECRET.len
 if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_INTEGRATION_SECRET.length > 0) {
  const XML_BODY_LIMIT = "10mb"; // Set a limit for XML body size

-  const partsManagementProvisioning = require("../integrations/partsManagement/endpoints/partsManagementProvisioning");
+  const {
+    partsManagementProvisioning,
+    patchPartsManagementProvisioning
+  } = require("../integrations/partsManagement/endpoints/partsManagementProvisioning");
  const partsManagementDeprovisioning = require("../integrations/partsManagement/endpoints/partsManagementDeprovisioning");
  const partsManagementIntegrationMiddleware = require("../middleware/partsManagementIntegrationMiddleware");
  const partsManagementVehicleDamageEstimateAddRq = require("../integrations/partsManagement/endpoints/vehicleDamageEstimateAddRq");
  const partsManagementVehicleDamageEstimateChqRq = require("../integrations/partsManagement/endpoints/vehicleDamageEstimateChgRq");
+  const patchJobStatus = require("../job/patchJobStatus");

  /**
   * Route to handle Vehicle Damage Estimate Add Request
@@ -55,6 +59,20 @@ if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_
   * Route to handle Parts Management Provisioning
   */
  router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
+
+  /**
+   * PATCH route to update Parts Management Provisioning info
+   */
+  router.patch(
+    "/parts-management/provision/:id",
+    partsManagementIntegrationMiddleware,
+    patchPartsManagementProvisioning
+  );
+
+  /**
+   * PATCH route to update job status (parts management only)
+   */
+  router.patch("/parts-management/job/:id/status", partsManagementIntegrationMiddleware, patchJobStatus);
 } else {
  logger.logger.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
 }
--- a/server/routes/miscellaneousRoutes.js
+++ b/server/routes/miscellaneousRoutes.js
@@ -146,7 +146,7 @@ router.post("/bodyshop-cache", eventAuthorizationMiddleware, updateBodyshopCache

 // Estimate Scrubber Vehicle Type
 router.post("/es/vehicletype", data.vehicletype);
-
+router.post("/analytics/documents", data.documentAnalytics);
 // Health Check for docker-compose-cluster load balancer, only available in development
 if (process.env.NODE_ENV === "development") {
  router.get("/health", (req, res) => {
				`@@ -0,0 +1 @@`
				`DROP TABLE "public"."media_analytics_detail";`
				`@@ -0,0 +1 @@`
				`alter table "public"."media_analytics_detail" alter column "jobid" set not null;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE "public"."media_analytics" ALTER COLUMN "total_size_bytes" TYPE integer;`