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

.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]

.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

.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
 }

_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.
-

_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.
-

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>

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",
+    "libphonenumber-js": "^1.12.15",
-    "lightningcss": "^1.30.2",
     "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",
+    "@eslint/js": "^9.33.0",
-    "@playwright/test": "^1.56.0",
+    "@playwright/test": "^1.55.0",
-    "@sentry/webpack-plugin": "^4.3.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",
+    "chalk": "^5.6.0",
-    "eslint": "^9.37.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",

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 imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
-  const splitClient = useSplitClient({ key: imexshopid || "anon" });
+  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) => ({
+function AppContainer({ currentUser, setDarkMode }) {
-  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode)),
-  signOutStart: () => dispatch(signOutStart())
-});
-
-function AppContainer({ currentUser, setDarkMode, signOutStart }) {
   const { t } = useTranslation();
   const isDarkMode = useSelector(selectDarkMode);
   const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
 
-  // Global seamless logout listener with redirect to /signin
+  // Update data-theme attribute when dark mode changes
-  useEffect(() => {
-    const handleSeamlessLogout = (event) => {
-      if (event.data?.type !== "seamlessLogoutRequest") return;
-
-      const requestOrigin = event.origin;
-
-      if (currentUser?.authorized !== true) {
-        window.parent.postMessage(
-          { type: "seamlessLogoutResponse", status: "already_logged_out" },
-          requestOrigin || "*"
-        );
-        return;
-      }
-
-      signOutStart();
-      window.parent.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, requestOrigin || "*");
-    };
-
-    window.addEventListener("message", handleSeamlessLogout);
-    return () => {
-      window.removeEventListener("message", handleSeamlessLogout);
-    };
-  }, [signOutStart, currentUser]);
-
-  // Update data-theme attribute
   useEffect(() => {
     document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
     return () => document.documentElement.removeAttribute("data-theme");
   }, [isDarkMode]);
 
-  // Sync 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));

client/src/App/App.jsx

@@ -138,7 +138,7 @@ export function App({
     );
   }
 
-  if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
+  if (currentEula && !currentUser.eulaIsAccepted) {
     return <Eula />;
   }
 

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

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

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

@@ -45,7 +45,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-        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",
+              width: "20rem",
-              // maxWidth: "20rem",
+              maxWidth: "20rem",
-              minWidth: "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`,

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),
+          name: `${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-          label: generateLineName(item)
+            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);

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:
+    skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
-      !open ||
-      !conversation.job_conversations ||
-      conversation.job_conversations.length === 0 ||
-      bodyshop.uselocalmediaserver
   });
 
   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([]);
-    setSelectedMedia((prev) => prev.map((m) => ({ ...m, isSelected: false })));
   }, [setSelectedMedia, conversation]);
 
   //Knowingly taking on the technical debt of poor implementation below. Done this way to avoid an edge case where no component may be displayed.
@@ -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}>

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

@@ -142,37 +142,17 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
             title={t("job_lifecycle.content.legend_title")}
             style={{ marginTop: "10px" }}
           >
-            <div
+            <div>
-              style={{
-                display: "flex",
-                flexWrap: "wrap",
-                gap: 8
-              }}
-            >
               {lifecycleData.summations.map((key) => (
-                <Tag
+                <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
-                  key={key.status}
-                  color={key.color}
-                  style={{
-                    // IMPORTANT: let the tag grow with its content
-                    width: "auto",
-                    padding: 0,
-                    margin: 0,
-                    display: "inline-flex",
-                    alignItems: "center",
-                    justifyContent: "center",
-                    boxSizing: "border-box"
-                  }}
-                >
                   <div
                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     style={{
                       backgroundColor: "var(--tag-wrapper-bg)",
                       color: "var(--tag-wrapper-text)",
-                      padding: "4px 8px",
+                      padding: "4px",
-                      textAlign: "center",
+                      textAlign: "center"
-                      whiteSpace: "nowrap" // keep it on one line while letting the pill expand
                     }}
                   >
                     {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})

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 { UPDATE_DASHBOARD_LAYOUT } from "../../graphql/user.queries";
-import { QUERY_DASHBOARD_BODYSHOP } from "../../graphql/bodyshop.queries";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { GenerateDashboardData } from "./dashboard-grid.utils";
@@ -24,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
+  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
-  const DEFAULT_COLS = 12;
+  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
-  const DEFAULT_Y_POSITION = 1000;
-  const GRID_BREAKPOINTS = { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 };
-  const GRID_COLS = { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 };
 
-  // Fetch dashboard layout data
+  const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
-  const { data: layoutData } = useQuery(QUERY_USER_DASHBOARD_LAYOUT, {
-    variables: { email: currentUser.email },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    skip: !currentUser?.email
-  });
-
-  // Fetch minimal bodyshop data for components
-  const {
-    loading,
-    error,
-    data: bodyshopData
-  } = useQuery(QUERY_DASHBOARD_BODYSHOP, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
 
   const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);
 
-  // Memoize layout state initialization
+  const handleLayoutChange = async (layout, layouts) => {
-  const initialState = useMemo(() => {
-    const persisted = layoutData?.users?.[0]?.dashboardlayout;
-    if (persisted) {
-      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = persisted;
-      return {
-        items: Array.isArray(items) ? items : [],
-        layout: Array.isArray(layout) ? layout : [],
-        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
-        cols
-      };
-    }
-    return { items: [], layout: [], layouts: {}, cols: DEFAULT_COLS };
-  }, [layoutData]);
-
-  const [state, setState] = useState(initialState);
-
-  // Update state when layout data changes
-  useEffect(() => {
-    if (layoutData?.users?.[0]?.dashboardlayout) {
-      const { items = [], layout = [], layouts = {}, cols = DEFAULT_COLS } = layoutData.users[0].dashboardlayout;
-      setState({
-        items: Array.isArray(items) ? items : [],
-        layout: Array.isArray(layout) ? layout : [],
-        layouts: typeof layouts === "object" && !Array.isArray(layouts) ? layouts : {},
-        cols
-      });
-    }
-  }, [layoutData]);
-
-  // Get bodyshop data for components
-  const bodyshop = bodyshopData?.dashboard_bodyshops?.[0];
-
-  // DRY helper function to update layout in database and cache
-  const updateLayoutAndCache = async (updatedLayout, errorContext = "updating layout") => {
     try {
-      const { data: result } = await updateLayout({
+      logImEXEvent("dashboard_change_layout");
-        variables: { email: currentUser.email, layout: updatedLayout }
+
+      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 (result?.errors && result.errors.length) {
-
+        const errorMessages = result.errors.map((e) => e?.message || String(e));
-      if (errors.length) {
-        const errorMessages = errors.map(({ message }) => message || String(error));
         notification.error({
           message: t("dashboard.errors.updatinglayout", {
             message: errorMessages.join("; ")
           })
         });
-        return false;
       }
-
-      return true;
     } catch (err) {
-      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 handleRemoveComponent = (key) => {
-  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
-
-  const {
-    loading: dashboardLoading,
-    error: dashboardError,
-    data: dashboardQueryData,
-    refetch
-  } = useQuery(dashboardQueryDoc, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
-
-  const dashboardData = useMemo(() => GenerateDashboardData(dashboardQueryData), [dashboardQueryData]);
-
-  // Memoize existing layout keys to prevent unnecessary recalculations
-  const existingLayoutKeys = useMemo(() => state.items.map(({ i }) => i), [state.items]);
-
-  // Memoize menu items to prevent unnecessary recalculations
-  const menuItems = useMemo(
-    () =>
-      Object.entries(componentList).map(([key, { label }]) => ({
-        key,
-        label,
-        value: key,
-        disabled: existingLayoutKeys.includes(key)
-      })),
-    [existingLayoutKeys]
-  );
-
-  if (loading || dashboardLoading) return <LoadingSkeleton message={t("general.labels.loading")} />;
-  if (error || dashboardError) return <AlertComponent message={(error || dashboardError).message} type="error" />;
-
-  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
-    setState((prev) => ({ ...prev, layout, layouts }));
-    await updateLayoutAndCache({ ...state, layout, layouts }, "layout change");
-  };
-
-  const handleRemoveComponent = async (key) => {
     logImEXEvent("dashboard_remove_component", { name: key });
-    const updatedState = { ...state, items: state.items.filter((item) => item.i !== key) };
+    const idxToRemove = state.items.findIndex((i) => i.i === key);
-    setState(updatedState);
+
-    await updateLayoutAndCache(updatedState, "component removal");
+    const items = cloneDeep(state.items);
+
+    items.splice(idxToRemove, 1);
+    setState({ ...state, items });
   };
 
-  const handleAddComponent = async ({ key }) => {
+  const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { key });
+    // Avoid passing the full AntD menu click event (contains circular refs) to analytics
-    const { minW = 1, minH = 1, w: baseW = 2, h: baseH = 2 } = componentList[key] || {};
+    logImEXEvent("dashboard_add_component", { key: e.key });
-    const nextItems = [
+    const compSpec = componentList[e.key] || {};
-      ...state.items,
+    const minW = compSpec.minW || 1;
-      {
+    const minH = compSpec.minH || 1;
-        i: key,
+    const baseW = compSpec.w || 2;
-        x: (state.items.length * 2) % (state.cols || DEFAULT_COLS),
+    const baseH = compSpec.h || 2;
-        y: DEFAULT_Y_POSITION,
+    setState((prev) => {
-        w: Math.max(baseW, minW),
+      const nextItems = [
-        h: Math.max(baseH, minH)
+        ...prev.items,
-      }
+        {
-    ];
+          i: e.key,
-    const updatedState = { ...state, items: nextItems };
+          // Position near bottom: use a large y so RGL places it last without triggering cascading relayout loops
-    setState(updatedState);
+          x: (prev.items.length * 2) % (prev.cols || 12),
-    await updateLayoutAndCache(updatedState, "component addition");
+          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}
+        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
-        cols={GRID_COLS}
+        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),
+            w: Math.max(item.w || spec.w || minW, minW),
-            h: Math.max(item.h || specH || minH, minH)
+            h: Math.max(item.h || spec.h || minH, minH)
           };
-
           return (
             <div
               key={safeItem.i}

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 &&

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

client/src/components/eula/eula.component.jsx

@@ -55,8 +55,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
     const useremail = currentUser.email;
 
     try {
-      // eslint-disable-next-line no-unused-vars
+      const { ...otherFormValues } = formValues;
-      const { accepted_terms, ...otherFormValues } = formValues;
 
       // Trim the values of the fields before submitting
       const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {

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>
   );

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

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

@@ -222,37 +222,17 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
                 </div>
               </BlurWrapperComponent>
               <Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
-                <div
+                <div>
-                  style={{
-                    display: "flex",
-                    flexWrap: "wrap",
-                    gap: 8
-                  }}
-                >
                   {lifecycleData.durations.summations.map((key) => (
-                    <Tag
+                    <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
-                      key={key.status}
-                      color={key.color}
-                      style={{
-                        // let the tag grow with its content
-                        width: "auto",
-                        padding: 0,
-                        margin: 0,
-                        display: "inline-flex",
-                        alignItems: "center",
-                        justifyContent: "center",
-                        boxSizing: "border-box"
-                      }}
-                    >
                       <div
                         aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         style={{
                           backgroundColor: "var(--tag-wrapper-bg)",
                           color: "var(--tag-wrapper-text)",
-                          padding: "4px 8px",
+                          padding: "4px",
-                          textAlign: "center",
+                          textAlign: "center"
-                          whiteSpace: "nowrap" // single line; tag gets wider instead of text escaping
                         }}
                       >
                         {key.status} (

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 }) {
+export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
-  const { t } = useTranslation();
   const partsStatus = useMemo(() => {
     if (!parts) return null;
-    const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
     return parts.reduce(
       (acc, val) => {
         if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
         acc.total = acc.total + val.count;
         acc[val.status] = acc[val.status] + val.count;
+
         return acc;
       },
       {
         total: 0,
         null: 0,
-        ...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
+    <Row>
-      style={{
+      <Col {...defaultColLayout}>
-        display: "grid",
+        <Tooltip title="Total">
-        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
+          <Tag>{partsStatus.total}</Tag>
-        gap: "8px",
+        </Tooltip>
-        width: "100%",
+      </Col>
-        justifyItems: "start"
+      <Col {...defaultColLayout}>
-      }}
+        <Tooltip title="No Status">
-    >
+          <Tag color="gold">{partsStatus["null"]}</Tag>
-      <Tooltip title="Total">
+        </Tooltip>
-        <Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
+      </Col>
-      </Tooltip>
+      <Col {...defaultColLayout}>
-      <Tooltip title={t("dashboard.errors.status_normal")}>
+        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-        <Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
+          <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
-          {partsStatus["null"]}
+        </Tooltip>
-        </Tag>
+      </Col>
-      </Tooltip>
+      <Col {...defaultColLayout}>
-      <Tooltip title={bodyshop.md_order_statuses.default_bo}>
+        <Tooltip title={bodyshop.md_order_statuses.default_received}>
-        <Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
+          <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
-          {partsStatus[bodyshop.md_order_statuses.default_bo]}
+        </Tooltip>
-        </Tag>
+      </Col>
-      </Tooltip>
+      <Col {...defaultColLayout}>
-      <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
+        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-        <Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
+          <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
-          {partsStatus[bodyshop.md_order_statuses.default_ordered]}
+        </Tooltip>
-        </Tag>
+      </Col>
-      </Tooltip>
+      <Col {...defaultColLayout}>
-      <Tooltip title={bodyshop.md_order_statuses.default_received}>
+        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-        <Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
+          <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
-          {partsStatus[bodyshop.md_order_statuses.default_received]}
+        </Tooltip>
-        </Tag>
+      </Col>
-      </Tooltip>
+    </Row>
-      <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-        <Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_returned]}
-        </Tag>
-      </Tooltip>
-    </div>
   );
 }

client/src/components/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)}

client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx

@@ -35,14 +35,16 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
     ...galleryImages.other.filter((image) => image.isSelected)
   ];
 
-  const downloadProgress = ({ loaded }) => {
+  function downloadProgress(progressEvent) {
-    setDownload((currentDownloadState) => ({
+    setDownload((currentDownloadState) => {
-      downloaded: loaded ?? 0,
+      return {
-      speed: (loaded ?? 0) - (currentDownloadState?.downloaded ?? 0)
+        downloaded: progressEvent.loaded || 0,
-    }));
+        speed: (progressEvent.loaded || 0) - ((currentDownloadState && currentDownloadState.downloaded) || 0)
-  };
+      };
+    });
+  }
 
-  const standardMediaDownload = (bufferData) => {
+  function standardMediaDownload(bufferData) {
     try {
       const a = document.createElement("a");
       const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -53,26 +55,29 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
       setLoading(false);
       setDownload(null);
     }
-  };
+  }
 
   const handleDownload = async () => {
     logImEXEvent("jobs_documents_download");
     setLoading(true);
     try {
-      const { data } = await axios({
+      const response = await axios({
         url: "/media/imgproxy/download",
         method: "POST",
         responseType: "blob",
         data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
         onDownloadProgress: downloadProgress
       });
-      // Use the response data (Blob) to trigger download
+
-      standardMediaDownload(data);
-    } catch {
-      // handle error (optional)
-    } finally {
       setLoading(false);
       setDownload(null);
+
+      // Use the response data (Blob) to trigger download
+      standardMediaDownload(response.data);
+    } catch {
+      setLoading(false);
+      setDownload(null);
+      // handle error (optional)
     }
   };
 

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -76,14 +76,14 @@ function JobsDocumentsImgproxyComponent({
               <SyncOutlined />
             </Button>
             <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
-            {!billId && (
-              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
-            )}
             <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
             <JobsDocumentsDeleteButton
               galleryImages={galleryImages}
               deletionCallback={billsCallback || fetchThumbnails || refetch}
             />
+            {!billId && (
+              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
+            )}
           </Space>
         </Col>
         {!hasMediaAccess && (

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.delete.component.jsx

@@ -67,7 +67,7 @@ export default function JobsDocumentsImgproxyDeleteButton({ galleryImages, delet
       okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
+      <Button disabled={imagesToDelete.length < 1} loading={loading}>
         {t("documents.actions.delete")}
       </Button>
     </Popconfirm>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -107,8 +107,8 @@ export function JobsDocumentsLocalGallery({
             <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
               <Button>{t("documents.labels.openinexplorer")}</Button>
             </a>
-            <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
             <JobsDocumentsLocalGalleryReassign jobid={job.id} />
+            <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
             <JobsLocalGalleryDownloadButton job={job} />
             <JobsDocumentsLocalDeleteButton jobid={job.id} />
           </Space>

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

@@ -28,8 +28,6 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   const [loading, setLoading] = useState(false);
 
-  const imagesToDelete = (allMedia?.[jobid] || []).filter((i) => i.isSelected);
-
   const handleDelete = async () => {
     logImEXEvent("job_documents_delete");
     setLoading(true);
@@ -38,7 +36,7 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
       `${bodyshop.localmediaserverhttp}/jobs/delete`,
       {
         jobid: jobid,
-        files: imagesToDelete.map((i) => i.filename)
+        files: (allMedia?.[jobid] || []).filter((i) => i.isSelected).map((i) => i.filename)
       },
       { headers: { ims_token: bodyshop.localmediatoken } }
     );
@@ -62,17 +60,14 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   return (
     <Popconfirm
-      disabled={imagesToDelete.length < 1}
       icon={<QuestionCircleOutlined style={{ color: "red" }} />}
       onConfirm={handleDelete}
       title={t("documents.labels.confirmdelete")}
       okText={t("general.actions.delete")}
-      okButtonProps={{ danger: true }}
+      okButtonProps={{ type: "danger" }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
+      <Button loading={loading}>{t("documents.actions.delete")}</Button>
-        {t("documents.actions.delete")}
-      </Button>
     </Popconfirm>
   );
 }

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.download.jsx

@@ -1,8 +1,8 @@
-import { Button, Space } from "antd";
+import { Button } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import cleanAxios from "../../utils/CleanAxios";
-import formatBytes from "../../utils/formatbytes";
+
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAllMedia } from "../../redux/media/media.selectors";
@@ -19,63 +19,45 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsLocalGalleryDown
 
 export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
   const { t } = useTranslation();
-  const [loading, setLoading] = useState(false);
+  const [download, setDownload] = useState(null);
-  const [download, setDownload] = useState(false);
 
-  const imagesToDownload = (allMedia?.[job.id] || []).filter((i) => i.isSelected);
+  function downloadProgress(progressEvent) {
-
+    setDownload((currentDownloadState) => {
-  const downloadProgress = ({ loaded }) => {
+      return {
-    setDownload((currentDownloadState) => ({
+        downloaded: progressEvent.loaded || 0,
-      downloaded: loaded || 0,
+        speed: (progressEvent.loaded || 0) - (currentDownloadState?.downloaded || 0)
-      speed: (loaded || 0) - (currentDownloadState?.downloaded || 0)
+      };
-    }));
+    });
-  };
+  }
-
-  const standardMediaDownload = (bufferData, filename) => {
-    try {
-      const a = document.createElement("a");
-      const url = window.URL.createObjectURL(new Blob([bufferData]));
-      a.href = url;
-      a.download = `${filename}.zip`;
-      a.click();
-    } catch {
-      setLoading(false);
-      setDownload(null);
-    }
-  };
 
   const handleDownload = async () => {
-    const { localmediaserverhttp, localmediatoken } = bodyshop;
+    const theDownloadedZip = await cleanAxios.post(
-    const { id, ro_number } = job;
+      `${bodyshop.localmediaserverhttp}/jobs/download`,
-    setLoading(true);
+      {
-    try {
+        jobid: job.id,
-      const response = await cleanAxios.post(
+        files: (allMedia?.[job.id] || []).filter((i) => i.isSelected).map((i) => i.filename)
-        `${localmediaserverhttp}/jobs/download`,
+      },
-        {
+      {
-          jobid: id,
+        headers: { ims_token: bodyshop.localmediatoken },
-          files: imagesToDownload.map((i) => i.filename)
+        responseType: "arraybuffer",
-        },
+        onDownloadProgress: downloadProgress
-        {
+      }
-          headers: { ims_token: localmediatoken },
+    );
-          responseType: "arraybuffer",
+    setDownload(null);
-          onDownloadProgress: downloadProgress
+    standardMediaDownload(theDownloadedZip.data, job.ro_number);
-        }
-      );
-      standardMediaDownload(response.data, ro_number);
-    } catch {
-      // handle error (optional)
-    } finally {
-      setLoading(false);
-      setDownload(null);
-    }
   };
 
   return (
-    <Button disabled={imagesToDownload < 1} loading={download || loading} onClick={handleDownload}>
+    <Button loading={!!download} onClick={handleDownload}>
-      <Space>
+      {t("documents.actions.download")}
-        <span>{t("documents.actions.download")}</span>
-        {download && <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(download.speed)} / second)`}</span>}
-      </Space>
     </Button>
   );
 }
+
+function standardMediaDownload(bufferData, filename) {
+  const a = document.createElement("a");
+  const url = window.URL.createObjectURL(new Blob([bufferData]));
+  a.href = url;
+  a.download = `${filename}.zip`;
+  a.click();
+}

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 { useEffect } from "react";
-import LocalMediaGrid from "./local-media-grid.component";
+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);
 
-/**
+function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia }) {
- * JobDocumentsLocalGalleryExternal
- * Fetches and displays job-related image media using the custom LocalMediaGrid.
- *
- * Props:
- *  - jobId: string | number (required to fetch media)
- *  - externalMediaState: [imagesArray, setImagesFn] (state lifted to parent for shared selection)
- *  - getJobMedia: dispatching function to retrieve media for a job
- *  - allMedia: redux slice keyed by jobId containing raw media records
- *  - context: "chat" | "email" | other string used to drive grid behavior
- *
- * Notes:
- *  - The previous third-party gallery required a remount key (openVersion); custom grid no longer does.
- *  - Selection flags are preserved when media refreshes.
- *  - Loading state ends after transformation regardless of whether any images were found.
- */
-function JobDocumentsLocalGalleryExternal({ jobId, externalMediaState, getJobMedia, allMedia, context = "chat" }) {
   const [galleryImages, setgalleryImages] = externalMediaState;
-  const [isLoading, setIsLoading] = useState(false);
+  const { t } = useTranslation();
-  const { t } = useTranslation(); // i18n hook retained if future translations are added
-  const DEBUG_LOCAL_GALLERY = false; // flip to true for verbose console logging
 
-  // Transform raw media record into a normalized image object consumed by the grid.
-  const transformMediaToImages = useCallback((raw) => {
-    return raw
-      .filter((m) => m.type?.mime?.startsWith("image"))
-      .map((m) => ({
-        ...m,
-        src: m.thumbnail,
-        thumbnail: m.thumbnail,
-        fullsize: m.src,
-        width: 225,
-        height: 225,
-        thumbnailWidth: 225,
-        thumbnailHeight: 225,
-        caption: m.filename || m.key
-      }));
-  }, []);
-
-  // Fetch media when jobId changes (network request triggers Redux update -> documents memo recalculates).
   useEffect(() => {
-    if (!jobId) return;
+    if (jobId) {
-    setIsLoading(true);
+      getJobMedia(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]));
+    let documents = allMedia?.[jobId]
-    const nextImages = documents.map((d) => ({ ...d, isSelected: prevSelection.get(d.filename) || false }));
+      ? allMedia[jobId].reduce((acc, val) => {
-    // Micro-optimization: if array length and each filename + selection flag match, skip creating a new array.
+          if (val.type?.mime && val.type.mime.startsWith("image")) {
-    if (galleryImages.length === nextImages.length) {
+            acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
-      let identical = true;
+          }
-      for (let i = 0; i < nextImages.length; i++) {
+          return acc;
-        if (
+        }, [])
-          galleryImages[i].filename !== nextImages[i].filename ||
+      : [];
-          galleryImages[i].isSelected !== nextImages[i].isSelected
+    console.log(
-        ) {
+      "🚀 ~ file: jobs-documents-local-gallery.external.component.jsx:48 ~ useEffect ~ documents:",
-          identical = false;
+      documents
-          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>
     );
-  }
+
+    setgalleryImages(documents);
+  }, [allMedia, jobId, setgalleryImages, t]);
 
   return (
-    <div
+    <div className="clearfix">
-      className="clearfix"
+      <Gallery
-      style={{ position: "relative", minHeight: 80 }}
+        images={galleryImages}
-      data-jobid={jobId}
+        onSelect={(index) => {
-      aria-label={`media gallery for job ${jobId}`}
+          setgalleryImages(galleryImages.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g)));
-    >
+        }}
-      {isLoading && galleryImages.length === 0 && (
+      />
-        <div className="local-gallery-loading" style={messageStyle} role="status" aria-live="polite">
-          <LoadingSpinner />
-        </div>
-      )}
-      {galleryImages.length > 0 && (
-        <LocalMediaGrid images={galleryImages} minColumns={4} context={context} onToggle={handleToggle} />
-      )}
-      {galleryImages.length > 0 && (
-        <div style={{ fontSize: 10, color: "#888", marginTop: 4 }} aria-live="off">
-          {`${t("general.labels.media")}: ${galleryImages.length}`}
-        </div>
-      )}
     </div>
   );
 }

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

@@ -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;

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

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

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

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]
           };
         }) || [],

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;

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}>

client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx

@@ -16,7 +16,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
       <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
       {employeeOptions.length > 0 ? (
         <Form.Item
-          normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
           name="notification_followers"
           rules={[
             {
@@ -43,6 +42,11 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
             options={employeeOptions}
             placeholder={t("bodyshop.fields.notifications.placeholder")}
             showEmail={true}
+            onChange={(value) => {
+              // Filter out null or invalid values before passing to Form
+              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
+              return cleanedValue;
+            }}
           />
         </Form.Item>
       ) : (

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")}

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

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

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

@@ -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)

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

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

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

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

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

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

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)
       }

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
-    }
-  }
-`;

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
     }
   }
 `;

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
-    }
-  }
-`;

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() !== "") {

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 searchParams = queryString.parse(useLocation().search);
-  const history = useNavigate();
-  const searchParams = queryString.parse(location.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 />

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);

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,
+  jobRO: selectJobReadOnly
-  currentUser: selectCurrentUser
 });
 
 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 } : {})
         }

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

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) =>
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
-          p.filename === action.payload.filename ? { ...p, isSelected: !p.isSelected } : 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;

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`,

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 }));

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

@@ -50,7 +50,7 @@ import {
 } from "./user.actions";
 import UserActionTypes from "./user.types";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from "posthog-js";
+import posthog from 'posthog-js';
 
 const fpPromise = FingerprintJS.load();
 
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
         instanceSeg,
         ...(isParts
           ? [
-              InstanceRenderManager({
+            InstanceRenderManager({
-                imex: "ImexPartsManagement",
+              imex: "ImexPartsManagement",
-                rome: "RomePartsManagement"
+              rome: "RomePartsManagement"
-              })
+            })
-            ]
+          ]
           : [])
       ];
       window.$crisp.push(["set", "session:segments", [segs]]);
@@ -375,31 +375,17 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       const isParts = yield select((state) => state.application.isPartsEntry === true);
       const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
 
-      const featureSegments =
+      let featureSegments;
-        payload.features?.allAccess === true
+      if (payload.features?.allAccess === true) {
-          ? ["allAccess"]
+        featureSegments = ["allAccess"];
-          : [
+      } else {
-              "basic",
+        const featureKeys = Object.keys(payload.features).filter(
-              ...Object.keys(payload.features).filter(
+          (key) =>
-                (key) =>
+            payload.features[key] === true ||
-                  payload.features[key] === true ||
+            (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
-                  (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+        );
-              )
+        featureSegments = ["basic", ...featureKeys];
-            ];
+      }
-
-      const additionalSegments = [
-        payload.cdk_dealerid && "CDK",
-        payload.pbs_serialnumber && "PBS",
-        // payload.rr_dealerid && "Reynolds",
-        payload.accountingconfig.qbo === true && "QBO",
-        payload.accountingconfig.qbo === false &&
-          !payload.cdk_dealerid &&
-          !payload.pbs_serialnumber &&
-          // !payload.rr_dealerid &&
-          "QBD"
-      ].filter(Boolean);
-
-      featureSegments.push(...additionalSegments);
 
       const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
       const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];

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.",
@@ -3209,7 +3205,6 @@
         "parts_not_recieved_vendor": "Parts Not Received by Vendor",
         "parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
         "payments_by_date": "Payments by Date",
-        "payments_by_date_excel": "Payments by Date - Excel",
         "payments_by_date_payment": "Payments by Date and Payment Type",
         "payments_by_date_type": "Payments by Date and Customer Type",
         "production_by_category": "Production by Category",

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": {
@@ -3209,7 +3205,6 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
-        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

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": "",
@@ -3209,7 +3205,6 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
-        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

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: "",
@@ -1218,18 +1210,6 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
-          payments_by_date_excel: {
-            title: i18n.t("reportcenter.templates.payments_by_date_excel"),
-            subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
-            key: "payments_by_date_excel",
-            reporttype: "excel",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.payments"),
-              field: i18n.t("payments.fields.date")
-            },
-            group: "customers"
-          },
           schedule: {
             title: i18n.t("reportcenter.templates.schedule"),
             subject: i18n.t("reportcenter.templates.schedule"),

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:

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:

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
+  schedule: 0 7 * * 6
-  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
   include_in_metadata: true
   payload: {}
   headers:

hasura/metadata/tables.yaml

@@ -1156,11 +1156,7 @@
         enable_manual: false
         update:
           columns:
-            - imexshopid
-            - timezone
             - shopname
-            - notification_followers
-            - state
             - md_order_statuses
       retry_conf:
         interval_sec: 10
@@ -3619,7 +3615,6 @@
           - adj_strdis
           - adj_towdis
           - adjustment_bottom_line
-          - admin_clerk
           - agt_addr1
           - agt_addr2
           - agt_city
@@ -3702,7 +3697,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -3896,7 +3890,6 @@
           - adj_strdis
           - adj_towdis
           - adjustment_bottom_line
-          - admin_clerk
           - agt_addr1
           - agt_addr2
           - agt_city
@@ -3980,7 +3973,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4186,7 +4178,6 @@
           - adj_strdis
           - adj_towdis
           - adjustment_bottom_line
-          - admin_clerk
           - agt_addr1
           - agt_addr2
           - agt_city
@@ -4270,7 +4261,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4715,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

hasura/migrations/1762378985244_create_table_public_media_analytics/down.sql

@@ -1 +0,0 @@
-DROP TABLE "public"."media_analytics";

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;

hasura/migrations/1762380389542_create_table_public_media_analytics_detail/down.sql

@@ -1 +0,0 @@
-DROP TABLE "public"."media_analytics_detail";

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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();

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();

hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_bodyshopid";

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");

hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_jobid";

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");

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";

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");

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;

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;

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;

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;

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;