Add updates to config files to fix formatting on VS Code for Patrick's machine.

2025-10-06 11:48:14 -07:00
121 changed files with 2428 additions and 3788 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,9 @@
 root = true

+# NOTE: Keep only EditorConfig properties that Prettier actually respects.
+# Style choices (quotes, bracket spacing, print width, etc.) live in `.prettierrc.js`.
+# Removing pseudo/unsupported keys (quote_type, bracketSpacing, max_line_length) that
+# previously caused editor vs CLI confusion.
 [*]
 charset = utf-8
 indent_style = space
@@ -7,14 +11,11 @@ indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = false
-quote_type = single
-max_line_length = 100
-bracketSpacing = false

 [*.md]
 trim_trailing_whitespace = false

-[*.yml]
+[*\.yml]
 indent_size = 2

 [*.json]
--- a/.platform-disabled/hooks/predeploy/01-install-dd.sh
+++ b/.platform-disabled/hooks/predeploy/01-install-dd.sh
--- a/.prettierignore
+++ b/.prettierignore
@@ -0,0 +1,11 @@
+# Folders & files to skip during formatting
+node_modules
+build
+dist
+dev-dist
+coverage
+logs
+*.log
+# Generated / compiled assets
+client/dev-dist
+client/dist
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -39,5 +39,13 @@
    "timetickets",
    "touchtime"
  ],
-  "eslint.workingDirectories": ["./", "./client"]
+  "eslint.workingDirectories": ["./", "./client"],
+  // Formatting alignment: ensure VS Code uses project Prettier config
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  // Disable eslint's fixAll on save if it causes style churn; turn back on once stylistic rules removed or using eslint-config-prettier
+  "prettier.useEditorConfig": true
 }
--- a/_reference/partsManagement/PATCH_parts-management-job-status.md
+++ b/_reference/partsManagement/PATCH_parts-management-job-status.md
@@ -1,61 +0,0 @@
-# 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
@@ -1,86 +0,0 @@
-# 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/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -5305,27 +5305,6 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
-                                            <concept_node>
-                                                <name>ro_posting</name>
-                                                <definition_loaded>false</definition_loaded>
-                                                <description></description>
-                                                <comment></comment>
-                                                <default_text></default_text>
-                                                <translations>
-                                                    <translation>
-                                                        <language>en-US</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>es-MX</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                    <translation>
-                                                        <language>fr-CA</language>
-                                                        <approved>false</approved>
-                                                    </translation>
-                                                </translations>
-                                            </concept_node>
                                            <concept_node>
                                                <name>sendmaterialscosting</name>
                                                <definition_loaded>false</definition_loaded>
--- 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.25.2",
+    "@amplitude/analytics-browser": "^2.23.5",
    "@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.3",
+    "@firebase/app": "^0.14.2",
    "@firebase/auth": "^1.10.8",
-    "@firebase/firestore": "^4.9.2",
+    "@firebase/firestore": "^4.9.1",
    "@firebase/messaging": "^0.12.22",
    "@jsreport/browser-client": "^3.1.0",
    "@reduxjs/toolkit": "^2.9.0",
-    "@sentry/cli": "^2.56.0",
+    "@sentry/cli": "^2.53.0",
    "@sentry/react": "^9.43.0",
    "@sentry/vite-plugin": "^4.3.0",
-    "@splitsoftware/splitio-react": "^2.5.0",
+    "@splitsoftware/splitio-react": "^2.3.1",
    "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.27.4",
+    "antd": "^5.27.3",
    "apollo-link-logger": "^2.0.1",
    "apollo-link-sentry": "^4.4.0",
    "autosize": "^6.0.1",
-    "axios": "^1.12.2",
+    "axios": "^1.11.0",
    "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.3",
+    "dotenv": "^17.2.2",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
    "graphql": "^16.11.0",
-    "i18next": "^25.5.3",
+    "i18next": "^25.5.2",
    "i18next-browser-languagedetector": "^8.2.0",
    "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.23",
-    "lightningcss": "^1.30.2",
+    "libphonenumber-js": "^1.12.15",
    "logrocket": "^9.0.2",
-    "markerjs2": "^2.32.7",
+    "markerjs2": "^2.32.6",
    "memoize-one": "^6.0.0",
-    "normalize-url": "^8.1.0",
+    "normalize-url": "^8.0.2",
    "object-hash": "^3.0.0",
    "phone": "^3.1.67",
-    "posthog-js": "^1.271.0",
+    "posthog-js": "^1.261.7",
    "prop-types": "^15.8.1",
-    "query-string": "^9.3.1",
+    "query-string": "^9.2.2",
    "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.1",
+    "react-virtuoso": "^4.14.0",
    "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.93.2",
+    "sass": "^1.92.0",
    "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.1.0",
+    "@ant-design/icons": "^6.0.0",
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.51.0",
+    "@dotenvx/dotenvx": "^1.49.0",
    "@emotion/babel-plugin": "^11.13.5",
    "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.37.0",
-    "@playwright/test": "^1.56.0",
-    "@sentry/webpack-plugin": "^4.3.0",
+    "@eslint/js": "^9.33.0",
+    "@playwright/test": "^1.55.0",
+    "@sentry/webpack-plugin": "^4.1.1",
    "@testing-library/dom": "^10.4.1",
-    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/jest-dom": "^6.8.0",
    "@testing-library/react": "^16.3.0",
    "@vitejs/plugin-react": "^4.6.0",
-    "browserslist": "^4.26.3",
+    "browserslist": "^4.25.3",
    "browserslist-to-esbuild": "^2.1.1",
-    "chalk": "^5.6.2",
-    "eslint": "^9.37.0",
+    "chalk": "^5.6.0",
+    "eslint": "^9.33.0",
    "eslint-plugin-react": "^7.37.5",
    "globals": "^15.15.0",
    "jsdom": "^26.0.0",
-    "memfs": "^4.48.1",
+    "memfs": "^4.36.3",
    "os-browserify": "^0.3.0",
-    "playwright": "^1.56.0",
+    "playwright": "^1.55.0",
    "react-error-overlay": "^6.1.0",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.3",
-    "vite": "^7.1.9",
+    "vite": "^7.1.3",
    "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,7 +12,6 @@ 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";
@@ -21,13 +20,14 @@ import getTheme from "./themeProvider";
 const config = {
  core: {
    authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
-    key: "anon"
+    key: "anon" // Default key, overridden dynamically by SplitClientProvider
  }
 };

+// Custom provider to manage the Split client key based on imexshopid from Redux
 function SplitClientProvider({ children }) {
-  const imexshopid = useSelector((state) => state.user.imexshopid);
-  const splitClient = useSplitClient({ key: imexshopid || "anon" });
+  const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
+  const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
  useEffect(() => {
    if (splitClient && imexshopid) {
      console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
@@ -36,66 +36,40 @@ function SplitClientProvider({ children }) {
  return children;
 }

+const mapDispatchToProps = (dispatch) => ({
+  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
+});
+
 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser
 });

-const mapDispatchToProps = (dispatch) => ({
-  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode)),
-  signOutStart: () => dispatch(signOutStart())
-});
-
-function AppContainer({ currentUser, setDarkMode, signOutStart }) {
+function AppContainer({ currentUser, setDarkMode }) {
  const { t } = useTranslation();
  const isDarkMode = useSelector(selectDarkMode);
  const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);

-  // 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
+  // Update data-theme attribute when dark mode changes
  useEffect(() => {
    document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
    return () => document.documentElement.removeAttribute("data-theme");
  }, [isDarkMode]);

-  // Sync darkMode with localStorage
+  // Sync Redux darkMode with localStorage on user change
  useEffect(() => {
    if (currentUser?.uid) {
      const savedMode = localStorage.getItem(`dark-mode-${currentUser.uid}`);
      if (savedMode !== null) {
        setDarkMode(JSON.parse(savedMode));
      } else {
-        setDarkMode(false);
+        setDarkMode(false); // default to light mode
      }
    } else {
      setDarkMode(false);
    }
-  }, [currentUser?.uid, setDarkMode]);
+  }, [currentUser?.uid]);

-  // Persist darkMode
+  // Persist darkMode to localStorage when it or user changes
  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,
-        minWidth: "10rem",
+        width: "20rem",
        formItemProps: (field) => {
          return {
            key: `${field.index}joblinename`,
@@ -71,9 +71,9 @@ export function BillEnterModalLinesComponent({
            disabled={disabled}
            options={lineData}
            style={{
-              //width: "10rem",
-              // maxWidth: "20rem",
-              minWidth: "20rem",
+              width: "20rem",
+              maxWidth: "20rem",
+              minWidth: "10rem",
              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,
-        minWidth: "10rem",
+        width: "20rem",
        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: "10rem",
+        width: "8rem",

        formItemProps: (field) => {
          return {
@@ -357,7 +357,6 @@ export function BillEnterModalLinesComponent({
        title: t("billlines.labels.deductedfromlbr"),
        dataIndex: "deductedfromlbr",
        editable: true,
-        width: "40px",
        formItemProps: (field) => {
          return {
            valuePropName: "checked",
@@ -465,7 +464,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`,
@@ -486,7 +485,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`,
@@ -504,7 +503,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,32 +39,30 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
          style: {
            ...(item.removed ? { textDecoration: "line-through" } : {})
          },
-          name: generateLineName(item),
-          label: generateLineName(item)
+          name: `${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+            item.oem_partno ? ` - ${item.oem_partno}` : ""
+          }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim(),
+          label: (
+            <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
+              <span>
+                {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+                  item.oem_partno ? ` - ${item.oem_partno}` : ""
+                }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
+              </span>
+              {InstanceRenderMgr({
+                rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
+                  <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
+                )
+              })}
+              <span style={{ float: "right", paddingleft: "1rem" }}>
+                {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
+              </span>
+            </div>
+          )
        }))
      ]}
      {...restProps}
    ></Select>
  );
 };
-
-function generateLineName(item) {
-  return (
-    <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
-      <span>
-        {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-          item.oem_partno ? ` - ${item.oem_partno}` : ""
-        }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
-      </span>
-      {InstanceRenderMgr({
-        rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
-          <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
-        )
-      })}
-      <span style={{ float: "right", paddingleft: "1rem" }}>
-        {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
-      </span>
-    </div>
-  );
-}
 export default forwardRef(BillLineSearchSelect);
--- 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,11 +40,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
    variables: {
      jobId: conversation.job_conversations[0]?.jobid
    },
-    skip:
-      !open ||
-      !conversation.job_conversations ||
-      conversation.job_conversations.length === 0 ||
-      bodyshop.uselocalmediaserver
+    skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
  });

  const handleVisibleChange = (change) => {
@@ -52,8 +48,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
  };

  useEffect(() => {
-    // Instead of wiping the array (which holds media objects), just clear selection flags
-    setSelectedMedia((prev) => prev.map((m) => ({ ...m, isSelected: false })));
+    setSelectedMedia([]);
  }, [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.
@@ -80,7 +75,6 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
            <JobDocumentsLocalGalleryExternal
              externalMediaState={[selectedMedia, setSelectedMedia]}
              jobId={conversation.job_conversations[0]?.jobid}
-              context="chat"
            />
          )}
        </>
@@ -96,7 +90,6 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
            <JobDocumentsLocalGalleryExternal
              externalMediaState={[selectedMedia, setSelectedMedia]}
              jobId={conversation.job_conversations[0]?.jobid}
-              context="chat"
            />
          )}
        </>
@@ -117,7 +110,6 @@ 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, useEffect } from "react";
+import { useMemo, useState } 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, QUERY_USER_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import { QUERY_DASHBOARD_BODYSHOP } from "../../graphql/bodyshop.queries";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
+import { selectBodyshop, 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,173 +24,122 @@ import "./dashboard-grid.styles.scss";
 const ResponsiveReactGridLayout = WidthProvider(Responsive);

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

 const mapDispatchToProps = () => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });

-export function DashboardGridComponent({ currentUser }) {
+export function DashboardGridComponent({ currentUser, bodyshop }) {
  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();

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

-  // 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, {
+  const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });

  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);

-  // Memoize layout state initialization
-  const initialState = useMemo(() => {
-    const persisted = layoutData?.users?.[0]?.dashboardlayout;
-    if (persisted) {
-      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = persisted;
-      return {
-        items: Array.isArray(items) ? items : [],
-        layout: Array.isArray(layout) ? layout : [],
-        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
-        cols
-      };
-    }
-    return { items: [], layout: [], layouts: {}, cols: DEFAULT_COLS };
-  }, [layoutData]);
-
-  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") => {
+  const handleLayoutChange = async (layout, layouts) => {
    try {
-      const { data: result } = await updateLayout({
-        variables: { email: currentUser.email, layout: updatedLayout }
+      logImEXEvent("dashboard_change_layout");
+
+      setState((prev) => ({ ...prev, layout, layouts }));
+
+      const result = await updateLayout({
+        variables: {
+          email: currentUser.email,
+          layout: { ...state, layout, layouts }
+        }
      });

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

-  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
-  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
-
-  const {
-    loading: dashboardLoading,
-    error: dashboardError,
-    data: dashboardQueryData,
-    refetch
-  } = useQuery(dashboardQueryDoc, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
-
-  const dashboardData = useMemo(() => GenerateDashboardData(dashboardQueryData), [dashboardQueryData]);
-
-  // Memoize existing layout keys to prevent unnecessary recalculations
-  const existingLayoutKeys = useMemo(() => state.items.map(({ i }) => i), [state.items]);
-
-  // Memoize menu items to prevent unnecessary recalculations
-  const menuItems = useMemo(
-    () =>
-      Object.entries(componentList).map(([key, { label }]) => ({
-        key,
-        label,
-        value: key,
-        disabled: existingLayoutKeys.includes(key)
-      })),
-    [existingLayoutKeys]
-  );
-
-  if (loading || dashboardLoading) return <LoadingSkeleton message={t("general.labels.loading")} />;
-  if (error || dashboardError) return <AlertComponent message={(error || dashboardError).message} type="error" />;
-
-  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
-    setState((prev) => ({ ...prev, layout, layouts }));
-    await updateLayoutAndCache({ ...state, layout, layouts }, "layout change");
-  };
-
-  const handleRemoveComponent = async (key) => {
+  const handleRemoveComponent = (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 idxToRemove = state.items.findIndex((i) => i.i === key);
+
+    const items = cloneDeep(state.items);
+
+    items.splice(idxToRemove, 1);
+    setState({ ...state, items });
  };

-  const handleAddComponent = async ({ key }) => {
-    logImEXEvent("dashboard_add_component", { key });
-    const { minW = 1, minH = 1, w: baseW = 2, h: baseH = 2 } = componentList[key] || {};
-    const nextItems = [
-      ...state.items,
-      {
-        i: key,
-        x: (state.items.length * 2) % (state.cols || DEFAULT_COLS),
-        y: DEFAULT_Y_POSITION,
-        w: Math.max(baseW, minW),
-        h: Math.max(baseH, minH)
-      }
-    ];
-    const updatedState = { ...state, items: nextItems };
-    setState(updatedState);
-    await updateLayoutAndCache(updatedState, "component addition");
+  const 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 nextItems = [
+        ...prev.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,
+          w: Math.max(baseW, minW),
+          h: Math.max(baseH, minH)
+        }
+      ];
+      return { ...prev, items: nextItems };
+    });
  };

+  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
@@ -208,19 +157,22 @@ export function DashboardGridComponent({ currentUser }) {

      <ResponsiveReactGridLayout
        className="layout"
-        breakpoints={GRID_BREAKPOINTS}
-        cols={GRID_COLS}
+        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
+        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
        layouts={state.layouts}
        onLayoutChange={handleLayoutChange}
      >
        {state.items.map((item) => {
-          const { component: TheComponent, minW = 1, minH = 1, w: specW, h: specH } = componentList[item.i] || {};
+          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 safeItem = {
            ...item,
-            w: Math.max(item.w || specW || minW, minW),
-            h: Math.max(item.h || specH || minH, minH)
+            w: Math.max(item.w || spec.w || minW, minW),
+            h: Math.max(item.h || spec.h || minH, minH)
          };
-
          return (
            <div
              key={safeItem.i}
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -92,7 +92,6 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
        rowKey="center"
        dataSource={allocationsSummary}
        locale={{ emptyText: t("dms.labels.refreshallocations") }}
-        scroll={{ x: true }}
        summary={() => {
          const totals =
            allocationsSummary &&
--- a/client/src/components/email-documents/email-documents.component.jsx
+++ b/client/src/components/email-documents/email-documents.component.jsx
@@ -67,7 +67,6 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
            <JobsDocumentsLocalGalleryExternalComponent
              externalMediaState={[selectedMedia, setSelectedMedia]}
              jobId={emailConfig.jobid}
-              context="email"
            />
          )}
        </>
@@ -83,7 +82,6 @@ export function EmailDocumentsComponent({ emailConfig, form, selectedMediaState,
            <JobsDocumentsLocalGalleryExternalComponent
              externalMediaState={[selectedMedia, setSelectedMedia]}
              jobId={emailConfig.jobid}
-              context="email"
            />
          )}
        </>
--- a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
@@ -90,7 +90,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })) ||
@@ -103,7 +103,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
    <div>
      <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
        <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={filteredJobLines || []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
      </CardTemplate>
    </div>
  );
--- 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" Removed by request
+            part_type: ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
          }
        : {})
    }
@@ -318,7 +318,7 @@ export function JobLinesComponent({
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })) ||
--- a/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
+++ b/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
@@ -1,9 +1,8 @@
 import { useMemo } from "react";
-import { Tag, Tooltip } from "antd";
+import { Col, Row, Tag, Tooltip } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -12,67 +11,65 @@ const mapDispatchToProps = () => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });

+export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
+
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);

-export function JobPartsQueueCount({ bodyshop, parts }) {
-  const { t } = useTranslation();
+export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
  const partsStatus = useMemo(() => {
    if (!parts) return null;
-    const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
    return parts.reduce(
      (acc, val) => {
        if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
        acc.total = acc.total + val.count;
        acc[val.status] = acc[val.status] + val.count;
+
        return acc;
      },
      {
        total: 0,
        null: 0,
-        ...Object.fromEntries(statusKeys.map((key) => [bodyshop.md_order_statuses[key], 0]))
+        [bodyshop.md_order_statuses.default_bo]: 0,
+        [bodyshop.md_order_statuses.default_ordered]: 0,
+        [bodyshop.md_order_statuses.default_received]: 0,
+        [bodyshop.md_order_statuses.default_returned]: 0
      }
    );
  }, [bodyshop, parts]);

  if (!parts) return null;
  return (
-    <div
-      style={{
-        display: "grid",
-        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
-        gap: "8px",
-        width: "100%",
-        justifyItems: "start"
-      }}
-    >
-      <Tooltip title="Total">
-        <Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
-      </Tooltip>
-      <Tooltip title={t("dashboard.errors.status_normal")}>
-        <Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus["null"]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-        <Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_bo]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-        <Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_ordered]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_received}>
-        <Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_received]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-        <Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_returned]}
-        </Tag>
-      </Tooltip>
-    </div>
+    <Row>
+      <Col {...defaultColLayout}>
+        <Tooltip title="Total">
+          <Tag>{partsStatus.total}</Tag>
+        </Tooltip>
+      </Col>
+      <Col {...defaultColLayout}>
+        <Tooltip title="No Status">
+          <Tag color="gold">{partsStatus["null"]}</Tag>
+        </Tooltip>
+      </Col>
+      <Col {...defaultColLayout}>
+        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
+          <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
+        </Tooltip>
+      </Col>
+      <Col {...defaultColLayout}>
+        <Tooltip title={bodyshop.md_order_statuses.default_received}>
+          <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
+        </Tooltip>
+      </Col>
+      <Col {...defaultColLayout}>
+        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
+          <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
+        </Tooltip>
+      </Col>
+      <Col {...defaultColLayout}>
+        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
+          <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
+        </Tooltip>
+      </Col>
+    </Row>
  );
 }
--- 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,8 +77,6 @@ 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;
@@ -164,7 +162,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.courtesycar.plate} - ${t(c.status)}`}
+                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
                            {index !== job.cccontracts.length - 1 ? "," : null}
                          </Link>
                        </Space>
@@ -357,14 +355,6 @@ 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,12 +1,11 @@
-import { useEffect, useMemo, useState, useCallback } from "react";
-import LocalMediaGrid from "./local-media-grid.component";
+import { useEffect } from "react";
+import { Gallery } from "react-grid-gallery";
 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,
@@ -19,127 +18,41 @@ const mapDispatchToProps = (dispatch) => ({

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

-/**
- * 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" }) {
+function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia }) {
  const [galleryImages, setgalleryImages] = externalMediaState;
-  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
+  const { t } = useTranslation();

-  // 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) return;
-    setIsLoading(true);
-    getJobMedia(jobId);
+    if (jobId) {
+      getJobMedia(jobId);
+    }
  }, [jobId, getJobMedia]);

-  // Memo: transform raw redux media into gallery documents.
-  const documents = useMemo(
-    () => transformMediaToImages(allMedia?.[jobId] || []),
-    [allMedia, jobId, transformMediaToImages]
-  );
-
-  // 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>
+    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
    );
-  }
+
+    setgalleryImages(documents);
+  }, [allMedia, jobId, setgalleryImages, t]);

  return (
-    <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 className="clearfix">
+      <Gallery
+        images={galleryImages}
+        onSelect={(index) => {
+          setgalleryImages(galleryImages.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g)));
+        }}
+      />
    </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
@@ -1,207 +0,0 @@
-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/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -166,7 +166,7 @@ export function JobsList({ bodyshop }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -165,7 +165,7 @@ export function JobsReadyList({ bodyshop }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })
--- a/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
@@ -145,7 +145,7 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })) ||
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -171,7 +171,7 @@ export function PartsQueueListComponent({ bodyshop }) {
      filters:
        bodyshop.md_ro_statuses.active_statuses.map((s) => {
          return {
-            text: s || t("dashboard.errors.status"),
+            text: s || "No Status*",
            value: [s]
          };
        }) || [],
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -34,9 +34,8 @@ const getEmployeeName = (employeeId, employees) => {
  return employee ? `${employee.first_name} ${employee.last_name}` : "";
 };

-const productionListColumnsData = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
+const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
  const { Enhanced_Payroll } = treatments;
-
  return [
    {
      title: i18n.t("jobs.actions.viewdetail"),
@@ -314,7 +313,7 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
        activeStatuses
          ?.map((s) => {
            return {
-              text: s || i18n.t("dashboard.errors.status"),
+              text: s || "No Status*",
              value: [s]
            };
          })
@@ -585,4 +584,4 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
    }
  ];
 };
-export default productionListColumnsData;
+export default r;
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -425,15 +425,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                    ]
                  : [])
              ]
-            : []),
-          <Form.Item
-            key="accumulatePayableLines"
-            name={["accountingconfig", "accumulatePayableLines"]}
-            label={t("bodyshop.fields.accumulatePayableLines")}
-            valuePropName="checked"
-          >
-            <Switch />
-          </Form.Item>
+            : [])
        ]}
      </LayoutFormRow>
      <FeatureWrapper featureName="scoreboard" noauth={() => null}>
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -138,15 +138,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                  <Switch />
                </Form.Item>
              )}
-              {bodyshop.pbs_serialnumber && (
-                <Form.Item
-                  label={t("bodyshop.fields.dms.ro_posting")}
-                  valuePropName="checked"
-                  name={["pbs_configuration", "ro_posting"]}
-                >
-                  <Switch />
-                </Form.Item>
-              )}
              {bodyshop.pbs_serialnumber && (
                <Form.Item
                  label={t("bodyshop.fields.dms.appostingaccount")}
--- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
+++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
@@ -103,7 +103,7 @@ export function SimplifiedPartsJobsListComponent({
        return record.status || t("general.labels.na");
      },
      filteredValue: filter?.status || null,
-      filters: bodyshop?.md_ro_statuses?.parts_statuses?.map((s) => {
+      filters: bodyshop.md_ro_statuses?.parts_statuses.map((s) => {
        return { text: s, value: [s] };
      }),
      onFilter: (value, record) => value.includes(record.status)
--- a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
+++ b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
@@ -111,7 +111,7 @@ export function TechLookupJobsList({ bodyshop }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })) ||
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -42,7 +42,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
        ro_number
      }
    }
-    bills_aggregate(where: $where) {
+    bills_aggregate {
      aggregate {
        count(distinct: true)
      }
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -363,25 +363,3 @@ 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,7 +424,6 @@ export const GET_JOB_BY_PK = gql`
      actual_delivery
      actual_in
      acv_amount
-      admin_clerk
      adjustment_bottom_line
      alt_transport
      area_of_damage
@@ -2348,13 +2347,12 @@ 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, admin_clerk: null }
+      _set: { date_exported: null, date_invoiced: null, status: $default_delivered }
    ) {
      id
      date_exported
      date_invoiced
      status
-      admin_clerk
    }
  }
 `;
--- a/client/src/graphql/user.queries.js
+++ b/client/src/graphql/user.queries.js
@@ -135,12 +135,3 @@ 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/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -16,6 +16,7 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { logImEXEvent } from "../../firebase/firebase.utils";

@@ -23,12 +24,16 @@ const mapDispatchToProps = (dispatch) => ({
  setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
 });

-export function BillsListPage({ loading, data, refetch, total, setBillEnterContext, handleTableChange, sortedInfo }) {
+export function BillsListPage({ loading, data, refetch, total, setBillEnterContext }) {
  const search = queryString.parse(useLocation().search);
  const [openSearchResults, setOpenSearchResults] = useState([]);
  const [searchLoading, setSearchLoading] = useState(false);
  const { page } = search;
  const history = useNavigate();
+  const [state, setState] = useLocalStorage("bills_list_sort", {
+    sortedInfo: {},
+    filteredInfo: { vendorname: [] }
+  });
  const Templates = TemplateList("bill");
  const { t } = useTranslation();

@@ -45,7 +50,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      }),
      filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
      filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
-      sortOrder: sortedInfo.columnKey === "vendorname" && sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
      render: (text, record) => <span>{record.vendor.name}</span>
    },
    {
@@ -53,7 +58,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "invoice_number",
      key: "invoice_number",
      sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: sortedInfo.columnKey === "invoice_number" && sortedInfo.order
+      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
    },
    {
      title: t("jobs.fields.ro_number"),
@@ -63,7 +68,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      sortObject: (order) => ({
        job: { ro_number: order === "descend" ? "desc" : "asc" }
      }),
-      sortOrder: sortedInfo.columnKey === "ro_number" && sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
      render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
    },
    {
@@ -71,7 +76,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "date",
      key: "date",
      sorter: (a, b) => dateSort(a.date, b.date),
-      sortOrder: sortedInfo.columnKey === "date" && sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
      render: (text, record) => <DateFormatter>{record.date}</DateFormatter>
    },
    {
@@ -79,7 +84,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "total",
      key: "total",
      sorter: (a, b) => a.total - b.total,
-      sortOrder: sortedInfo.columnKey === "total" && sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
      render: (text, record) => <CurrencyFormatter>{record.total}</CurrencyFormatter>
    },
    {
@@ -87,7 +92,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "is_credit_memo",
      key: "is_credit_memo",
      sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
-      sortOrder: sortedInfo.columnKey === "is_credit_memo" && sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.order,
      render: (text, record) => <Checkbox checked={record.is_credit_memo} />
    },
    {
@@ -95,7 +100,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "exported",
      key: "exported",
      sorter: (a, b) => a.exported - b.exported,
-      sortOrder: sortedInfo.columnKey === "exported" && sortedInfo.order,
+      sortOrder: state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
      render: (text, record) => <Checkbox checked={record.exported} />
    },
    {
@@ -159,7 +164,37 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
    }
  ];

-  // (State & URL handling moved to container - Option C)
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({
+      sortedInfo: sorter,
+      filteredInfo: { ...state.filteredInfo, vendorname: filters.vendorname || [] }
+    });
+
+    search.page = pagination.current;
+    if (filters.vendorname && filters.vendorname.length) {
+      search.vendorIds = filters.vendorname.join(",");
+    } else {
+      delete search.vendorIds;
+    }
+    if (sorter && sorter.column && sorter.column.sortObject) {
+      search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
+      delete search.sortcolumn;
+      delete search.sortorder;
+    } else {
+      delete search.searchObj;
+      search.sortcolumn = sorter.order ? sorter.columnKey : null;
+      search.sortorder = sorter.order;
+    }
+    history({ search: queryString.stringify(search) });
+    logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
+  };
+
+  useEffect(() => {
+    if (!search.vendorIds && state.filteredInfo.vendorname && state.filteredInfo.vendorname.length) {
+      search.vendorIds = state.filteredInfo.vendorname.join(",");
+      history({ search: queryString.stringify(search) });
+    }
+  }, []);

  useEffect(() => {
    if (search.search && search.search.trim() !== "") {
--- a/client/src/pages/bills/bills.page.container.jsx
+++ b/client/src/pages/bills/bills.page.container.jsx
@@ -3,14 +3,13 @@ import queryString from "query-string";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
 import BillDetailEditContainer from "../../components/bill-detail-edit/bill-detail-edit.container";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_BILLS_PAGINATED } from "../../graphql/bills.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import BillsPageComponent from "./bills.page.component";
-import useLocalStorage from "../../utils/useLocalStorage";
 import { pageLimit } from "../../utils/config";
 import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -24,9 +23,7 @@ const mapDispatchToProps = (dispatch) => ({

 export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
-  const location = useLocation();
-  const history = useNavigate();
-  const searchParams = queryString.parse(location.search);
+  const searchParams = queryString.parse(useLocation().search);
  const { page, sortcolumn, sortorder, searchObj } = searchParams;

  useEffect(() => {
@@ -40,12 +37,6 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
    setBreadcrumbs([{ link: "/manage/bills", label: t("titles.bc.bills-list") }]);
  }, [t, setBreadcrumbs, setSelectedHeader]);

-  // Persisted table state (sorting & filtering)
-  const [persistState, setPersistState] = useLocalStorage("bills_list_sort", {
-    sortedInfo: {},
-    filteredInfo: { vendorname: [] }
-  });
-
  const { loading, error, data, refetch } = useQuery(QUERY_ALL_BILLS_PAGINATED, {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
@@ -63,90 +54,6 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
    }
  });

-  const handleTableChange = (pagination, filters, sorter) => {
-    const search = queryString.parse(location.search);
-
-    const vendorArr = filters?.vendorname ?? [];
-    const newVendorIds = vendorArr.length ? vendorArr.join(",") : undefined;
-    const vendorFilterChanged = search.vendorIds !== newVendorIds;
-
-    search.page = vendorFilterChanged || !search.page ? 1 : pagination.current;
-    newVendorIds ? (search.vendorIds = newVendorIds) : delete search.vendorIds;
-
-    const { columnKey, order, column } = sorter || {};
-    if (column?.sortObject) {
-      search.searchObj = JSON.stringify(column.sortObject(order));
-      delete search.sortcolumn;
-      delete search.sortorder;
-    } else {
-      delete search.searchObj;
-      search.sortcolumn = order ? columnKey : null;
-      search.sortorder = order ?? null; // keep explicit null to mirror prior behavior
-    }
-
-    setPersistState({
-      sortedInfo: sorter || {},
-      filteredInfo: { vendorname: vendorArr }
-    });
-
-    history({ search: queryString.stringify(search) });
-  };
-
-  useEffect(() => {
-    const search = queryString.parse(location.search);
-    let changed = false;
-
-    const vendorPersisted = persistState.filteredInfo.vendorname || [];
-    if (!search.vendorIds && vendorPersisted.length) {
-      search.vendorIds = vendorPersisted.join(",");
-      search.page = 1; // reset page when injecting filter
-      changed = true;
-    }
-
-    const { sortedInfo } = persistState;
-    if (!search.searchObj && !search.sortcolumn && sortedInfo?.order) {
-      const { columnKey, order } = sortedInfo;
-      if (columnKey) {
-        const dir = order === "descend" ? "desc" : "asc";
-        if (columnKey === "vendorname") {
-          search.searchObj = JSON.stringify({ vendor: { name: dir } });
-        } else if (columnKey === "ro_number") {
-          search.searchObj = JSON.stringify({ job: { ro_number: dir } });
-        } else {
-          search.sortcolumn = columnKey;
-          search.sortorder = order;
-        }
-        changed = true;
-      }
-    }
-
-    if (changed) {
-      history({ search: queryString.stringify(search) });
-      return;
-    }
-
-    const hasPersistSort = !!sortedInfo?.order;
-    const hasUrlSort = !!(search.searchObj || (search.sortcolumn && search.sortorder));
-    if (!hasPersistSort && hasUrlSort) {
-      let derived = {};
-      if (search.searchObj) {
-        try {
-          const o = JSON.parse(search.searchObj);
-          if (o.vendor?.name) {
-            derived = { columnKey: "vendorname", order: o.vendor.name === "desc" ? "descend" : "ascend" };
-          } else if (o.job?.ro_number) {
-            derived = { columnKey: "ro_number", order: o.job.ro_number === "desc" ? "descend" : "ascend" };
-          }
-        } catch {
-          /* ignore parse errors */
-        }
-      } else {
-        derived = { columnKey: search.sortcolumn, order: search.sortorder };
-      }
-      if (derived.order) setPersistState((prev) => ({ ...prev, sortedInfo: derived }));
-    }
-  }, [location.search]);
-
  if (error) return <AlertComponent message={error.message} type="error" />;
  return (
    <FeatureWrapperComponent
@@ -164,8 +71,6 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
            loading={loading}
            refetch={refetch}
            total={data ? data.bills_aggregate.aggregate.count : 0}
-            handleTableChange={handleTableChange}
-            sortedInfo={persistState.sortedInfo || {}}
          />

          <BillDetailEditContainer />
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -48,7 +48,7 @@ export const socket = SocketIO(

 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
  const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
+  const [logLevel, setLogLevel] = useState("DEBUG");
  const history = useNavigate();
  const [logs, setLogs] = useState([]);
  const search = queryString.parse(useLocation().search);
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -39,14 +39,13 @@ 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, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
-  currentUser: selectCurrentUser
+  jobRO: selectJobReadOnly
 });

 const mapDispatchToProps = (dispatch) => ({
@@ -60,7 +59,7 @@ const mapDispatchToProps = (dispatch) => ({
    )
 });

-export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext, currentUser }) {
+export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, setPrintCenterContext }) {
  const { t } = useTranslation();
  const [form] = Form.useForm();
  const client = useApolloClient();
@@ -98,7 +97,6 @@ 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/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
+++ b/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
@@ -97,7 +97,7 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || t("dashboard.errors.status"),
+                text: s || "No Status*",
                value: [s]
              };
            })) ||
--- a/client/src/redux/media/media.reducer.js
+++ b/client/src/redux/media/media.reducer.js
@@ -19,19 +19,29 @@ const mediaReducer = (state = INITIAL_STATE, action) => {
    case MediaActionTypes.TOGGLE_MEDIA_SELECTED:
      return {
        ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) =>
-          p.filename === action.payload.filename ? { ...p, isSelected: !p.isSelected } : p
-        )
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
+          if (p.filename === action.payload.filename) {
+            p.isSelected = !p.isSelected;
+          }
+          return p;
+        })
      };
    case MediaActionTypes.SELECT_ALL_MEDIA_FOR_JOB:
      return {
        ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: true }))
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
+          p.isSelected = true;
+
+          return p;
+        })
      };
    case MediaActionTypes.DESELECT_ALL_MEDIA_FOR_JOB:
      return {
        ...state,
-        [action.payload.jobid]: state[action.payload.jobid].map((p) => ({ ...p, isSelected: false }))
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
+          p.isSelected = false;
+          return p;
+        })
      };
    default:
      return state;
--- a/client/src/redux/media/media.sagas.js
+++ b/client/src/redux/media/media.sagas.js
@@ -17,10 +17,9 @@ export function* getJobMedia({ payload: jobid }) {
      const imagesFetch = yield cleanAxios.post(
        `${localmediaserverhttp}/jobs/list`,
        {
-          jobid,
-
+          jobid
        },
-        { headers: { ims_token: bodyshop.localmediatoken, bodyshopid: bodyshop.id } }
+        { headers: { ims_token: bodyshop.localmediatoken } }
      );
      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,5 +2,4 @@ import { createSelector } from "reselect";

 const selectMedia = (state) => state.media;

-// Return a shallow copy to avoid identity selector warning and allow memoization to detect actual changes.
-export const selectAllMedia = createSelector([selectMedia], (media) => ({ ...media }));
+export const selectAllMedia = createSelector([selectMedia], (media) => media);
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -281,7 +281,6 @@
      },
      "fields": {
        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
-        "accumulatePayableLines": "Accumulate Payable Lines",
        "address1": "Address 1",
        "address2": "Address 2",
        "appt_alt_transport": "Appointment Alternative Transportation Options",
@@ -322,7 +321,6 @@
          "itc_local": "Local Tax is ITC?",
          "itc_state": "State Tax is ITC?",
          "mappingname": "DMS Mapping Name",
-          "ro_posting": "Create $0 RO?",
          "sendmaterialscosting": "Materials Cost as % of Sale",
          "srcco": "Source Company #/Dealer #"
        },
@@ -998,7 +996,6 @@
        "insco": "No Ins. Co.*",
        "refreshrequired": "You must refresh the dashboard data to see this component.",
        "status": "No Status*",
-        "status_normal": "No Status",
        "updatinglayout": "Error saving updated layout {{message}}"
      },
      "labels": {
@@ -1678,7 +1675,6 @@
        "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
@@ -281,7 +281,6 @@
      },
      "fields": {
        "ReceivableCustomField": "",
-        "accumulatePayableLines": "",
        "address1": "",
        "address2": "",
        "appt_alt_transport": "",
@@ -322,7 +321,6 @@
          "itc_local": "",
          "itc_state": "",
          "mappingname": "",
-          "ro_posting": "",
          "sendmaterialscosting": "",
          "srcco": ""
        },
@@ -998,7 +996,6 @@
        "insco": "",
        "refreshrequired": "",
        "status": "",
-        "status_normal": "",
        "updatinglayout": ""
      },
      "labels": {
@@ -1679,7 +1676,6 @@
        "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
@@ -281,7 +281,6 @@
      },
      "fields": {
        "ReceivableCustomField": "",
-        "accumulatePayableLines": "",
        "address1": "",
        "address2": "",
        "appt_alt_transport": "",
@@ -322,7 +321,6 @@
          "itc_local": "",
          "itc_state": "",
          "mappingname": "",
-          "ro_posting": "",
          "sendmaterialscosting": "",
          "srcco": ""
        },
@@ -998,7 +996,6 @@
        "insco": "",
        "refreshrequired": "",
        "status": "",
-        "status_normal": "",
        "updatinglayout": ""
      },
      "labels": {
@@ -1678,7 +1675,6 @@
        "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,29 +15,21 @@ export const EmailSettings = {

 export const TemplateList = (type, context) => {
  //const { bodyshop } = store.getState().user;
-
-  const casl = InstanceRenderManager({
-    imex: {
-      casl_authorization: {
-        title: i18n.t("printcenter.jobs.casl_authorization"),
-        description: "",
-        subject: i18n.t("printcenter.jobs.casl_authorization"),
-        key: "casl_authorization",
-        disabled: false,
-        group: "authorization",
-        regions: {
-          CA: true
-        }
-      }
-    },
-    rome: {}
-  });
-
  return {
    //If there's no type or the type is job, send it back.
    ...(!type || type === "job"
      ? {
-          ...casl,
+          casl_authorization: {
+            title: i18n.t("printcenter.jobs.casl_authorization"),
+            description: "",
+            subject: i18n.t("printcenter.jobs.casl_authorization"),
+            key: "casl_authorization",
+            disabled: false,
+            group: "authorization",
+            regions: {
+              CA: true
+            }
+          },
          fippa_authorization: {
            title: i18n.t("printcenter.jobs.fippa_authorization"),
            description: "",
--- a/docker-compose-cluster.yml
+++ b/docker-compose-cluster.yml
@@ -207,9 +207,6 @@ services:
        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
      "

 networks:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -120,8 +120,6 @@ services:
        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-job-totals --create-bucket-configuration LocationConstraint=ca-central-1
        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket parts-estimates --create-bucket-configuration LocationConstraint=ca-central-1
        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
      "
  # Node App: The Main IMEX API
  node-app:
--- a/hasura/metadata/cron_triggers.yaml
+++ b/hasura/metadata/cron_triggers.yaml
@@ -8,16 +8,7 @@
      value_from_env: DATAPUMP_AUTH
 - name: CARFAX Data Pump
  webhook: '{{HASURA_API_URL}}/data/carfax'
-  schedule: 0 7 * * 0
-  include_in_metadata: true
-  payload: {}
-  headers:
-    - name: x-imex-auth
-      value_from_env: DATAPUMP_AUTH
-  comment: Project Mexico
- name: CARFAX RPS Data Pump
-  webhook: '{{HASURA_API_URL}}/data/carfaxrps'
-  schedule: 15 7 * * 0
+  schedule: 0 7 * * 6
  include_in_metadata: true
  payload: {}
  headers:
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3615,7 +3615,6 @@
          - adj_strdis
          - adj_towdis
          - adjustment_bottom_line
-          - admin_clerk
          - agt_addr1
          - agt_addr2
          - agt_city
@@ -3891,7 +3890,6 @@
          - adj_strdis
          - adj_towdis
          - adjustment_bottom_line
-          - admin_clerk
          - agt_addr1
          - agt_addr2
          - agt_city
@@ -4180,7 +4178,6 @@
          - adj_strdis
          - adj_towdis
          - adjustment_bottom_line
-          - admin_clerk
          - agt_addr1
          - agt_addr2
          - agt_city
@@ -4708,34 +4705,6 @@
          - 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
@@ -1 +0,0 @@
-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
@@ -1,18 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1,2 +0,0 @@
-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
@@ -1,4 +0,0 @@
-- 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
@@ -1,2 +0,0 @@
-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
@@ -1,4 +0,0 @@
-- 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
@@ -1,2 +0,0 @@
-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
@@ -1,4 +0,0 @@
-- 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
@@ -1,2 +0,0 @@
-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
@@ -1,4 +0,0 @@
-- 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
@@ -1,2 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-ALTER TABLE "public"."media_analytics_detail" ALTER COLUMN "total_size_bytes" TYPE numeric;
--- a/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/down.sql
+++ b/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/down.sql
@@ -1,5 +0,0 @@
-alter table "public"."media_analytics_detail" drop constraint "media_analytics_detail_jobid_fkey",
-  add constraint "media_analytics_detail_jobid_fkey"
-  foreign key ("jobid")
-  references "public"."jobs"
-  ("id") on update restrict on delete restrict;
--- a/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/up.sql
+++ b/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/up.sql
@@ -1,5 +0,0 @@
-alter table "public"."media_analytics_detail" drop constraint "media_analytics_detail_jobid_fkey",
-  add constraint "media_analytics_detail_jobid_fkey"
-  foreign key ("jobid")
-  references "public"."jobs"
-  ("id") on update set null on delete set null;
--- a/hasura/migrations/1762816491980_media_analytics_fk_trigger/down.sql
+++ b/hasura/migrations/1762816491980_media_analytics_fk_trigger/down.sql
@@ -1,23 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE FUNCTION set_fk_to_null_if_invalid_media_analytics()
-- RETURNS TRIGGER AS $$
-- BEGIN
--     -- Check if the foreign key value is not NULL
--     IF NEW.jobid IS NOT NULL THEN
--         -- Check if the corresponding record exists in the parent table
--         IF NOT EXISTS (SELECT 1 FROM jobs WHERE id = NEW.jobid) THEN
--             -- If it doesn't exist, set the foreign key to NULL
--             NEW.jobid = NULL;
--         END IF;
--     END IF;
--
--     -- Return the (potentially modified) record to be inserted/updated
--     RETURN NEW;
-- END;
-- $$ LANGUAGE plpgsql;
--
-- CREATE TRIGGER media_analytics_fk_null
-- BEFORE INSERT OR UPDATE ON media_analytics_detail
-- FOR EACH ROW
-- EXECUTE FUNCTION set_fk_to_null_if_invalid_media_analytics();
--- a/hasura/migrations/1762816491980_media_analytics_fk_trigger/up.sql
+++ b/hasura/migrations/1762816491980_media_analytics_fk_trigger/up.sql
@@ -1,21 +0,0 @@
-CREATE OR REPLACE FUNCTION set_fk_to_null_if_invalid_media_analytics()
-RETURNS TRIGGER AS $$
-BEGIN
-    -- Check if the foreign key value is not NULL
-    IF NEW.jobid IS NOT NULL THEN
-        -- Check if the corresponding record exists in the parent table
-        IF NOT EXISTS (SELECT 1 FROM jobs WHERE id = NEW.jobid) THEN
-            -- If it doesn't exist, set the foreign key to NULL
-            NEW.jobid = NULL;
-        END IF;
-    END IF;
-    
-    -- Return the (potentially modified) record to be inserted/updated
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER media_analytics_fk_null
-BEFORE INSERT OR UPDATE ON media_analytics_detail
-FOR EACH ROW
-EXECUTE FUNCTION set_fk_to_null_if_invalid_media_analytics();
--- a/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/down.sql
+++ b/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_bodyshopid";
--- a/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/up.sql
+++ b/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "media_analytics_detail_bodyshopid" on
-  "public"."media_analytics_detail" using btree ("bodyshopid");
--- a/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/down.sql
+++ b/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_jobid";
--- a/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/up.sql
+++ b/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "media_analytics_detail_jobid" on
-  "public"."media_analytics_detail" using btree ("jobid");
--- a/hasura/migrations/1762823298618_create_index_media_analytics_detail_media_analytics/down.sql
+++ b/hasura/migrations/1762823298618_create_index_media_analytics_detail_media_analytics/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_media_analytics";
--- a/hasura/migrations/1762823298618_create_index_media_analytics_detail_media_analytics/up.sql
+++ b/hasura/migrations/1762823298618_create_index_media_analytics_detail_media_analytics/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "media_analytics_detail_media_analytics" on
-  "public"."media_analytics_detail" using btree ("media_analytics_id");
--- a/hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/down.sql
+++ b/hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/down.sql
@@ -1,4 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- alter table "public"."media_analytics" add column "unique_documents" numeric
--  null;
--- a/hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/up.sql
+++ b/hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/up.sql
@@ -1,2 +0,0 @@
-alter table "public"."media_analytics" add column "unique_documents" numeric
- null;
--- a/hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/down.sql
+++ b/hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/down.sql
@@ -1,4 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- alter table "public"."media_analytics" add column "duplicate_documents" numeric
--  null;
--- a/hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/up.sql
+++ b/hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/up.sql
@@ -1,2 +0,0 @@
-alter table "public"."media_analytics" add column "duplicate_documents" numeric
- null;
--- a/hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/down.sql
+++ b/hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/down.sql
@@ -1,4 +0,0 @@
-- 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 "unique_documents" numeric
--  null;
--- a/hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/up.sql
+++ b/hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/up.sql
@@ -1,2 +0,0 @@
-alter table "public"."media_analytics_detail" add column "unique_documents" numeric
- null;
--- a/hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/down.sql
+++ b/hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/down.sql
@@ -1,4 +0,0 @@
-- 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 "duplicate_documents" numeric
--  null;
--- a/hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/up.sql
+++ b/hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/up.sql
@@ -1,2 +0,0 @@
-alter table "public"."media_analytics_detail" add column "duplicate_documents" numeric
- null;
--- a/hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/down.sql
+++ b/hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/down.sql
@@ -1 +0,0 @@
-alter table "public"."media_analytics_detail" rename column "unique_document_count" to "unique_documents";
--- a/hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/up.sql
+++ b/hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/up.sql
@@ -1 +0,0 @@
-alter table "public"."media_analytics_detail" rename column "unique_documents" to "unique_document_count";
--- a/hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/down.sql
+++ b/hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/down.sql
@@ -1 +0,0 @@
-alter table "public"."media_analytics_detail" rename column "duplicate_count" to "duplicate_documents";
--- a/hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/up.sql
+++ b/hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/up.sql
@@ -1 +0,0 @@
-alter table "public"."media_analytics_detail" rename column "duplicate_documents" to "duplicate_count";
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
    "setup": "rm -rf node_modules && npm i && cd client && rm -rf node_modules && npm i",
    "setup:win": "rimraf node_modules && npm i && cd client && rimraf node_modules && npm i",
    "start": "node server.js",
-    "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\"",
+    "makeitpretty": "npm run format",
+    "format": "prettier --config .prettierrc.js --ignore-path .prettierignore --write .",
    "lint": "eslint .",
    "lint:fix": "eslint . --fix",
    "test:unit": "vitest run",
@@ -18,39 +19,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.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",
+    "@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",
    "@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.12.2",
+    "axios": "^1.11.0",
    "better-queue": "^3.8.12",
-    "bullmq": "^5.61.0",
+    "bullmq": "^5.58.5",
    "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.3",
+    "dotenv": "^17.2.2",
    "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.8.1",
+    "ioredis": "^5.7.0",
    "json-2-csv": "^5.5.9",
    "jsonwebtoken": "^9.0.2",
-    "juice": "^11.0.3",
+    "juice": "^11.0.1",
    "lodash": "^4.17.21",
    "moment": "^2.30.1",
    "moment-timezone": "^0.6.0",
@@ -61,22 +63,22 @@
    "query-string": "7.1.3",
    "recursive-diff": "^1.0.9",
    "rimraf": "^6.0.1",
-    "skia-canvas": "^3.0.8",
-    "soap": "^1.5.0",
+    "skia-canvas": "^3.0.6",
+    "soap": "^1.3.0",
    "socket.io": "^4.8.1",
    "socket.io-adapter": "^2.5.5",
    "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.10.2",
+    "twilio": "^5.9.0",
    "uuid": "^11.1.0",
-    "winston": "^3.18.3",
+    "winston": "^3.17.0",
    "winston-cloudwatch": "^6.3.0",
    "xml2js": "^0.6.2",
    "xmlbuilder2": "^3.1.1",
    "yazl": "^3.3.1"
  },
  "devDependencies": {
-    "@eslint/js": "^9.37.0",
-    "eslint": "^9.37.0",
+    "@eslint/js": "^9.35.0",
+    "eslint": "^9.35.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"}`)
 });

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

 const cors = require("cors");
 const http = require("http");
--- a/server/accounting/pbs/pbs-constants.js
+++ b/server/accounting/pbs/pbs-constants.js
@@ -6,6 +6,10 @@ const PBS_CREDENTIALS = {
 };

 exports.PBS_CREDENTIALS = PBS_CREDENTIALS;
+// const cdkDomain =
+//   process.env.NODE_ENV === "production"
+//     ? "https://3pa.dmotorworks.com"
+//     : "https://uat-3pa.dmotorworks.com";

 const pbsDomain = `https://partnerhub.pbsdealers.com/json/reply`;
 exports.PBS_ENDPOINTS = {
@@ -14,9 +18,5 @@ exports.PBS_ENDPOINTS = {
  VehicleGet: `${pbsDomain}/VehicleGet`,
  AccountingPostingChange: `${pbsDomain}/AccountingPostingChange`,
  ContactChange: `${pbsDomain}/ContactChange`,
-  VehicleChange: `${pbsDomain}/VehicleChange`,
-  RepairOrderChange: `${pbsDomain}/RepairOrderChange`, //TODO: Verify that this is correct. Docs have /reply/ in path. 
-  RepairOrderGet: `${pbsDomain}/RepairOrderGet`,
-  RepairOrderContactVehicleGet: `${pbsDomain}/RepairOrderContactVehicleGet`,
-  RepairOrderContactVehicleChange: `${pbsDomain}/RepairOrderContactVehicleChange`,
+  VehicleChange: `${pbsDomain}/VehicleChange`
 };
--- a/server/accounting/pbs/pbs-job-export.js
+++ b/server/accounting/pbs/pbs-job-export.js
@@ -19,11 +19,12 @@ axios.interceptors.request.use((x) => {
    ...x.headers[x.method],
    ...x.headers
  };
-  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${x.url
-    } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
-  //logRequestToFile(printable);
+  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
+    x.url
+  } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
+  //console.log(printable);

-  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);

  return x;
 });
@@ -31,39 +32,23 @@ axios.interceptors.request.use((x) => {
 axios.interceptors.response.use((x) => {
  const socket = x.config.socket;

-  const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
-  //logRequestToFile(printable);
-  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);
+  const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
+  //console.log(printable);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);

  return x;
 });

-const fs = require('fs');
-const path = require("path");
-function logRequestToFile(printable) {
-  try {
-    const logDir = path.join(process.cwd(), "logs");
-    if (!fs.existsSync(logDir)) {
-      fs.mkdirSync(logDir, { recursive: true });
-    }
-    const logFile = path.join(logDir, "pbs-http.log");
-    fs.appendFileSync(logFile, `${printable}\n`);
-  } catch (err) {
-    console.error("Unexpected error in logRequestToFile:", err);
-  }
-}
-
-
 exports.default = async function (socket, { txEnvelope, jobid }) {
  socket.logEvents = [];
  socket.recordid = jobid;
  socket.txEnvelope = txEnvelope;
  try {
-    CdkBase.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);

    const JobData = await QueryJobData(socket, jobid);
    socket.JobData = JobData;
-    CdkBase.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Querying the DMS for the Vehicle Record.`);
    //Query for the Vehicle record to get the associated customer.
    socket.DmsVeh = await QueryVehicleFromDms(socket);
    //Todo: Need to validate the lines and methods below.
@@ -84,52 +69,42 @@ exports.default = async function (socket, { txEnvelope, jobid }) {

 exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
  try {
-    socket.selectedCustomerId = selectedCustomerId;
-    if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
-      CdkBase.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);
+    if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle === false) {
+      CdkBase.createLogEvent(socket, "DEBUG", `User selected customer ${selectedCustomerId || "NEW"}`);

      //Upsert the contact information as per Wafaa's Email.
      CdkBase.createLogEvent(
        socket,
-        "INFO",
-        `Upserting contact information to DMS for ${socket.JobData.ownr_fn || ""
+        "DEBUG",
+        `Upserting contact information to DMS for ${
+          socket.JobData.ownr_fn || ""
        } ${socket.JobData.ownr_ln || ""} ${socket.JobData.ownr_co_nm || ""}`
      );
      const ownerRef = await UpsertContactData(socket, selectedCustomerId);
-      socket.ownerRef = ownerRef;
-      CdkBase.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
-      const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
-      socket.vehicleRef = vehicleRef;
+
+      CdkBase.createLogEvent(socket, "DEBUG", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
+      await UpsertVehicleData(socket, ownerRef.ReferenceId);
    } else {
      CdkBase.createLogEvent(
        socket,
-        "INFO",
-        `Contact and Vehicle updates disabled. Querying data and skipping to accounting data insert.`
+        "DEBUG",
+        `Contact and Vehicle updates disabled. Skipping to accounting data insert.`
      );
-      //Must query for records to insert $0 RO. 
-      if (!socket.ownerRef) {
-        const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
-        socket.ownerRef = ownerRef;
-      }
-      const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
-      socket.vehicleRef = vehicleRef;
    }
-    CdkBase.createLogEvent(socket, "INFO", `Inserting accounting posting data..`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Inserting account data.`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Inserting accounting posting data..`);
    const insertResponse = await InsertAccountPostingData(socket);

    if (insertResponse.WasSuccessful) {
-      if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {
-
-        await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef)
-      }
-      CdkBase.createLogEvent(socket, "INFO", `Marking job as exported.`);
+      CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported.`);
      await MarkJobExported(socket, socket.JobData.id);
+
      socket.emit("export-success", socket.JobData.id);
    } else {
      CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
    }
  } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
    await InsertFailedExportLog(socket, error);
  }
 };
@@ -137,22 +112,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
 // Was Successful
 async function CheckForErrors(socket, response) {
  if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
-    CdkBase.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Successful response from DMS. ${response.Message || ""}`);
  } else {
    CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
-    CdkBase.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
+    CdkBase.createLogEvent(socket, "SILLY", `Error received from DMS: ${JSON.stringify(response)}`);
  }
 }

 exports.CheckForErrors = CheckForErrors;

 async function QueryJobData(socket, jobid) {
-  CdkBase.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
  const result = await client
    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
    .request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
-  CdkBase.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
  return result.jobs_by_pk;
 }

@@ -272,15 +247,15 @@ async function UpsertContactData(socket, selectedCustomerId) {
          Code: socket.JobData.owner.accountingid,
          ...(socket.JobData.ownr_co_nm
            ? {
-              //LastName: socket.JobData.ownr_ln,
-              FirstName: socket.JobData.ownr_co_nm,
-              IsBusiness: true
-            }
+                //LastName: socket.JobData.ownr_ln,
+                FirstName: socket.JobData.ownr_co_nm,
+                IsBusiness: true
+              }
            : {
-              LastName: socket.JobData.ownr_ln,
-              FirstName: socket.JobData.ownr_fn,
-              IsBusiness: false
-            }),
+                LastName: socket.JobData.ownr_ln,
+                FirstName: socket.JobData.ownr_fn,
+                IsBusiness: false
+              }),

          //Salutation: "String",
          //MiddleName: "String",
@@ -357,7 +332,7 @@ async function UpsertVehicleData(socket, ownerRef) {
          //FleetNumber: "String",
          //Status: "String",
          OwnerRef: ownerRef, // "00000000000000000000000000000000",
-          // ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
+          ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
          Make: socket.JobData.v_make_desc,
          Model: socket.JobData.v_model_desc,
          Trim: socket.JobData.vehicle && socket.JobData.vehicle.v_trimcode,
@@ -365,7 +340,7 @@ async function UpsertVehicleData(socket, ownerRef) {
          Year: socket.JobData.v_model_yr,
          Odometer: socket.JobData.kmout,
          ExteriorColor: {
-            // Code: socket.JobData.v_color,
+            Code: socket.JobData.v_color,
            Description: socket.JobData.v_color
          }
          // InteriorColor: { Code: "String", Description: "String" },
@@ -495,57 +470,6 @@ async function UpsertVehicleData(socket, ownerRef) {
  }
 }

-async function GetVehicleData(socket, ownerRef) {
-  try {
-    const { data: { Vehicles } } = await axios.post(
-      PBS_ENDPOINTS.VehicleGet,
-      {
-        SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
-        // "VehicleId": "00000000000000000000000000000000",
-        // "Year": "String",
-        // "YearFrom": "String",
-        // "YearTo": "String",
-        // "Make": "String",
-        // "Model": "String",
-        // "Trim": "String",
-        // "ModelNumber": "String",
-        // "StockNumber": "String",
-        VIN: socket.JobData.v_vin,
-        // "LicenseNumber": "String",
-        // "Lot": "String",
-        // "Status": "String",
-        // "StatusList": ["String"],
-        // "OwnerRef": "00000000000000000000000000000000",
-        // "ModifiedSince": "0001-01-01T00:00:00.0000000Z",
-        // "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
-        // "LastSaleSince": "0001-01-01T00:00:00.0000000Z",
-        // "VehicleIDList": ["00000000000000000000000000000000"],
-        // "IncludeInactive": false,
-        // "IncludeBuildVehicles": false,
-        // "IncludeBlankLot": false,
-        // "ShortVIN": "String",
-        // "ResultLimit": 0,
-        // "LotAccessDivisions": [0],
-        // "OdometerTo": 0,
-        // "OdometerFrom": 0
-      }
-      ,
-      { auth: PBS_CREDENTIALS, socket }
-    );
-    CheckForErrors(socket, Vehicles);
-    if (Vehicles.length === 1) {
-      return Vehicles[0];
-
-    } else {
-      CdkBase.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
-    }
-  } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
-    throw new Error(error);
-  }
-}
-
-
 async function InsertAccountPostingData(socket) {
  try {
    const allocations = await CalculateAllocations(socket, socket.JobData.id);
@@ -648,7 +572,7 @@ async function InsertAccountPostingData(socket) {
 }

 async function MarkJobExported(socket, jobid) {
-  CdkBase.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
  const result = await client
    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
@@ -694,158 +618,3 @@ async function InsertFailedExportLog(socket, error) {
    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
  }
 }
-
-
-async function CreateRepairOrderInPBS(socket) {
-  try {
-    const { RepairOrders } = await RepairOrderGet(socket);
-    if (RepairOrders.length === 0) {
-      const InsertedRepairOrder = await RepairOrderChange(socket)
-      socket.InsertedRepairOrder = InsertedRepairOrder;
-      CdkBase.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
-
-    } else if (RepairOrders.length > 0) {
-      //Find out if it's a matching RO. 
-      //This logic is used because the integration will simply add another line to an open RO if it exists. 
-      const matchingRo = RepairOrders.find(ro => ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase()))
-      if (!matchingRo) {
-        CdkBase.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
-        const InsertedRepairOrder = await RepairOrderChange(socket)
-        socket.InsertedRepairOrder = InsertedRepairOrder;
-      } else {
-        CdkBase.createLogEvent(socket, "WARN", `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`);
-      }
-    }
-  } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
-  }
-}
-
-async function RepairOrderGet(socket) {
-  try {
-    const { data: RepairOrderGet } = await axios.post(
-      PBS_ENDPOINTS.RepairOrderGet,
-      {
-        SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
-        //"RepairOrderId": "374728766",
-        //"RepairOrderNumber": "4" || socket.JobData.ro_number,
-        //"RawRepairOrderNumber": socket.JobData.ro_number,
-        // "Tag": "String",
-        //"ContactRef": socket.contactRef,
-        // "ContactRefList": ["00000000000000000000000000000000"],
-        "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
-        // "VehicleRefList": ["00000000000000000000000000000000"],
-        // "Status": "String",
-        // "CashieredSince": "0001-01-01T00:00:00.0000000Z",
-        // "CashieredUntil": "0001-01-01T00:00:00.0000000Z",
-        // "OpenDateSince": "0001-01-01T00:00:00.0000000Z",
-        // "OpenDateUntil": "0001-01-01T00:00:00.0000000Z",
-        //"ModifiedSince": "2025-01-01T00:00:00.0000000Z",
-        // "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
-        // "Shop": "String"
-      },
-      { auth: PBS_CREDENTIALS, socket }
-    );
-    CheckForErrors(socket, RepairOrderGet);
-    return RepairOrderGet;
-  } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
-    throw new Error(error);
-  }
-}
-
-async function RepairOrderChange(socket) {
-  try {
-    const { data: RepairOrderChangeResponse } = await axios.post(
-      PBS_ENDPOINTS.RepairOrderChange,
-      { //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
-        "RepairOrderInfo": {
-          //"Id": "string/00000000-0000-0000-0000-000000000000",
-          //"RepairOrderId": "00000000000000000000000000000000",
-          SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
-          "RepairOrderNumber": "00000000000000000000000000000000", //This helps force a new RO. 
-          "RawRepairOrderNumber": "00000000000000000000000000000000",
-          // "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
-          // "RawRepairOrderNumber": socket.JobData.ro_number,
-          "DateOpened": moment(),
-          // "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
-          // "DateCashiered": "0001-01-01T00:00:00.0000000Z",
-          // "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
-          "DatePromised": socket.JobData.scheduled_completion,
-          // "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
-          "DateVehicleCompleted": socket.JobData.actual_completion,
-          // "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
-          // "CSR": "String",
-          // "CSRRef": "00000000000000000000000000000000",
-          // "BookingUser": "String",
-          // "BookingUserRef": "00000000000000000000000000000000",
-          "ContactRef": socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
-          "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
-          "MileageIn": socket.JobData.km_in,
-          "Tag": "BODYSHOP",
-          //"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
-          Requests: [
-            {
-              // "RepairOrderRequestRef": "b1842ecad62c4279bbc2fef4f6bf6cde",
-              // "RepairOrderRequestId": 1,
-              // "CSR": "PBS",
-              // "CSRRef": "1ce12ac692564e94bda955d529ee911a",
-              // "Skill": "GEN",
-              "RequestCode": "MISC",
-              "RequestDescription": `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
-              "Status": "Completed",
-              // "TechRef": "00000000000000000000000000000000",
-              "AllowedHours": 0,
-              "EstimateLabour": 0,
-              "EstimateParts": 0,
-              "ComeBack": false,
-              "AddedOperation": true,
-              "PartLines": [],
-              "PartRequestLines": [],
-              "LabourLines": [],
-              "SubletLines": [],
-              "TimePunches": [],
-              "Summary": {
-                "Labour": 0,
-                "Parts": 0,
-                "OilGas": 0,
-                "SubletTow": 0,
-                "Misc": 0,
-                "Environment": 0,
-                "ShopSupplies": 0,
-                "Freight": 0,
-                "WarrantyDeductible": 0,
-                "Discount": 0,
-                "SubTotal": 0,
-                "Tax1": 0,
-                "Tax2": 0,
-                "InvoiceTotal": 0,
-                "CustomerDeductible": 0,
-                "GrandTotal": 0,
-                "LabourDiscount": 0,
-                "PartDiscount": 0,
-                "ServiceFeeTotal": 0,
-                "OEMDiscount": 0
-              },
-              "LineType": "RequestLine",
-            },
-          ],
-
-          "Memo": socket.txEnvelope.story,
-
-        },
-        "IsAsynchronous": false,
-        // "UserRequest": "String",
-        // "UserRef": "00000000000000000000000000000000"
-      }
-
-      ,
-      { auth: PBS_CREDENTIALS, socket }
-    );
-    CheckForErrors(socket, RepairOrderChangeResponse);
-    return RepairOrderChangeResponse;
-  } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
-    throw new Error(error);
-  }
-}
--- 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/accounting/qbo/qbo-payables.js
+++ b/server/accounting/qbo/qbo-payables.js
@@ -205,49 +205,21 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {

 async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) {
  const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, bill.job.shopid);
-  let lines;
-  if (bodyshop.accountingconfig.accumulatePayableLines === true) {
-    lines = Object.values(
-      bill.billlines.reduce((acc, il) => {
-        const { cost_center, actual_cost, quantity = 1 } = il;

-        if (!acc[cost_center]) {
-          acc[cost_center] = { ...il, actual_cost: 0, quantity: 1 };
-        }
+  const lines = bill.billlines.map((il) =>
+    generateBillLine(
+      il,
+      accounts,
+      bill.job.class,
+      bodyshop.md_responsibility_centers.sales_tax_codes,
+      classes,
+      taxCodes,
+      bodyshop.md_responsibility_centers.costs,
+      bodyshop.accountingconfig,
+      bodyshop.region_config
+    )
+  );

-        acc[cost_center].actual_cost += Math.round(actual_cost * quantity * 100);
-
-        return acc;
-      }, {})
-    ).map((il) => {
-      il.actual_cost /= 100;
-      return generateBillLine(
-        il,
-        accounts,
-        bill.job.class,
-        bodyshop.md_responsibility_centers.sales_tax_codes,
-        classes,
-        taxCodes,
-        bodyshop.md_responsibility_centers.costs,
-        bodyshop.accountingconfig,
-        bodyshop.region_config
-      );
-    });
-  } else {
-    lines = bill.billlines.map((il) =>
-      generateBillLine(
-        il,
-        accounts,
-        bill.job.class,
-        bodyshop.md_responsibility_centers.sales_tax_codes,
-        classes,
-        taxCodes,
-        bodyshop.md_responsibility_centers.costs,
-        bodyshop.accountingconfig,
-        bodyshop.region_config
-      )
-    );
-  }
  //QB USA with GST
  //This was required for the No. 1 Collision Group.
  if (
@@ -269,7 +241,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
      Amount: Dinero({
        amount: Math.round(
          bill.billlines.reduce((acc, val) => {
-            return acc + (val.applicable_taxes?.federal ? val.actual_cost * val.quantity || 0 : 0);
+            return acc + (val.applicable_taxes?.federal ? (val.actual_cost * val.quantity ?? 0) : 0);
          }, 0) * 100
        )
      })
--- a/server/accounting/qbxml/qbxml-payables.js
+++ b/server/accounting/qbxml/qbxml-payables.js
@@ -46,28 +46,6 @@ exports.default = async (req, res) => {
 };

 const generateBill = (bill, bodyshop) => {
-  let lines;
-  if (bodyshop.accountingconfig.accumulatePayableLines === true) {
-    lines = Object.values(
-      bill.billlines.reduce((acc, il) => {
-        const { cost_center, actual_cost, quantity = 1 } = il;
-
-        if (!acc[cost_center]) {
-          acc[cost_center] = { ...il, actual_cost: 0, quantity: 1 };
-        }
-
-        acc[cost_center].actual_cost += Math.round(actual_cost * quantity * 100);
-
-        return acc;
-      }, {})
-    ).map((il) => {
-      il.actual_cost /= 100;
-      return generateBillLine(il, bodyshop.md_responsibility_centers, bill.job.class);
-    });
-  } else {
-    lines = bill.billlines.map((il) => generateBillLine(il, bodyshop.md_responsibility_centers, bill.job.class));
-  }
-
  const billQbxmlObj = {
    QBXML: {
      QBXMLMsgsRq: {
@@ -89,7 +67,9 @@ const generateBill = (bill, bodyshop) => {
              }),
            RefNumber: bill.invoice_number,
            Memo: `RO ${bill.job.ro_number || ""}`,
-            ExpenseLineAdd: lines
+            ExpenseLineAdd: bill.billlines.map((il) =>
+              generateBillLine(il, bodyshop.md_responsibility_centers, bill.job.class)
+            )
          }
        }
      }
--- a/server/data/analytics/documents.js
+++ b/server/data/analytics/documents.js
@@ -1,37 +0,0 @@
-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/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`DROP TABLE "public"."media_analytics_detail";`
				`@@ -1 +0,0 @@`
				`alter table "public"."media_analytics_detail" alter column "jobid" set not null;`
				`@@ -1 +0,0 @@`
				`ALTER TABLE "public"."media_analytics" ALTER COLUMN "total_size_bytes" TYPE integer;`
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."media_analytics_detail_bodyshopid";`