Merged in feature/IO-3722-disable-contact-fortellis (pull request #3286)

IO-3722 Remove delivery date for bypass vehicles.

Approved-by: Dave Richer

.gitignore

@@ -149,3 +149,8 @@ docker_data
 /COPILOT.md
 /.github/copilot-instructions.md
 /GEMINI.md
+/_reference/select-component-test-plan.md
+
+.terraform
+
+terraform.tfvars

client/package.json

@@ -8,13 +8,14 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.37.0",
+    "@amplitude/analytics-browser": "^2.38.0",
     "@ant-design/pro-layout": "^7.22.6",
     "@apollo/client": "^4.1.6",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
+    "@documenso/embed-react": "^0.5.1",
     "@emotion/is-prop-valid": "^1.4.0",
     "@fingerprintjs/fingerprintjs": "^5.1.0",
     "@firebase/analytics": "^0.10.21",
@@ -24,29 +25,29 @@
     "@firebase/messaging": "^0.12.25",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.11.2",
-    "@sentry/cli": "^3.3.3",
-    "@sentry/react": "^10.45.0",
+    "@sentry/cli": "^3.3.5",
+    "@sentry/react": "^10.47.0",
     "@sentry/vite-plugin": "^4.9.1",
     "@splitsoftware/splitio-react": "^2.6.1",
     "@tanem/react-nprogress": "^5.0.63",
-    "antd": "^6.3.3",
+    "antd": "^6.3.5",
     "apollo-link-logger": "^3.0.0",
     "autosize": "^6.0.1",
-    "axios": "^1.13.6",
+    "axios": "^1.14.0",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
     "dayjs": "^1.11.20",
-    "dayjs-business-days2": "^1.3.2",
+    "dayjs-business-days2": "^1.3.3",
     "dinero.js": "^1.9.1",
     "dotenv": "^17.3.1",
     "env-cmd": "^11.0.0",
     "exifr": "^7.1.3",
-    "graphql": "^16.13.1",
-    "graphql-ws": "^6.0.7",
-    "i18next": "^25.10.5",
+    "graphql": "^16.13.2",
+    "graphql-ws": "^6.0.8",
+    "i18next": "^25.10.10",
     "i18next-browser-languagedetector": "^8.2.1",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.40",
+    "libphonenumber-js": "^1.12.41",
     "lightningcss": "^1.32.0",
     "logrocket": "^12.1.0",
     "markerjs2": "^2.32.7",
@@ -54,18 +55,18 @@
     "normalize-url": "^8.1.1",
     "object-hash": "^3.0.0",
     "phone": "^3.1.71",
-    "posthog-js": "^1.363.2",
+    "posthog-js": "^1.364.4",
     "prop-types": "^15.8.1",
     "query-string": "^9.3.1",
     "raf-schd": "^4.0.3",
     "react": "^19.2.4",
     "react-big-calendar": "^1.19.4",
     "react-color": "^2.19.3",
-    "react-cookie": "^8.0.1",
+    "react-cookie": "^8.1.0",
     "react-dom": "^19.2.4",
     "react-grid-gallery": "^1.0.1",
-    "react-grid-layout": "^2.2.2",
-    "react-i18next": "^16.6.2",
+    "react-grid-layout": "^2.2.3",
+    "react-i18next": "^16.6.6",
     "react-icons": "^5.6.0",
     "react-image-lightbox": "^5.1.4",
     "react-markdown": "^10.1.0",
@@ -77,7 +78,7 @@
     "react-router-dom": "^7.13.2",
     "react-sticky": "^6.0.3",
     "react-virtuoso": "^4.18.3",
-    "recharts": "^3.8.0",
+    "recharts": "^3.8.1",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
     "redux-persist": "^6.0.0",
@@ -89,7 +90,7 @@
     "socket.io-client": "^4.8.3",
     "styled-components": "^6.3.12",
     "vite-plugin-ejs": "^1.7.0",
-    "web-vitals": "^5.1.0"
+    "web-vitals": "^5.2.0"
   },
   "scripts": {
     "postinstall": "echo 'when updating react-big-calendar, remember to check to localizer in the calendar wrapper'",
@@ -137,10 +138,10 @@
     "@rollup/rollup-linux-x64-gnu": "4.6.1"
   },
   "devDependencies": {
-    "@ant-design/icons": "^6.1.0",
+    "@ant-design/icons": "^6.1.1",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.28.5",
-    "@dotenvx/dotenvx": "^1.57.2",
+    "@dotenvx/dotenvx": "^1.59.1",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
     "@eslint/js": "^9.39.2",
@@ -150,7 +151,7 @@
     "@testing-library/react": "^16.3.2",
     "@vitejs/plugin-react": "^5.1.4",
     "babel-plugin-react-compiler": "^1.0.0",
-    "browserslist": "^4.28.1",
+    "browserslist": "^4.28.2",
     "browserslist-to-esbuild": "^2.1.1",
     "chalk": "^5.6.2",
     "eslint": "^9.39.2",
@@ -167,10 +168,10 @@
     "vite": "^7.3.1",
     "vite-plugin-babel": "^1.6.0",
     "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-node-polyfills": "^0.25.0",
+    "vite-plugin-node-polyfills": "^0.26.0",
     "vite-plugin-pwa": "^1.2.0",
     "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^4.1.0",
+    "vitest": "^4.1.2",
     "workbox-window": "^7.4.0"
   }
 }

client/src/App/App.jsx

@@ -1,6 +1,6 @@
 import { useSplitClient } from "@splitsoftware/splitio-react";
 import { Button, Result } from "antd";
-import LogRocket from "logrocket";
+//import LogRocket from "logrocket";
 import { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -101,13 +101,13 @@ export function App({
       client.setAttribute("imexshopid", bodyshop.imexshopid);
 
       if (client.getTreatment("LogRocket_Tracking") === "on") {
-        console.log("LR Start");
-        LogRocket.init(
-          InstanceRenderMgr({
-            imex: "gvfvfw/bodyshopapp",
-            rome: "rome-online/rome-online"
-          })
-        );
+        // console.log("LR Start");
+        // LogRocket.init(
+        //   InstanceRenderMgr({
+        //     imex: "gvfvfw/bodyshopapp",
+        //     rome: "rome-online/rome-online"
+        //   })
+        // );
       }
     }
   }, [bodyshop, client, currentUser.authorized]);

client/src/App/App.styles.scss

@@ -509,3 +509,10 @@
     pointer-events: none !important;
   }
 }
+
+
+.esignature-embed {
+width: 100%;
+height: 100%;
+border-width: 0;
+}

client/src/components/alert/alert.component.jsx

@@ -1,5 +1,5 @@
 import { Alert } from "antd";
 
-export default function AlertComponent(props) {
-  return <Alert {...props} />;
+export default function AlertComponent({ title, message, ...props }) {
+  return <Alert {...props} title={title ?? message} />;
 }

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -13,6 +13,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
+import { buildBillUpdateAuditDetails } from "../../utils/auditTrailDetails";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
@@ -134,10 +135,16 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
 
     await Promise.all(updates);
 
+    const details = buildBillUpdateAuditDetails({
+      originalBill: data?.bills_by_pk,
+      bill,
+      billlines
+    });
+
     insertAuditTrail({
-      jobid: bill.jobid,
+      jobid: bill.jobid ?? data?.bills_by_pk?.jobid,
       billid: search.billid,
-      operation: AuditTrailMapping.billupdated(bill.invoice_number),
+      operation: AuditTrailMapping.billupdated(bill.invoice_number, details),
       type: "billupdated"
     });
 

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

@@ -52,6 +52,7 @@ export function BillFormComponent({
   const [discount, setDiscount] = useState(0);
   const notification = useNotification();
   const jobIdFormWatch = Form.useWatch("jobid", form);
+  const vendorIdFormWatch = Form.useWatch("vendorid", form);
 
   const {
     treatments: { Extended_Bill_Posting, ClosingPeriod }
@@ -118,6 +119,7 @@ export function BillFormComponent({
     }
   }, [
     form,
+    vendorIdFormWatch,
     billEdit,
     loadOutstandingReturns,
     loadInventory,

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

@@ -96,6 +96,7 @@ export function BillEnterModalLinesComponent({
 
   // Only fill actual_cost when the user forward-tabs out of Retail (actual_price)
   const autofillActualCost = (index) => {
+    if (bodyshop.accountingconfig?.disableBillCostCalculation) return;
     Promise.resolve().then(() => {
       const retailRaw = form.getFieldValue(["billlines", index, "actual_price"]);
       const actualRaw = form.getFieldValue(["billlines", index, "actual_cost"]);
@@ -434,9 +435,9 @@ export function BillEnterModalLinesComponent({
           rules: [{ required: true }]
         }),
         formInput: () => (
-          <Select 
-            showSearch 
-            style={{ minWidth: "3rem" }} 
+          <Select
+            showSearch
+            style={{ minWidth: "3rem" }}
             disabled={disabled}
             tabIndex={0}
             options={
@@ -460,7 +461,7 @@ export function BillEnterModalLinesComponent({
                 name: [field.name, "location"]
               }),
               formInput: () => (
-                <Select 
+                <Select
                   disabled={disabled}
                   tabIndex={0}
                   options={bodyshop.md_parts_locations.map((loc) => ({ value: loc, label: loc }))}
@@ -494,7 +495,9 @@ export function BillEnterModalLinesComponent({
                     {Enhanced_Payroll.treatment === "on" ? (
                       <Space>
                         {t("joblines.fields.assigned_team", { name: employeeTeamName?.name })}
-                        {`${jobline.mod_lb_hrs} units/${t(`joblines.fields.lbr_types.${jobline.mod_lbr_ty}`)}`}
+                        {jobline
+                          ? `${jobline.mod_lb_hrs} units/${t(`joblines.fields.lbr_types.${jobline.mod_lbr_ty}`)}`
+                          : null}
                       </Space>
                     ) : null}
 
@@ -505,10 +508,7 @@ export function BillEnterModalLinesComponent({
                       rules={[{ required: true }]}
                       name={[record.name, "lbr_adjustment", "mod_lbr_ty"]}
                     >
-                      <Select 
-                        allowClear
-                        options={CiecaSelect(false, true)}
-                      />
+                      <Select allowClear options={CiecaSelect(false, true)} />
                     </Form.Item>
 
                     {Enhanced_Payroll.treatment === "on" ? (

client/src/components/bill-reexport-button/bill-reexport-button.component.jsx

@@ -9,18 +9,20 @@ import { createStructuredSelector } from "reselect";
 import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel
 });
-const mapDispatchToProps = () => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(BillMarkForReexportButton);
 
-export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
+export function BillMarkForReexportButton({ bodyshop, authLevel, bill, insertAuditTrail }) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const notification = useNotification();
@@ -47,6 +49,12 @@ export function BillMarkForReexportButton({ bodyshop, authLevel, bill }) {
       notification.success({
         title: t("bills.successes.reexport")
       });
+      insertAuditTrail({
+        jobid: bill.jobid,
+        billid: bill.id,
+        operation: AuditTrailMapping.billmarkforreexport(bill.invoice_number),
+        type: "billmarkforreexport"
+      });
     } else {
       notification.error({
         title: t("bills.errors.saving", {

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -10,6 +10,7 @@ import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -156,104 +157,127 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       joblines: {
         data: billingLines
       },
-      parts_tax_rates: {
-        PAA: {
-          prt_type: "PAA",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+      ...InstanceRenderManager({
+        imex: {
+          parts_tax_rates: {
+            PAA: {
+              prt_type: "PAA",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            PAC: {
+              prt_type: "PAC",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            PAL: {
+              prt_type: "PAL",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            PAM: {
+              prt_type: "PAM",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            PAN: {
+              prt_type: "PAN",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            PAR: {
+              prt_type: "PAR",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            PAS: {
+              prt_type: "PAS",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            CCDR: {
+              prt_type: "CCDR",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            CCF: {
+              prt_type: "CCF",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            CCM: {
+              prt_type: "CCM",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            CCC: {
+              prt_type: "CCC",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            },
+            CCD: {
+              prt_type: "CCD",
+              prt_discp: 0,
+              prt_mktyp: false,
+              prt_mkupp: 0,
+              prt_tax_in: true,
+              prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+            }
+          }
         },
-        PAC: {
-          prt_type: "PAC",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        PAL: {
-          prt_type: "PAL",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        PAM: {
-          prt_type: "PAM",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        PAN: {
-          prt_type: "PAN",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        PAR: {
-          prt_type: "PAR",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        PAS: {
-          prt_type: "PAS",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        CCDR: {
-          prt_type: "CCDR",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        CCF: {
-          prt_type: "CCF",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        CCM: {
-          prt_type: "CCM",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        CCC: {
-          prt_type: "CCC",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
-        },
-        CCD: {
-          prt_type: "CCD",
-          prt_discp: 0,
-          prt_mktyp: false,
-          prt_mkupp: 0,
-          prt_tax_in: true,
-          prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100
+        rome: {
+          cieca_pft: {
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty1,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty2,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty3,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty4,
+            ...bodyshop.md_responsibility_centers.taxes.tax_ty5
+          },
+          materials: bodyshop.md_responsibility_centers.cieca_pfm,
+          cieca_pfl: bodyshop.md_responsibility_centers.cieca_pfl,
+          parts_tax_rates: bodyshop.md_responsibility_centers.parts_tax_rates,
+          tax_tow_rt: bodyshop.md_responsibility_centers.tax_tow_rt,
+          tax_str_rt: bodyshop.md_responsibility_centers.tax_str_rt,
+          tax_paint_mat_rt: bodyshop.md_responsibility_centers.tax_paint_mat_rt,
+          tax_shop_mat_rt: bodyshop.md_responsibility_centers.tax_shop_mat_rt,
+          tax_sub_rt: bodyshop.md_responsibility_centers.tax_sub_rt,
+          tax_lbr_rt: bodyshop.md_responsibility_centers.tax_lbr_rt,
+          tax_levies_rt: bodyshop.md_responsibility_centers.tax_levies_rt
         }
-      }
+      })
     };
 
     if (currentUser?.email) {
@@ -287,7 +311,7 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       notification.success({
         title: t("jobs.successes.created"),
         onClick: () => {
-          history.push(`/manage/jobs/${result.data.insert_jobs.returning[0].id}`);
+          history(`/manage/jobs/${result.data.insert_jobs.returning[0].id}`);
         }
       });
     }

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

@@ -64,7 +64,7 @@ function normalizeJobAllocations(ack) {
  * RR-specific DMS Allocations Summary
  * Focused on what we actually send to RR:
  *  - ROGOG (split by taxable / non-taxable segments)
- *  - ROLABOR shell
+ *  - ROLABOR labor rows with bill hours / rates
  *
  * The heavy lifting (ROGOG/ROLABOR split, cost allocation, tax flags)
  * is now done on the backend via buildRogogFromAllocations/buildRolaborFromRogog.
@@ -181,21 +181,30 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
   const rolaborRows = useMemo(() => {
     if (!rolaborPreview || !Array.isArray(rolaborPreview.ops)) return [];
 
-    return rolaborPreview.ops.map((op, idx) => {
-      const rowOpCode = opCode || op.opCode;
+    return rolaborPreview.ops
+      .filter((op) =>
+        [op.bill?.jobTotalHrs, op.bill?.billTime, op.bill?.billRate, op.amount?.custPrice, op.amount?.totalAmt]
+          .map((value) => Number.parseFloat(value ?? "0"))
+          .some((value) => !Number.isNaN(value) && value !== 0)
+      )
+      .map((op, idx) => {
+        const rowOpCode = opCode || op.opCode;
 
-      return {
-        key: `${op.jobNo}-${idx}`,
-        opCode: rowOpCode,
-        jobNo: op.jobNo,
-        custPayTypeFlag: op.custPayTypeFlag,
-        custTxblNtxblFlag: op.custTxblNtxblFlag,
-        payType: op.bill?.payType,
-        amtType: op.amount?.amtType,
-        custPrice: op.amount?.custPrice,
-        totalAmt: op.amount?.totalAmt
-      };
-    });
+        return {
+          key: `${op.jobNo}-${idx}`,
+          opCode: rowOpCode,
+          jobNo: op.jobNo,
+          custPayTypeFlag: op.custPayTypeFlag,
+          custTxblNtxblFlag: op.custTxblNtxblFlag,
+          payType: op.bill?.payType,
+          jobTotalHrs: op.bill?.jobTotalHrs,
+          billTime: op.bill?.billTime,
+          billRate: op.bill?.billRate,
+          amtType: op.amount?.amtType,
+          custPrice: op.amount?.custPrice,
+          totalAmt: op.amount?.totalAmt
+        };
+      });
   }, [rolaborPreview, opCode]);
 
   // Totals for ROGOG (sum custPrice + dlrCost over all lines)
@@ -245,6 +254,9 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
     { title: "CustPayType", dataIndex: "custPayTypeFlag", key: "custPayTypeFlag" },
     { title: "CustTxblFlag", dataIndex: "custTxblNtxblFlag", key: "custTxblNtxblFlag" },
     { title: "PayType", dataIndex: "payType", key: "payType" },
+    { title: "JobTotalHrs", dataIndex: "jobTotalHrs", key: "jobTotalHrs" },
+    { title: "BillTime", dataIndex: "billTime", key: "billTime" },
+    { title: "BillRate", dataIndex: "billRate", key: "billRate" },
     { title: "AmtType", dataIndex: "amtType", key: "amtType" },
     { title: "CustPrice", dataIndex: "custPrice", key: "custPrice" },
     { title: "TotalAmt", dataIndex: "totalAmt", key: "totalAmt" }
@@ -317,12 +329,13 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
       children: (
         <>
           <Typography.Paragraph type="secondary" style={{ marginBottom: 8 }}>
-            This mirrors the shell that would be sent for ROLABOR when all financials are carried in GOG.
+            This mirrors the labor rows RR will receive, including weighted bill hours and rates derived from the
+            job&apos;s labor lines.
           </Typography.Paragraph>
           <ResponsiveTable
             pagination={false}
             columns={rolaborColumns}
-            mobileColumnKeys={["jobNo", "opCode", "breakOut", "itemType"]}
+            mobileColumnKeys={["jobNo", "opCode", "billRate", "custPrice"]}
             rowKey="key"
             dataSource={rolaborRows}
             locale={{ emptyText: "No ROLABOR lines would be generated." }}

client/src/components/dms-customer-selector/pbs-customer-selector.jsx

@@ -1,4 +1,4 @@
-import { Button, Col } from "antd";
+import { Button, Checkbox, Col } from "antd";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -49,7 +49,13 @@ export default function PBSCustomerSelector({ bodyshop, socket }) {
   if (!open) return null;
 
   const columns = [
-    { title: t("jobs.fields.dms.id"), dataIndex: "ContactId", key: "ContactId" },
+    { title: t("jobs.fields.dms.id"), dataIndex: "Code", key: "ContactId" },
+    {
+      title: t("jobs.fields.dms.IsARCustomer"),
+      dataIndex: "IsARCustomer",
+      key: "IsARCustomer",
+      render: (text, record) => <Checkbox checked={record.IsARCustomer} disabled />
+    },
     {
       title: t("jobs.fields.dms.name1"),
       key: "name1",

client/src/components/document-editor/document-editor-local.component.jsx

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { Result } from "antd";
+import { Result, theme } from "antd";
 import * as markerjs2 from "markerjs2";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -9,6 +9,12 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { handleUpload } from "../documents-local-upload/documents-local-upload.utility";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import {
+  addGreyscaleButtonToMarkerArea,
+  addImageHistoryUndoToMarkerArea,
+  applyGreyscaleToMarkerAreaImage,
+  setMarkerAreaImageSource
+} from "./document-editor.utility";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -24,7 +30,9 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
   const [imageLoaded, setImageLoaded] = useState(false);
   const [imageLoading, setImageLoading] = useState(true);
   const markerArea = useRef(null);
+  const imageHistory = useRef([]);
   const { t } = useTranslation();
+  const { token } = theme.useToken();
   const notification = useNotification();
   const [uploading, setUploading] = useState(false);
 
@@ -32,6 +40,7 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
     async (dataUrl) => {
       if (uploading) return;
       setUploading(true);
+      setLoading(true);
       const blob = await b64toBlob(dataUrl);
       const nameWithoutExt = filename.split(".").slice(0, -1).join(".").trim();
       const parts = nameWithoutExt.split("-");
@@ -70,6 +79,23 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
     [filename, jobid, notification, uploading]
   );
 
+  const handleGreyscale = useCallback(() => {
+    if (!imgRef.current || loading || uploaded || imageLoading || !imageLoaded) return;
+
+    imageHistory.current.push(imgRef.current.src);
+    applyGreyscaleToMarkerAreaImage(markerArea.current, imgRef.current);
+  }, [imageLoaded, imageLoading, loading, uploaded]);
+
+  const undoImageEdit = useCallback(() => {
+    if (!imgRef.current) return;
+
+    const previousSrc = imageHistory.current.pop();
+
+    if (previousSrc) {
+      setMarkerAreaImageSource(markerArea.current, imgRef.current, previousSrc);
+    }
+  }, []);
+
   useEffect(() => {
     if (imgRef.current !== null && imageLoaded && !markerArea.current) {
       // create a marker.js MarkerArea
@@ -93,8 +119,10 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
       markerArea.current.renderImageQuality = 1;
       //markerArea.current.settings.displayMode = "inline";
       markerArea.current.show();
+      addGreyscaleButtonToMarkerArea(markerArea.current, handleGreyscale, t("documents.labels.greyscale"));
+      addImageHistoryUndoToMarkerArea(markerArea.current, () => imageHistory.current.length > 0, undoImageEdit);
     }
-  }, [triggerUpload, imageLoaded]);
+  }, [handleGreyscale, imageLoaded, t, triggerUpload, undoImageEdit]);
 
   useEffect(() => {
     if (!imageUrl) return;
@@ -106,6 +134,7 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
       try {
         const response = await axios.get(imageUrl, { responseType: "blob", signal: controller.signal });
         const blobUrl = URL.createObjectURL(response.data);
+        imageHistory.current = [];
         setLoadedImageUrl((prevUrl) => {
           if (prevUrl) URL.revokeObjectURL(prevUrl);
           return blobUrl;
@@ -142,7 +171,7 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
   }
 
   return (
-    <div>
+    <div style={{ background: token.colorBgBase, color: token.colorText, minHeight: "100vh" }}>
       {!loading && !uploaded && loadedImageUrl && (
         <img
           ref={imgRef}
@@ -158,7 +187,12 @@ export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
       {(loading || imageLoading || !imageLoaded) && !uploaded && (
         <LoadingSpinner message={t("documents.labels.uploading")} />
       )}
-      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
+      {uploaded && (
+        <Result
+          status="success"
+          title={<span style={{ color: token.colorText }}>{t("documents.successes.edituploaded")}</span>}
+        />
+      )}
     </div>
   );
 }

client/src/components/document-editor/document-editor.component.jsx

@@ -1,15 +1,21 @@
 //import "tui-image-editor/dist/tui-image-editor.css";
 import axios from "axios";
-import { Result } from "antd";
+import { Result, theme } from "antd";
 import * as markerjs2 from "markerjs2";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import { handleUpload } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility.js";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import {
+  addGreyscaleButtonToMarkerArea,
+  addImageHistoryUndoToMarkerArea,
+  applyGreyscaleToMarkerAreaImage,
+  setMarkerAreaImageSource
+} from "./document-editor.utility";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -27,7 +33,9 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   const [imageLoaded, setImageLoaded] = useState(false);
   const [imageLoading, setImageLoading] = useState(true);
   const markerArea = useRef(null);
+  const imageHistory = useRef([]);
   const { t } = useTranslation();
+  const { token } = theme.useToken();
   const notification = useNotification();
 
   const triggerUpload = useCallback(
@@ -57,6 +65,23 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
     [bodyshop, currentUser, document, notification]
   );
 
+  const handleGreyscale = useCallback(() => {
+    if (!imgRef.current || loading || uploaded || imageLoading || !imageLoaded) return;
+
+    imageHistory.current.push(imgRef.current.src);
+    applyGreyscaleToMarkerAreaImage(markerArea.current, imgRef.current);
+  }, [imageLoaded, imageLoading, loading, uploaded]);
+
+  const undoImageEdit = useCallback(() => {
+    if (!imgRef.current) return;
+
+    const previousSrc = imageHistory.current.pop();
+
+    if (previousSrc) {
+      setMarkerAreaImageSource(markerArea.current, imgRef.current, previousSrc);
+    }
+  }, []);
+
   useEffect(() => {
     if (imgRef.current !== null && imageLoaded && !markerArea.current) {
       // create a marker.js MarkerArea
@@ -80,8 +105,10 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
       markerArea.current.renderImageQuality = 1;
       //markerArea.current.settings.displayMode = "inline";
       markerArea.current.show();
+      addGreyscaleButtonToMarkerArea(markerArea.current, handleGreyscale, t("documents.labels.greyscale"));
+      addImageHistoryUndoToMarkerArea(markerArea.current, () => imageHistory.current.length > 0, undoImageEdit);
     }
-  }, [triggerUpload, imageLoaded]);
+  }, [handleGreyscale, imageLoaded, t, triggerUpload, undoImageEdit]);
 
   useEffect(() => {
     if (!document?.id) return;
@@ -100,6 +127,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
           }
         );
         const blobUrl = URL.createObjectURL(response.data);
+        imageHistory.current = [];
         setImageUrl((prevUrl) => {
           if (prevUrl) URL.revokeObjectURL(prevUrl);
           return blobUrl;
@@ -134,7 +162,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   }
 
   return (
-    <div>
+    <div style={{ background: token.colorBgBase, color: token.colorText, minHeight: "100vh" }}>
       {!loading && !uploaded && imageUrl && (
         <img
           ref={imgRef}
@@ -150,7 +178,12 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
       {(loading || imageLoading || !imageLoaded) && !uploaded && (
         <LoadingSpinner message={t("documents.labels.uploading")} />
       )}
-      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
+      {uploaded && (
+        <Result
+          status="success"
+          title={<span style={{ color: token.colorText }}>{t("documents.successes.edituploaded")}</span>}
+        />
+      )}
     </div>
   );
 }

client/src/components/document-editor/document-editor.utility.js

@@ -0,0 +1,123 @@
+/**
+ * Converts an image element to a greyscale data URL.
+ * @param imageElement
+ * @returns {string}
+ */
+export function convertImageElementToGreyscaleDataUrl(imageElement) {
+  if (!imageElement?.naturalWidth || !imageElement?.naturalHeight) {
+    throw new Error("Image must be loaded before it can be converted to greyscale.");
+  }
+
+  const canvas = document.createElement("canvas");
+  canvas.width = imageElement.naturalWidth;
+  canvas.height = imageElement.naturalHeight;
+
+  const context = canvas.getContext("2d");
+  context.drawImage(imageElement, 0, 0);
+
+  const imageData = context.getImageData(0, 0, canvas.width, canvas.height);
+  const pixels = imageData.data;
+
+  for (let i = 0; i < pixels.length; i += 4) {
+    const luminance = Math.round(pixels[i] * 0.299 + pixels[i + 1] * 0.587 + pixels[i + 2] * 0.114);
+    pixels[i] = luminance;
+    pixels[i + 1] = luminance;
+    pixels[i + 2] = luminance;
+  }
+
+  context.putImageData(imageData, 0, 0);
+
+  return canvas.toDataURL("image/jpeg", 1);
+}
+
+/**
+ * Adds a greyscale button to the marker area controls if it doesn't already exist.
+ * @param markerArea
+ * @param onGreyscale
+ * @param title
+ */
+export function addGreyscaleButtonToMarkerArea(markerArea, onGreyscale, title) {
+  requestAnimationFrame(() => {
+    const renderButton = markerArea?.coverDiv?.querySelector?.('[data-action="render"]');
+
+    if (!renderButton || markerArea.coverDiv.querySelector('[data-action="greyscale"]')) return;
+
+    const greyscaleButton = document.createElement("div");
+    greyscaleButton.className = renderButton.className;
+    greyscaleButton.innerHTML =
+      '<svg viewBox="0 0 24 24"><path d="M12 2a10 10 0 1 0 0 20V2zm0 2.25v15.5a7.75 7.75 0 0 1 0-15.5z"/></svg>';
+    greyscaleButton.setAttribute("role", "button");
+    greyscaleButton.setAttribute("data-action", "greyscale");
+    greyscaleButton.setAttribute("aria-label", title);
+    greyscaleButton.title = title;
+    greyscaleButton.addEventListener("click", (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+      onGreyscale();
+    });
+
+    renderButton.parentElement.insertBefore(greyscaleButton, renderButton);
+  });
+}
+
+/**
+ * Applies a greyscale filter to the image in the marker area and updates the image source.
+ * @param markerArea
+ * @param imageElement
+ * @returns {string}
+ */
+export function applyGreyscaleToMarkerAreaImage(markerArea, imageElement) {
+  const dataUrl = convertImageElementToGreyscaleDataUrl(imageElement);
+
+  setMarkerAreaImageSource(markerArea, imageElement, dataUrl);
+
+  return dataUrl;
+}
+
+/**
+ * Sets the image source for the marker area and updates the editing target if it's an image element.
+ * @param markerArea
+ * @param imageElement
+ * @param src
+ */
+export function setMarkerAreaImageSource(markerArea, imageElement, src) {
+  imageElement.src = src;
+
+  if (markerArea?.editingTarget instanceof HTMLImageElement) {
+    markerArea.editingTarget.src = src;
+  }
+}
+
+/**
+ * Adds undo functionality for image edits to the marker area by tracking the state before and after undo actions.
+ * @param markerArea
+ * @param canUndoImage
+ * @param undoImage
+ */
+export function addImageHistoryUndoToMarkerArea(markerArea, canUndoImage, undoImage) {
+  requestAnimationFrame(() => {
+    const undoButton = markerArea?.coverDiv?.querySelector?.('[data-action="undo"]');
+
+    if (!undoButton || undoButton.dataset.imageHistoryUndo === "true") return;
+
+    let markerStateBeforeUndo = null;
+
+    undoButton.dataset.imageHistoryUndo = "true";
+    undoButton.addEventListener(
+      "click",
+      () => {
+        markerStateBeforeUndo = JSON.stringify(markerArea.getState(true));
+      },
+      true
+    );
+    undoButton.addEventListener("click", () => {
+      const markerStateAfterUndo = JSON.stringify(markerArea.getState(true));
+
+      if (markerStateBeforeUndo === markerStateAfterUndo && canUndoImage()) {
+        undoImage();
+      }
+
+      markerStateBeforeUndo = null;
+    });
+  });
+}

client/src/components/documents-upload-imgproxy/documents-upload-imgproxy.utility.js

@@ -4,6 +4,7 @@ import i18n from "i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_NEW_DOCUMENT } from "../../graphql/documents.queries";
 import { axiosAuthInterceptorId } from "../../utils/CleanAxios";
+import { replaceAccents } from "../../utils/replaceAccents.js";
 import client from "../../utils/GraphQLClient";
 
 //Context: currentUserEmail, bodyshop, jobid, invoiceid
@@ -144,32 +145,3 @@ export const uploadToS3 = async (
     if (onError) onError(JSON.stringify(error.message));
   }
 };
-
-function replaceAccents(str) {
-  // Verifies if the String has accents and replace them
-  if (str.search(/[\xC0-\xFF]/g) > -1) {
-    str = str
-      .replace(/[\xC0-\xC5]/g, "A")
-      .replace(/[\xC6]/g, "AE")
-      .replace(/[\xC7]/g, "C")
-      .replace(/[\xC8-\xCB]/g, "E")
-      .replace(/[\xCC-\xCF]/g, "I")
-      .replace(/[\xD0]/g, "D")
-      .replace(/[\xD1]/g, "N")
-      .replace(/[\xD2-\xD6\xD8]/g, "O")
-      .replace(/[\xD9-\xDC]/g, "U")
-      .replace(/[\xDD]/g, "Y")
-      .replace(/[\xDE]/g, "P")
-      .replace(/[\xE0-\xE5]/g, "a")
-      .replace(/[\xE6]/g, "ae")
-      .replace(/[\xE7]/g, "c")
-      .replace(/[\xE8-\xEB]/g, "e")
-      .replace(/[\xEC-\xEF]/g, "i")
-      .replace(/[\xF1]/g, "n")
-      .replace(/[\xF2-\xF6\xF8]/g, "o")
-      .replace(/[\xF9-\xFC]/g, "u")
-      .replace(/[\xFE]/g, "p")
-      .replace(/[\xFD\xFF]/g, "y");
-  }
-  return str;
-}

client/src/components/esignature-custom-document/esignature-custom-document.component.jsx

@@ -0,0 +1,92 @@
+import { UploadOutlined } from "@ant-design/icons";
+import { Button, Upload } from "antd";
+import axios from "axios";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { hasDocumensoApiKey } from "../../utils/esignature.js";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setEsignatureContext: (context) =>
+    dispatch(
+      setModalContext({
+        context,
+        modal: "esignature"
+      })
+    )
+});
+
+export function EsignatureCustomDocument({ bodyshop, jobId, setEsignatureContext }) {
+  const [loading, setLoading] = useState(false);
+  const notification = useNotification();
+  const { t } = useTranslation();
+
+  if (!hasDocumensoApiKey(bodyshop)) {
+    return null;
+  }
+
+  const uploadCustomDocument = async ({ file, onError, onSuccess }) => {
+    const formData = new FormData();
+    formData.append("document", file);
+    formData.append("jobid", jobId);
+    formData.append("bodyshop", JSON.stringify(bodyshop));
+
+    setLoading(true);
+
+    try {
+      const {
+        data: { token, documentId, envelopeId }
+      } = await axios.post("/esign/new-custom", formData, {
+        headers: {
+          "Content-Type": "multipart/form-data"
+        }
+      });
+
+      setEsignatureContext({ context: { token, documentId, envelopeId, jobid: jobId } });
+      onSuccess?.({ token, documentId, envelopeId });
+    } catch (error) {
+      notification.error({
+        title: t("esignature.errors.upload_title"),
+        description: error?.response?.data?.error || error?.response?.data?.message || error.message
+      });
+      onError?.(error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Upload
+      accept="application/pdf,.pdf"
+      beforeUpload={(file) => {
+        if (file.type === "application/pdf" || file.name?.toLowerCase().endsWith(".pdf")) {
+          return true;
+        }
+
+        notification.error({
+          title: t("esignature.errors.upload_title"),
+          description: t("esignature.errors.pdf_only")
+        });
+        return Upload.LIST_IGNORE;
+      }}
+      customRequest={uploadCustomDocument}
+      maxCount={1}
+      showUploadList={false}
+      multiple={false}
+    >
+      <Button icon={<UploadOutlined />} loading={loading}>
+        {t("esignature.actions.upload_document")}
+      </Button>
+    </Upload>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(EsignatureCustomDocument);

client/src/components/esignature-modal/esignature-modal.container.jsx

@@ -0,0 +1,101 @@
+import { EmbedUpdateDocumentV1 } from "@documenso/embed-react";
+import { Modal, notification, Result } from "antd";
+import axios from "axios";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { toggleModalVisible } from "../../redux/modals/modals.actions";
+import { selectEsignature } from "../../redux/modals/modals.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { useState } from "react";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { hasDocumensoApiKey } from "../../utils/esignature.js";
+
+const mapStateToProps = createStructuredSelector({
+  esignatureModal: selectEsignature,
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  toggleModalVisible: () => dispatch(toggleModalVisible("esignature"))
+});
+
+export function EsignatureModalContainer({ esignatureModal, toggleModalVisible, bodyshop, currentUser }) {
+  const { t } = useTranslation();
+  const { open, context } = esignatureModal;
+  const { token, envelopeId, documentId, jobid } = context;
+  const [distributing, setDistributing] = useState(false);
+
+  if (!hasDocumensoApiKey(bodyshop)) {
+    return null;
+  }
+
+  return (
+    <Modal
+      open={open}
+      title={InstanceRenderManager({
+        imex: t("jobs.labels.esignature_imex"),
+        rome: t("jobs.labels.esignature_rome")
+      })}
+      onOk={async () => {
+        try {
+          setDistributing(true);
+          await axios.post("/esign/distribute", {
+            documentId,
+            envelopeId,
+            jobid,
+            bodyshopid: bodyshop.id
+          });
+
+          toggleModalVisible();
+        } catch (error) {
+          notification.error({
+            message: t("esignature.distribute_error"),
+            description: error?.response?.data?.message || error.message
+          });
+        }
+        setDistributing(false);
+      }}
+      onCancel={async () => {
+        try {
+          await axios.post("/esign/delete", {
+            documentId,
+            envelopeId,
+            bodyshopid: bodyshop.id
+          });
+
+          toggleModalVisible();
+        } catch (error) {
+          notification.error({
+            message: t("esignature.cancel_error"),
+            description: error?.response?.data?.message || error.message
+          });
+        }
+      }}
+      okButtonProps={{ loading: distributing }}
+      okText={t("esignature.actions.distribute")}
+      destroyOnHidden
+      width={"80%"}
+    >
+      <div style={{ height: "80vh", width: "100%" }}>
+        {token ? (
+          <EmbedUpdateDocumentV1
+            presignToken={token}
+            host="https://sign.imex.online"
+            documentId={documentId}
+            externalId={`${jobid}|${currentUser?.email}`}
+            className="esignature-embed"
+            onDocumentUpdated={(data) => {
+              console.log("Document updated:", data);
+            }}
+          />
+        ) : (
+          <Result status="warning" title={t("esignature.errors.no_token")} />
+        )}
+      </div>
+    </Modal>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(EsignatureModalContainer);

client/src/components/form-fields-changed-alert/form-fields-changed-alert.component.jsx

@@ -4,20 +4,203 @@ import AlertComponent from "../alert/alert.component";
 import "./form-fields-changed.styles.scss";
 import Prompt from "../../utils/prompt";
 
-export default function FormsFieldChanged({ form, skipPrompt }) {
+export default function FormsFieldChanged({ form, skipPrompt, onErrorNavigate, onReset, onDirtyChange }) {
   const { t } = useTranslation();
 
+  const normalizeNamePath = (namePath) => (Array.isArray(namePath) ? namePath.filter((part) => part !== undefined) : [namePath]);
+
+  const getFieldIdCandidates = (namePath) => {
+    const normalizedNamePath = normalizeNamePath(namePath).map((part) => String(part));
+    const underscoreId = normalizedNamePath.join("_");
+    const dashId = normalizedNamePath.join("-");
+    const dotName = normalizedNamePath.join(".");
+
+    return [underscoreId, dashId, dotName].filter(Boolean);
+  };
+
+  const clearFormMeta = () => {
+    const fieldMeta = form.getFieldsError().map(({ name }) => ({
+      name,
+      touched: false,
+      validating: false,
+      errors: [],
+      warnings: []
+    }));
+
+    if (fieldMeta.length > 0) {
+      form.setFields(fieldMeta);
+    }
+
+    onDirtyChange?.(false);
+  };
+
   const handleReset = () => {
-    form.resetFields();
+    if (onReset) {
+      onReset();
+    } else {
+      form.resetFields();
+    }
+
+    window.requestAnimationFrame(() => {
+      clearFormMeta();
+    });
+  };
+
+  const getFieldDomNode = (namePath) => {
+    const fieldInstance = form.getFieldInstance?.(namePath);
+    const fieldIdCandidates = getFieldIdCandidates(namePath);
+    const domCandidates = [
+      fieldInstance?.nativeElement,
+      fieldInstance?.input,
+      fieldInstance?.resizableTextArea?.textArea,
+      fieldInstance
+    ];
+
+    fieldIdCandidates.forEach((fieldId) => {
+      const escapedFieldId = CSS.escape(fieldId);
+      const directNode = document.getElementById(fieldId) || document.querySelector(`#${escapedFieldId}`);
+      const labelNode = document.querySelector(`label[for="${escapedFieldId}"]`);
+      const namedNode = document.querySelector(`[name="${escapedFieldId}"]`);
+      const formItemNode =
+        directNode?.closest?.(".ant-form-item") ||
+        labelNode?.closest?.(".ant-form-item") ||
+        namedNode?.closest?.(".ant-form-item");
+
+      domCandidates.push(directNode);
+      domCandidates.push(namedNode);
+      domCandidates.push(formItemNode);
+      domCandidates.push(formItemNode?.querySelector?.("input, textarea, select, .ant-select-selector"));
+    });
+
+    return domCandidates.find((candidate) => candidate instanceof HTMLElement) ?? null;
+  };
+
+  const waitForAnimationFrames = (frameCount = 1) =>
+    new Promise((resolve) => {
+      let remainingFrames = frameCount;
+      const nextFrame = () => {
+        if (remainingFrames <= 0) {
+          resolve();
+          return;
+        }
+        remainingFrames -= 1;
+        window.requestAnimationFrame(nextFrame);
+      };
+      window.requestAnimationFrame(nextFrame);
+    });
+
+  const getFieldOwningTabMeta = (namePath) => {
+    const fieldDomNode = getFieldDomNode(namePath);
+    const owningTabPane = fieldDomNode?.closest?.(".ant-tabs-tabpane");
+    const paneId = owningTabPane?.getAttribute?.("id") || null;
+    const owningTabButton = paneId
+      ? document.querySelector(`[role="tab"][aria-controls="${paneId.replace(/"/g, '\\"')}"]`)
+      : null;
+    const tabLabel = owningTabButton?.textContent?.trim() || null;
+
+    return {
+      owningTabPane,
+      owningTabButton,
+      tabLabel
+    };
+  };
+
+  const openFieldOwningTab = async (namePath) => {
+    const { owningTabPane, owningTabButton } = getFieldOwningTabMeta(namePath);
+    if (!owningTabPane || owningTabPane.classList.contains("ant-tabs-tabpane-active")) return false;
+
+    if (!(owningTabButton instanceof HTMLElement)) return false;
+
+    owningTabButton.click();
+
+    for (let index = 0; index < 24; index += 1) {
+      await waitForAnimationFrames();
+      if (owningTabPane.classList.contains("ant-tabs-tabpane-active")) return true;
+    }
+
+    return owningTabPane.classList.contains("ant-tabs-tabpane-active");
+  };
+
+  const scrollToErrorField = (namePath) => {
+    const normalizedNamePath = normalizeNamePath(namePath);
+    if (!normalizedNamePath.length) return;
+
+    try {
+      form.scrollToField(normalizedNamePath, {
+        behavior: "smooth",
+        block: "center",
+        focus: true
+      });
+      window.requestAnimationFrame(() => {
+        const fallbackNode = getFieldDomNode(normalizedNamePath);
+        fallbackNode?.focus?.();
+      });
+      return;
+    } catch {
+      const fallbackTarget = document.getElementById(normalizedNamePath[0]?.toString?.() ?? "");
+      fallbackTarget?.scrollIntoView({
+        behavior: "smooth",
+        block: "center"
+      });
+    }
+  };
+
+  const handleErrorClick = async (namePath) => {
+    const normalizedNamePath = normalizeNamePath(namePath);
+    if (!normalizedNamePath.length) return;
+
+    const switchedTab = await openFieldOwningTab(normalizedNamePath);
+    if (!switchedTab) {
+      const navigationDelayMs = onErrorNavigate?.(normalizedNamePath) ?? 0;
+      if (navigationDelayMs > 0) {
+        window.setTimeout(() => {
+          window.requestAnimationFrame(() => {
+            scrollToErrorField(normalizedNamePath);
+          });
+        }, navigationDelayMs);
+        return;
+      }
+    }
+
+    await waitForAnimationFrames(switchedTab ? 2 : 1);
+    scrollToErrorField(normalizedNamePath);
   };
   //if (!form.isFieldsTouched()) return <></>;
   return (
     <Form.Item className="form-fields-changed" shouldUpdate style={{ margin: 0, padding: 0, minHeight: "unset" }}>
       {() => {
-        const errors = form.getFieldsError().filter((e) => e.errors.length > 0);
+        const errors = form
+          .getFieldsError()
+          .filter((fieldError) => fieldError.errors.length > 0)
+          .flatMap((fieldError) => {
+            const tabMeta = getFieldOwningTabMeta(fieldError.name);
+
+            return fieldError.errors.map((errorMessage, errorIndex) => ({
+              key: `${(fieldError.name || []).join(".")}-${errorIndex}-${errorMessage}`,
+              message: errorMessage,
+              namePath: fieldError.name,
+              tabLabel: tabMeta.tabLabel
+            }));
+          });
+
+        const groupedErrors = errors.reduce((groups, error) => {
+          const groupKey = error.tabLabel || "__ungrouped__";
+          if (!groups[groupKey]) {
+            groups[groupKey] = {
+              key: groupKey,
+              label: error.tabLabel,
+              errors: []
+            };
+          }
+          groups[groupKey].errors.push(error);
+          return groups;
+        }, {});
+        const errorGroups = Object.values(groupedErrors);
+        const hasTabbedErrorGroups = errorGroups.some((group) => Boolean(group.label));
+
         if (form.isFieldsTouched())
           return (
-            <Space orientation="vertical" style={{ width: "100%" }}>
+            <Space orientation="vertical" style={{ width: "100%", marginBottom: 10 }}>
               <Prompt when={!skipPrompt} beforeUnload={true} message={t("general.messages.unsavedchangespopup")} />
               <AlertComponent
                 type="warning"
@@ -39,10 +222,35 @@ export default function FormsFieldChanged({ form, skipPrompt }) {
               {errors.length > 0 && (
                 <AlertComponent
                   type="error"
-                  message={t("general.labels.validationerror")}
+                  title={t("general.labels.validationerror")}
                   description={
-                    <div>
-                      <ul>{errors.map((e, idx) => e.errors.map((e2, idx2) => <li key={`${idx}${idx2}`}>{e2}</li>))}</ul>
+                    <div className="form-fields-changed__error-groups">
+                      {errorGroups.map((group) => (
+                        <div key={group.key} className="form-fields-changed__error-group">
+                          {hasTabbedErrorGroups && group.label ? (
+                            <div className="form-fields-changed__error-group-title">{group.label}</div>
+                          ) : null}
+                          <ul className="form-fields-changed__error-list">
+                            {group.errors.map((error) => (
+                              <li key={error.key}>
+                                {Array.isArray(error.namePath) && error.namePath.length > 0 ? (
+                                  <button
+                                    type="button"
+                                    className="form-fields-changed__error-link"
+                                    onClick={() => {
+                                      handleErrorClick(error.namePath);
+                                    }}
+                                  >
+                                    {error.message}
+                                  </button>
+                                ) : (
+                                  error.message
+                                )}
+                              </li>
+                            ))}
+                          </ul>
+                        </div>
+                      ))}
                     </div>
                   }
                   showIcon

client/src/components/form-fields-changed-alert/form-fields-changed.styles.scss

@@ -4,4 +4,47 @@
       min-height: unset !important;
     }
   }
+
+  &__error-list {
+    margin: 0;
+    padding-left: 18px;
+  }
+
+  &__error-groups {
+    display: grid;
+    gap: 10px;
+  }
+
+  &__error-group {
+    display: grid;
+    gap: 4px;
+  }
+
+  &__error-group-title {
+    font-weight: 600;
+  }
+
+  &__error-link {
+    display: inline;
+    padding: 0;
+    border: 0;
+    background: none;
+    color: inherit;
+    font: inherit;
+    line-height: inherit;
+    text-align: left;
+    cursor: pointer;
+    text-decoration: underline;
+    text-underline-offset: 2px;
+
+    &:hover {
+      color: color-mix(in srgb, var(--ant-color-error) 82%, var(--ant-color-text));
+    }
+
+    &:focus-visible {
+      outline: 2px solid color-mix(in srgb, var(--ant-color-error) 32%, transparent);
+      outline-offset: 2px;
+      border-radius: 4px;
+    }
+  }
 }

client/src/components/form-items-formatted/phone-form-item.component.jsx

@@ -1,11 +1,88 @@
-import { Input } from "antd";
+import { PhoneFilled } from "@ant-design/icons";
+import { Button, Input, Space } from "antd";
 import i18n from "i18next";
 import parsePhoneNumber from "libphonenumber-js";
+import { forwardRef, useMemo, useState } from "react";
 import "./phone-form-item.styles.scss";
 
-function FormItemPhone({ ref, ...props }) {
-  return <Input ref={ref} {...props} />;
-}
+/**
+ * Formats a phone number for display purposes. If the input value is a valid phone number, it will be formatted in a
+ * national format (e.g., (123) 456-7890 for US/CA). If the input is not a valid phone number, it will be returned as-is.
+ * @param value
+ * @returns {*}
+ */
+const formatPhoneDisplayValue = (value) => {
+  if (!value) return value;
+
+  try {
+    const parsedPhone = parsePhoneNumber(value, "CA");
+    return parsedPhone?.isValid() ? parsedPhone.formatNational() : value;
+  } catch {
+    return value;
+  }
+};
+
+/**
+ * Generates a "tel:" URL for a phone number if it's valid. If the input value is a valid phone number, it will return a
+ * URL in the format "tel:+1234567890". If the input is not a valid phone number, it will attempt to trim whitespace and
+ * return a "tel:" URL with the raw value, or null if the trimmed value is empty.
+ * @param value
+ * @returns {string|null}
+ */
+const getPhoneActionHref = (value) => {
+  if (!value) return null;
+
+  try {
+    const parsedPhone = parsePhoneNumber(value, "CA");
+    if (parsedPhone?.isValid()) return `tel:${parsedPhone.number}`;
+  } catch {
+    // Fall back to the raw value below.
+  }
+
+  const trimmedValue = String(value).trim();
+  return trimmedValue ? `tel:${trimmedValue}` : null;
+};
+
+const FormItemPhone = forwardRef(function FormItemPhone(
+  { formatDisplayOnly = false, showPhoneAction = false, value, onBlur, onFocus, ...props },
+  ref
+) {
+  const [isFocused, setIsFocused] = useState(false);
+  const displayValue = useMemo(() => {
+    if (!formatDisplayOnly || isFocused) return value;
+    return formatPhoneDisplayValue(value);
+  }, [formatDisplayOnly, isFocused, value]);
+  const phoneActionHref = useMemo(() => (showPhoneAction ? getPhoneActionHref(value) : null), [showPhoneAction, value]);
+
+  const input = (
+    <Input
+      ref={ref}
+      {...props}
+      value={displayValue}
+      onFocus={(event) => {
+        setIsFocused(true);
+        onFocus?.(event);
+      }}
+      onBlur={(event) => {
+        setIsFocused(false);
+        onBlur?.(event);
+      }}
+    />
+  );
+
+  if (!showPhoneAction) return input;
+
+  return (
+    <Space.Compact style={{ width: "100%" }}>
+      {input}
+      {phoneActionHref ? (
+        <Button icon={<PhoneFilled />} href={phoneActionHref} />
+      ) : (
+        <Button icon={<PhoneFilled />} disabled />
+      )}
+    </Space.Compact>
+  );
+});
 
 export default FormItemPhone;
 

client/src/components/form-items-formatted/url-form-item.component.jsx

@@ -0,0 +1,34 @@
+import { LinkOutlined } from "@ant-design/icons";
+import { Button, Input, Space } from "antd";
+import { forwardRef, useMemo } from "react";
+
+const HAS_URL_PROTOCOL_REGEX = /^[a-zA-Z][a-zA-Z\d+.-]*:/;
+const LOCALHOST_OR_IP_REGEX = /^(localhost|127(?:\.\d{1,3}){3}|\d{1,3}(?:\.\d{1,3}){3})(:\d+)?(\/.*)?$/i;
+
+const getUrlActionHref = (value) => {
+  const trimmedValue = String(value ?? "").trim();
+  if (!trimmedValue) return null;
+
+  if (HAS_URL_PROTOCOL_REGEX.test(trimmedValue)) return trimmedValue;
+  if (trimmedValue.startsWith("//")) return `https:${trimmedValue}`;
+  if (LOCALHOST_OR_IP_REGEX.test(trimmedValue)) return `http://${trimmedValue}`;
+
+  return `https://${trimmedValue}`;
+};
+
+const FormItemUrl = forwardRef(function FormItemUrl({ value, defaultValue, ...props }, ref) {
+  const urlActionHref = useMemo(() => getUrlActionHref(value ?? defaultValue), [defaultValue, value]);
+
+  return (
+    <Space.Compact style={{ width: "100%" }}>
+      <Input ref={ref} {...props} value={value} defaultValue={defaultValue} />
+      {urlActionHref ? (
+        <Button icon={<LinkOutlined />} href={urlActionHref} target="_blank" rel="noopener noreferrer" />
+      ) : (
+        <Button icon={<LinkOutlined />} disabled />
+      )}
+    </Space.Compact>
+  );
+});
+
+export default FormItemUrl;

client/src/components/form-list-move-arrows/form-list-item-title.utils.js

@@ -0,0 +1,30 @@
+/**
+ * Normalize Form  Item List Titles
+ * @param value
+ * @returns {*|string}
+ */
+const normalizeFormListTitleValue = (value) => {
+  if (value === null || value === undefined) return "";
+
+  if (Array.isArray(value)) {
+    return value
+      .map((item) => normalizeFormListTitleValue(item))
+      .filter(Boolean)
+      .join(", ");
+  }
+
+  return String(value).trim();
+};
+
+/**
+ * Get Form Listem Item Title
+ * @param fallbackLabel
+ * @param index
+ * @param candidates
+ * @returns {*|string}
+ */
+export function getFormListItemTitle(fallbackLabel, index, ...candidates) {
+  const title = candidates.map((candidate) => normalizeFormListTitleValue(candidate)).find(Boolean);
+
+  return title || `${fallbackLabel} ${index + 1}`;
+}

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

@@ -1,6 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Col, Row, Tag } from "antd";
+import { Button, Card, Checkbox, Col, Row, Space, Tag } from "antd";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,6 +12,9 @@ import { DateTimeFormatter } from "../../utils/DateFormatter";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import axios from "axios";
+import { useNotification } from "../../contexts/Notifications/notificationContext";
+import { hasDocumensoApiKey } from "../../utils/esignature.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -23,6 +26,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobAuditTrail);
 
 export function JobAuditTrail({ bodyshop, jobId }) {
   const { t } = useTranslation();
+  const notification = useNotification();
+  const esignatureEnabled = hasDocumensoApiKey(bodyshop);
   const { loading, data, refetch } = useQuery(QUERY_AUDIT_TRAIL, {
     variables: { jobid: jobId },
     skip: !jobId,
@@ -53,6 +58,145 @@ export function JobAuditTrail({ bodyshop, jobId }) {
       )
     }
   ];
+  const esigColumns = [
+    {
+      title: t("esignature.fields.created_at"),
+      dataIndex: "created_at",
+      key: "created_at",
+      render: (text) => <DateTimeFormatter>{text}</DateTimeFormatter>
+    },
+    {
+      title: t("esignature.fields.updated_at"),
+      dataIndex: "updated_at",
+      key: "updated_at",
+      render: (text) => <DateTimeFormatter>{text}</DateTimeFormatter>
+    },
+    {
+      title: t("esignature.fields.title"),
+      dataIndex: "title",
+      key: "title",
+      render: (text) => (
+        <BlurWrapperComponent featureName="audit" bypass>
+          <div>{text}</div>
+        </BlurWrapperComponent>
+      )
+    },
+    {
+      title: t("esignature.fields.external_document_id"),
+      dataIndex: "external_document_id",
+      key: "external_document_id",
+      render: (text) => (
+        <BlurWrapperComponent featureName="audit" bypass>
+          <div>{text}</div>
+        </BlurWrapperComponent>
+      )
+    },
+    {
+      title: t("esignature.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      render: (text) => (
+        <BlurWrapperComponent featureName="audit" bypass>
+          <div>{text}</div>
+        </BlurWrapperComponent>
+      )
+    },
+    {
+      title: t("esignature.fields.opened"),
+      dataIndex: "opened",
+      key: "opened",
+      render: (text) => <Checkbox checked={text} disabled />
+    },
+    {
+      title: t("esignature.fields.rejected"),
+      dataIndex: "rejected",
+      key: "rejected",
+      render: (text) => <Checkbox checked={text} disabled />
+    },
+    {
+      title: t("esignature.fields.completed"),
+      dataIndex: "completed",
+      key: "completed",
+      render: (text) => <Checkbox checked={text} disabled />
+    },
+    {
+      title: t("esignature.fields.completed_at"),
+      dataIndex: "completed_at",
+      key: "completed_at",
+      render: (text) => <DateTimeFormatter>{text}</DateTimeFormatter>
+    },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      render: (_text, record) => (
+        <Space wrap>
+          <Button
+            disabled={record.completed_at !== null || record.status === "REJECTED"}
+            onClick={async () => {
+              logImEXEvent("job_esig_delete", {});
+              try {
+                await axios.post("/esign/delete", {
+                  documentId: record.external_document_id,
+                  bodyshopid: bodyshop.id
+                });
+                refetch();
+              } catch (error) {
+                console.error("Error deleting document:", error?.response?.data || error.message);
+                notification.error({
+                  message: t("esignature.delete_error"),
+                  description: error?.response?.data?.error || error.message
+                });
+              }
+            }}
+          >
+            {t("esignature.actions.delete")}
+          </Button>
+          <Button
+            onClick={async () => {
+              logImEXEvent("job_esig_redistribute", {});
+              try {
+                await axios.post("/esign/redistribute", {
+                  documentId: record.external_document_id,
+                  bodyshopid: bodyshop.id
+                });
+
+                //Pop the success notification. Possible audit requery required.
+              } catch (error) {
+                console.error("Error viewing document:", error?.response?.data || error.message);
+                notification.error({
+                  message: t("esignature.view_error"),
+                  description: error?.response?.data?.message || error.message
+                });
+              }
+            }}
+          >
+            {t("esignature.actions.redistribute")}
+          </Button>
+          <Button
+            onClick={async () => {
+              logImEXEvent("job_esig_view", {});
+              try {
+                const response = await axios.post("/esign/view", {
+                  documentId: record.external_document_id,
+                  bodyshopid: bodyshop.id
+                });
+                window.open(response.data?.document?.downloadUrl, "_blank");
+              } catch (error) {
+                console.error("Error viewing document:", error?.response?.data || error.message);
+                notification.error({
+                  message: t("esignature.view_error"),
+                  description: error?.response?.data?.message || error.message
+                });
+              }
+            }}
+          >
+            {t("esignature.actions.view")}
+          </Button>
+        </Space>
+      )
+    }
+  ];
   const emailColumns = [
     {
       title: t("audit.fields.created"),
@@ -184,6 +328,20 @@ export function JobAuditTrail({ bodyshop, jobId }) {
           />
         </Card>
       </Col>
+      {esignatureEnabled && (
+        <Col span={24}>
+          <Card title={t("jobs.labels.esignatures")}>
+            <ResponsiveTable
+              loading={loading}
+              columns={esigColumns}
+              mobileColumnKeys={["title", "status"]}
+              rowKey="id"
+              scroll={{ x: true }}
+              dataSource={data ? data.esignature_documents : []}
+            />
+          </Card>
+        </Col>
+      )}
     </Row>
   );
 }

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

@@ -44,6 +44,7 @@ import JoblineTeamAssignment from "../job-line-team-assignment/job-line-team-ass
 import JobSendPartPriceChangeComponent from "../job-send-parts-price-change/job-send-parts-price-change.component";
 import PartsOrderDrawer from "../parts-order-list-table/parts-order-list-table-drawer.component";
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
+import { buildInHouseBillLines } from "./job-lines.in-house-bill-lines.utils";
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
@@ -595,16 +596,7 @@ export function JobLinesComponent({
                         isinhouse: true,
                         date: dayjs(),
                         total: 0,
-                        billlines: selectedLines.map((p) => ({
-                          joblineid: p.id,
-                          actual_price: p.act_price,
-                          actual_cost: 0,
-                          line_desc: p.line_desc,
-                          line_remarks: p.line_remarks,
-                          part_type: p.part_type,
-                          quantity: p.quantity || 1,
-                          applicable_taxes: { local: false, state: false, federal: false }
-                        }))
+                        billlines: buildInHouseBillLines(selectedLines)
                       }
                     }
                   });

client/src/components/job-detail-lines/job-lines.in-house-bill-lines.utils.js

@@ -0,0 +1,11 @@
+export const buildInHouseBillLines = (lines) =>
+  lines.map((line) => ({
+    joblineid: line.id,
+    actual_price: line.act_price,
+    actual_cost: 0,
+    line_desc: line.line_desc,
+    line_remarks: line.line_remarks,
+    part_type: line.part_type,
+    quantity: line.part_qty ?? line.quantity ?? 1,
+    applicable_taxes: { local: false, state: false, federal: false }
+  }));

client/src/components/job-detail-lines/job-lines.in-house-bill-lines.utils.test.js

@@ -0,0 +1,33 @@
+import { describe, expect, it } from "vitest";
+import { buildInHouseBillLines } from "./job-lines.in-house-bill-lines.utils";
+
+describe("buildInHouseBillLines", () => {
+  it("carries job line part quantity into the in-house bill line", () => {
+    const billLines = buildInHouseBillLines([
+      {
+        id: "job-line-1",
+        act_price: 125,
+        line_desc: "Door shell",
+        line_remarks: "Left",
+        part_type: "PAA",
+        part_qty: 3
+      }
+    ]);
+
+    expect(billLines[0]).toMatchObject({
+      joblineid: "job-line-1",
+      actual_price: 125,
+      actual_cost: 0,
+      line_desc: "Door shell",
+      line_remarks: "Left",
+      part_type: "PAA",
+      quantity: 3,
+      applicable_taxes: { local: false, state: false, federal: false }
+    });
+  });
+
+  it("falls back to legacy quantity and then one when part quantity is absent", () => {
+    expect(buildInHouseBillLines([{ id: "legacy", quantity: 2 }])[0].quantity).toBe(2);
+    expect(buildInHouseBillLines([{ id: "missing" }])[0].quantity).toBe(1);
+  });
+});

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -67,22 +67,25 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
         </LayoutFormRow>
         <LayoutFormRow grow>
           <Form.Item label={t("joblines.fields.mod_lbr_ty")} name="mod_lbr_ty">
-            <Select allowClear options={[
-              { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
-              { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
-              { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
-              { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
-              { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
-              { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
-              { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
-              { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
-              { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
-              { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
-              { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
-              { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
-              { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
-              { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
-            ]} />
+            <Select
+              allowClear
+              options={[
+                { value: "LAA", label: t("joblines.fields.lbr_types.LAA") },
+                { value: "LAB", label: t("joblines.fields.lbr_types.LAB") },
+                { value: "LAD", label: t("joblines.fields.lbr_types.LAD") },
+                { value: "LAE", label: t("joblines.fields.lbr_types.LAE") },
+                { value: "LAF", label: t("joblines.fields.lbr_types.LAF") },
+                { value: "LAG", label: t("joblines.fields.lbr_types.LAG") },
+                { value: "LAM", label: t("joblines.fields.lbr_types.LAM") },
+                { value: "LAR", label: t("joblines.fields.lbr_types.LAR") },
+                { value: "LAS", label: t("joblines.fields.lbr_types.LAS") },
+                { value: "LAU", label: t("joblines.fields.lbr_types.LAU") },
+                { value: "LA1", label: t("joblines.fields.lbr_types.LA1") },
+                { value: "LA2", label: t("joblines.fields.lbr_types.LA2") },
+                { value: "LA3", label: t("joblines.fields.lbr_types.LA3") },
+                { value: "LA4", label: t("joblines.fields.lbr_types.LA4") }
+              ]}
+            />
           </Form.Item>
           <Form.Item label={t("joblines.fields.op_code_desc")} name="op_code_desc">
             <Input />
@@ -128,21 +131,27 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
         </LayoutFormRow>
         <LayoutFormRow>
           <Form.Item label={t("joblines.fields.part_type")} name="part_type">
-            <Select allowClear options={[
-              { value: "PAA", label: t("joblines.fields.part_types.PAA") },
-              { value: "PAC", label: t("joblines.fields.part_types.PAC") },
-              { value: "PAE", label: t("joblines.fields.part_types.PAE") },
-              { value: "PAL", label: t("joblines.fields.part_types.PAL") },
-              { value: "PAM", label: t("joblines.fields.part_types.PAM") },
-              { value: "PAN", label: t("joblines.fields.part_types.PAN") },
-              { value: "PAO", label: t("joblines.fields.part_types.PAO") },
-              { value: "PAR", label: t("joblines.fields.part_types.PAR") },
-              { value: "PAS", label: t("joblines.fields.part_types.PAS") }
-            ]} />
+            <Select
+              allowClear
+              options={[
+                { value: "PAA", label: t("joblines.fields.part_types.PAA") },
+                { value: "PAC", label: t("joblines.fields.part_types.PAC") },
+                { value: "PAE", label: t("joblines.fields.part_types.PAE") },
+                { value: "PAL", label: t("joblines.fields.part_types.PAL") },
+                { value: "PAM", label: t("joblines.fields.part_types.PAM") },
+                { value: "PAN", label: t("joblines.fields.part_types.PAN") },
+                { value: "PAO", label: t("joblines.fields.part_types.PAO") },
+                { value: "PAR", label: t("joblines.fields.part_types.PAR") },
+                { value: "PAS", label: t("joblines.fields.part_types.PAS") }
+              ]}
+            />
           </Form.Item>
           <Form.Item label={t("joblines.fields.oem_partno")} name="oem_partno">
             <Input />
           </Form.Item>
+          <Form.Item label={t("joblines.fields.alt_partno")} name="alt_partno">
+            <Input />
+          </Form.Item>
           <Form.Item
             label={t("joblines.fields.part_qty")}
             name="part_qty"

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -14,16 +14,20 @@ import CriticalPartsScan from "../../utils/criticalPartsScan";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
+import { buildJobLineInsertAuditDetails, buildJobLineUpdateAuditDetails } from "../../utils/auditTrailDetails.js";
 
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
   bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("jobLineEdit"))
+  toggleModalVisible: () => dispatch(toggleModalVisible("jobLineEdit")),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
-function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bodyshop }) {
+function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bodyshop, insertAuditTrail }) {
   const {
     treatments: { CriticalPartsScanning }
   } = useTreatmentsWithConfig({
@@ -74,6 +78,11 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
         notification.success({
           title: t("joblines.successes.created")
         });
+        insertAuditTrail({
+          jobid: jobLineEditModal.context.jobid,
+          operation: AuditTrailMapping.jobmanuallineinsert(buildJobLineInsertAuditDetails(values)),
+          type: "jobmanuallineinsert"
+        });
       } else {
         notification.error({
           title: t("joblines.errors.creating", {
@@ -103,6 +112,17 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
         notification.success({
           title: t("joblines.successes.updated")
         });
+        insertAuditTrail({
+          jobid: jobLineEditModal.context.jobid,
+          operation: AuditTrailMapping.joblineupdate(
+            values.line_desc || jobLineEditModal.context.line_desc || "manual line",
+            buildJobLineUpdateAuditDetails({
+              originalLine: jobLineEditModal.context,
+              values
+            })
+          ),
+          type: "joblineupdate"
+        });
       } else {
         notification.success({
           title: t("joblines.errors.updating", {

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -224,14 +224,10 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             </>
           )}
 
-          <Form.Item
-            name={["ins_co_nm"]}
-            label={t("jobs.fields.ins_co_nm")}
-            rules={[{ required: true }]}
-          >
+          <Form.Item name={["ins_co_nm"]} label={t("jobs.fields.ins_co_nm")} rules={[{ required: true }]}>
             <Select
               showSearch={{
-                optionFilterProp:'label'
+                optionFilterProp: "label"
               }}
               options={insuranceOptions}
             />
@@ -250,7 +246,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
                 label={t("jobs.fields.referralsource")}
                 rules={[{ required: bodyshop.enforce_referral }]}
               >
-                <Select options={referralOptions} />
+                <Select showSearch={{ optionFilterProp: "label" }} options={referralOptions} />
               </Form.Item>
 
               <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
@@ -272,19 +268,21 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
             >
               <Select
                 showSearch={{
-                  optionFilterProp: 'label',
-                  filterOption: (input, option) =>
-                    (option?.label ?? "").toLowerCase().includes(input.toLowerCase())
+                  optionFilterProp: "label",
+                  filterOption: (input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())
                 }}
                 style={{ width: 200 }}
-
                 options={csrOptions}
               />
             </Form.Item>
           )}
 
           {bodyshop.enforce_conversion_category && (
-            <Form.Item name="category" label={t("jobs.fields.category")} rules={[{ required: bodyshop.enforce_conversion_category }]}>
+            <Form.Item
+              name="category"
+              label={t("jobs.fields.category")}
+              rules={[{ required: bodyshop.enforce_conversion_category }]}
+            >
               <Select allowClear options={categoryOptions} />
             </Form.Item>
           )}

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -193,6 +193,9 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
                 </Form.Item>
                 <Form.Item label={t("jobs.fields.referralsource")} name="referral_source">
                   <Select
+                    showSearch={{
+                      optionFilterProp: "label"
+                    }}
                     options={bodyshop.md_referral_sources.map((s) => ({
                       value: s,
                       label: s

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

@@ -43,19 +43,25 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
-          <Select disabled={jobRO} options={[
-            { value: "W", label: t("jobs.labels.deductible.waived") },
-            { value: "Y", label: t("jobs.labels.deductible.stands") }
-          ]} />
+          <Select
+            disabled={jobRO}
+            options={[
+              { value: "W", label: t("jobs.labels.deductible.waived") },
+              { value: "Y", label: t("jobs.labels.deductible.stands") }
+            ]}
+          />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
           <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_note")} name="ded_note">
-          <Select disabled={jobRO} options={bodyshop.md_ded_notes.map((n) => ({
-            value: n,
-            label: n
-          }))} />
+          <Select
+            disabled={jobRO}
+            options={bodyshop.md_ded_notes.map((n) => ({
+              value: n,
+              label: n
+            }))}
+          />
         </Form.Item>
         <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
           <Input disabled={jobRO} />
@@ -65,10 +71,14 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-          <Select disabled={jobRO} onChange={handleInsCoChange} options={bodyshop.md_ins_cos.map((s) => ({
-            value: s.name,
-            label: s.name
-          }))} />
+          <Select
+            disabled={jobRO}
+            onChange={handleInsCoChange}
+            options={bodyshop.md_ins_cos.map((s) => ({
+              value: s.name,
+              label: s.name
+            }))}
+          />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ins_addr1")} name="ins_addr1">
           <Input disabled={jobRO} />
@@ -119,19 +129,30 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             }
           ]}
         >
-          <Select disabled={jobRO} allowClear options={bodyshop.md_referral_sources.map((s) => ({
-            value: s,
-            label: s
-          }))} />
+          <Select
+            disabled={jobRO}
+            allowClear
+            showSearch={{
+              optionFilterProp: "label"
+            }}
+            options={bodyshop.md_referral_sources.map((s) => ({
+              value: s,
+              label: s
+            }))}
+          />
         </Form.Item>
         <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport">
-          <Select disabled={jobRO} allowClear options={bodyshop.appt_alt_transport.map((s) => ({
-            value: s,
-            label: s
-          }))} />
+          <Select
+            disabled={jobRO}
+            allowClear
+            options={bodyshop.appt_alt_transport.map((s) => ({
+              value: s,
+              label: s
+            }))}
+          />
         </Form.Item>
       </FormRow>
       <Row gutter={[16, 16]}>
@@ -233,10 +254,14 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
       </FormRow>
       <FormRow header={t("jobs.forms.other")}>
         <Form.Item label={t("jobs.fields.category")} name="category">
-          <Select disabled={jobRO} allowClear options={bodyshop.md_categories.map((s) => ({
-            value: s,
-            label: s
-          }))} />
+          <Select
+            disabled={jobRO}
+            allowClear
+            options={bodyshop.md_categories.map((s) => ({
+              value: s,
+              label: s
+            }))}
+          />
         </Form.Item>
         <Form.Item label={t("jobs.fields.selling_dealer")} name="selling_dealer">
           <Input disabled={jobRO} />

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

@@ -3,7 +3,7 @@ import { Button, Card, Col, Row, Space } from "antd";
 import axios from "axios";
 import i18n from "i18next";
 import { isFunction } from "lodash";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import Lightbox from "react-image-lightbox";
 import "react-image-lightbox/style.css";
@@ -12,12 +12,12 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DocumentsUploadImgproxyComponent from "../documents-upload-imgproxy/documents-upload-imgproxy.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LocalMediaGrid from "../jobs-documents-local-gallery/local-media-grid.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import JobsDocumentsDownloadButton from "./jobs-document-imgproxy-gallery.download.component";
 import JobsDocumentsGalleryReassign from "./jobs-document-imgproxy-gallery.reassign.component";
 import JobsDocumentsDeleteButton from "./jobs-documents-imgproxy-gallery.delete.component";
 import JobsDocumentsGallerySelectAllComponent from "./jobs-documents-imgproxy-gallery.selectall.component";
-import LocalMediaGrid from "../jobs-documents-local-gallery/local-media-grid.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -38,6 +38,9 @@ function JobsDocumentsImgproxyComponent({
   const [galleryImages, setGalleryImages] = useState({ images: [], other: [] });
   const { t } = useTranslation();
   const [modalState, setModalState] = useState({ open: false, index: 0 });
+  const [previewUrls, setPreviewUrls] = useState({});
+  const [previewError, setPreviewError] = useState(null);
+  const previewUrlsRef = useRef({});
 
   const fetchThumbnails = useCallback(() => {
     fetchImgproxyThumbnails({ setStateCallback: setGalleryImages, jobId, billId });
@@ -49,8 +52,86 @@ function JobsDocumentsImgproxyComponent({
     }
   }, [data, fetchThumbnails]);
 
+  useEffect(() => {
+    return () => {
+      Object.values(previewUrlsRef.current).forEach(URL.revokeObjectURL);
+    };
+  }, []);
+
+  const selectedImage = modalState.open ? galleryImages.images[modalState.index] : null;
+
+  useEffect(() => {
+    if (!modalState.open || !selectedImage?.id) return;
+
+    if (previewUrlsRef.current[selectedImage.id]) {
+      setPreviewError(null);
+      return;
+    }
+
+    const controller = new AbortController();
+
+    async function loadPreviewImage() {
+      setPreviewError(null);
+
+      try {
+        const response = await axios.post(
+          "/media/imgproxy/original",
+          { documentId: selectedImage.id },
+          {
+            responseType: "blob",
+            signal: controller.signal
+          }
+        );
+        const blobUrl = URL.createObjectURL(response.data);
+
+        previewUrlsRef.current = {
+          ...previewUrlsRef.current,
+          [selectedImage.id]: blobUrl
+        };
+        setPreviewUrls(previewUrlsRef.current);
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") return;
+
+        console.error("Failed to fetch original image blob", error);
+        setPreviewError(error);
+      }
+    }
+
+    loadPreviewImage();
+
+    return () => {
+      controller.abort();
+    };
+  }, [modalState.open, selectedImage?.id]);
+
+  useEffect(() => {
+    if (modalState.open && !selectedImage) {
+      setModalState({ open: false, index: 0 });
+    }
+  }, [modalState.open, selectedImage]);
+
+  const openEditorForImage = useCallback((image) => {
+    if (!image?.id) return;
+
+    const newWindow = window.open(
+      `${window.location.protocol}//${window.location.host}/edit?documentId=${image.id}`,
+      "_blank",
+      "noopener,noreferrer"
+    );
+    if (newWindow) newWindow.opener = null;
+  }, []);
+
   const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
   const hasMobileAccess = HasFeatureAccess({ bodyshop, featureName: "mobile" });
+  const previewSrc = selectedImage ? previewUrls[selectedImage.id] : null;
+  const getLightboxImageSrc = useCallback(
+    (index) => {
+      const image = galleryImages.images[index];
+      return image ? previewUrls[image.id] || image.src : undefined;
+    },
+    [galleryImages.images, previewUrls]
+  );
+
   return (
     <div>
       <Row gutter={[16, 16]}>
@@ -147,30 +228,33 @@ function JobsDocumentsImgproxyComponent({
             />
           </Card>
         </Col>
-        {modalState.open && (
+        {modalState.open && selectedImage && (
           <Lightbox
             toolbarButtons={[
               <EditFilled
                 key="edit"
                 onClick={() => {
-                  const newWindow = window.open(
-                    `${window.location.protocol}//${window.location.host}/edit?documentId=${
-                      galleryImages.images[modalState.index].id
-                    }`,
-                    "_blank",
-                    "noopener,noreferrer"
-                  );
-                  if (newWindow) newWindow.opener = null;
+                  openEditorForImage(selectedImage);
                 }}
               />
             ]}
-            mainSrc={galleryImages.images[modalState.index].fullsize}
-            nextSrc={galleryImages.images[(modalState.index + 1) % galleryImages.images.length].fullsize}
-            prevSrc={
+            imageLoadErrorMessage={previewError ? t("general.errors.notfound") : undefined}
+            mainSrc={previewSrc || selectedImage.src}
+            mainSrcThumbnail={selectedImage.src}
+            nextSrc={getLightboxImageSrc((modalState.index + 1) % galleryImages.images.length)}
+            nextSrcThumbnail={galleryImages.images[(modalState.index + 1) % galleryImages.images.length]?.src}
+            prevSrc={getLightboxImageSrc(
+              (modalState.index + galleryImages.images.length - 1) % galleryImages.images.length
+            )}
+            prevSrcThumbnail={
               galleryImages.images[(modalState.index + galleryImages.images.length - 1) % galleryImages.images.length]
-                .fullsize
+                ?.src
             }
-            onCloseRequest={() => setModalState({ open: false, index: 0 })}
+            reactModalProps={{ ariaHideApp: false }}
+            onCloseRequest={() => {
+              setModalState({ open: false, index: 0 });
+              setPreviewError(null);
+            }}
             onMovePrevRequest={() =>
               setModalState({
                 ...modalState,

client/src/components/layout-form-row/config-list-actions.utils.jsx

@@ -0,0 +1,17 @@
+import { Button } from "antd";
+import ConfigListEmptyState from "./config-list-empty-state.component.jsx";
+
+export const buildConfigListActionButton = ({ key, label, onClick, id }) => (
+  <Button key={key} type="primary" block id={id} onClick={onClick}>
+    {label}
+  </Button>
+);
+
+export const renderConfigListOrEmpty = ({ fields, actionLabel, renderItems }) =>
+  fields.length === 0 ? <ConfigListEmptyState actionLabel={actionLabel} /> : renderItems();
+
+export const buildSectionActionButton = (key, label, onClick, id) =>
+  buildConfigListActionButton({ key, label, onClick, id });
+
+export const renderListOrEmpty = (fields, actionLabel, renderItems) =>
+  renderConfigListOrEmpty({ fields, actionLabel, renderItems });

client/src/components/layout-form-row/config-list-empty-state.component.jsx

@@ -0,0 +1,11 @@
+import { useTranslation } from "react-i18next";
+
+export default function ConfigListEmptyState({ actionLabel, minHeight = 96 }) {
+  const { t } = useTranslation();
+
+  return (
+    <div className="imex-form-row-empty-state" style={{ minHeight }}>
+      {t("general.labels.click_to_begin", { action: actionLabel })}
+    </div>
+  );
+}

client/src/components/layout-form-row/inline-form-row-title.utils.js

@@ -0,0 +1,89 @@
+import { UnorderedListOutlined } from "@ant-design/icons";
+
+export const inlineFormRowTitleStyles = Object.freeze({
+  input: Object.freeze({
+    background: "transparent",
+    border: "none",
+    borderRadius: 0,
+    boxShadow: "none",
+    paddingInline: 0,
+    paddingBlock: 0,
+    lineHeight: 1.35,
+    flex: "1 1 auto",
+    minWidth: 0,
+    width: "100%"
+  }),
+  row: Object.freeze({
+    display: "flex",
+    gap: 6,
+    flexWrap: "wrap",
+    alignItems: "center",
+    width: "100%",
+    paddingInline: 4
+  }),
+  group: Object.freeze({
+    display: "flex",
+    alignItems: "center",
+    gap: 8,
+    paddingInline: 8,
+    paddingBlock: 4,
+    borderRadius: 10,
+    border: "1px solid var(--imex-form-title-group-border)",
+    background: "var(--imex-form-title-group-bg)",
+    minWidth: 0,
+    flex: "1 1 0"
+  }),
+  label: Object.freeze({
+    color: "var(--ant-color-text-secondary)",
+    fontSize: 12,
+    fontWeight: 600,
+    lineHeight: 1,
+    whiteSpace: "nowrap",
+    paddingInline: 6,
+    paddingBlock: 3,
+    borderRadius: 999,
+    border: "1px solid var(--imex-form-title-label-border)",
+    background: "var(--imex-form-title-label-bg)"
+  }),
+  handle: Object.freeze({
+    color: "var(--ant-color-text-tertiary)",
+    fontSize: 14,
+    flex: "0 0 auto",
+    marginRight: 2
+  }),
+  separator: Object.freeze({
+    width: 1,
+    height: 16,
+    background: "color-mix(in srgb, var(--imex-form-surface-border) 58%, transparent)",
+    borderRadius: 999,
+    flex: "0 0 auto",
+    marginInline: 2
+  }),
+  text: Object.freeze({
+    whiteSpace: "nowrap",
+    fontWeight: 500,
+    fontSize: "var(--ant-font-size-lg)",
+    lineHeight: 1.2
+  })
+});
+
+export const INLINE_TITLE_INPUT_STYLE = inlineFormRowTitleStyles.input;
+export const INLINE_TITLE_ROW_STYLE = inlineFormRowTitleStyles.row;
+export const INLINE_TITLE_GROUP_STYLE = inlineFormRowTitleStyles.group;
+export const InlineTitleListIcon = UnorderedListOutlined;
+export const INLINE_TITLE_SWITCH_GROUP_STYLE = Object.freeze({
+  ...inlineFormRowTitleStyles.group,
+  flex: "0 0 auto"
+});
+export const INLINE_TITLE_LABEL_STYLE = inlineFormRowTitleStyles.label;
+export const INLINE_TITLE_HANDLE_STYLE = inlineFormRowTitleStyles.handle;
+export const INLINE_TITLE_SEPARATOR_STYLE = inlineFormRowTitleStyles.separator;
+export const INLINE_TITLE_TEXT_STYLE = inlineFormRowTitleStyles.text;
+
+export const INLINE_FORM_ROW_WRAP_TITLE_STYLES = Object.freeze({
+  title: Object.freeze({
+    whiteSpace: "normal",
+    overflow: "visible",
+    textOverflow: "unset"
+  })
+});

client/src/components/layout-form-row/inline-validated-form-row.component.jsx

@@ -0,0 +1,47 @@
+import { Form } from "antd";
+import LayoutFormRow from "./layout-form-row.component";
+
+export default function InlineValidatedFormRow({ actions, errorNames = [], extraErrors = [], form, ...layoutFormRowProps }) {
+  const normalizedErrorNames = Array.isArray(errorNames) ? errorNames : [errorNames];
+  const normalizedExtraErrors = Array.isArray(extraErrors) ? extraErrors.filter(Boolean) : [extraErrors].filter(Boolean);
+
+  return (
+    <Form.Item noStyle shouldUpdate>
+      {() => {
+        const fieldErrors = normalizedErrorNames.flatMap((name) => form?.getFieldError?.(name) || []);
+        const errors = [...new Set([...fieldErrors, ...normalizedExtraErrors])];
+        const resolvedClassName = [
+          layoutFormRowProps.className,
+          errors.length > 0 ? "imex-form-row--error" : null
+        ]
+          .filter(Boolean)
+          .join(" ");
+
+        const normalizedActions = Array.isArray(actions) ? actions.filter(Boolean) : [actions].filter(Boolean);
+        const resolvedActions =
+          errors.length > 0
+            ? [
+                <div
+                  key="inline-form-row-footer"
+                  className="imex-inline-form-row-errors"
+                  style={{
+                    display: "flex",
+                    flexDirection: "column",
+                    gap: normalizedActions.length > 0 ? 8 : 0,
+                    width: "100%",
+                    textAlign: "left"
+                  }}
+                >
+                  <Form.ErrorList errors={errors} />
+                  {normalizedActions.length > 0 ? <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>{normalizedActions}</div> : null}
+                </div>
+              ]
+            : normalizedActions.length > 0
+              ? normalizedActions
+              : undefined;
+
+        return <LayoutFormRow {...layoutFormRowProps} className={resolvedClassName} actions={resolvedActions} />;
+      }}
+    </Form.Item>
+  );
+}

client/src/components/layout-form-row/layout-form-row.component.jsx

@@ -1,5 +1,6 @@
 import { Card, Col, Row } from "antd";
 import { Children, isValidElement } from "react";
+import { INLINE_FORM_ROW_WRAP_TITLE_STYLES } from "./inline-form-row-title.utils.js";
 import "./layout-form-row.styles.scss";
 
 export default function LayoutFormRow({
@@ -7,32 +8,45 @@ export default function LayoutFormRow({
   children,
   grow = false,
   noDivider = false,
-  gutter = [16, 16], // Responsive gutter: horizontal, vertical
+  titleOnly = false,
+  wrapTitle = false,
+  gutter,
   rowProps,
 
   // Optional overrides if you ever need per-section customization
   surface = true,
   surfaceBg,
   surfaceHeaderBg,
+  surfaceBorderColor,
 
   ...cardProps
 }) {
   const items = Children.toArray(children).filter(Boolean);
-  if (items.length === 0) return null;
+  const isCompactRow = noDivider;
 
   const title = !noDivider && header ? header : undefined;
+  const resolvedTitle = cardProps.title ?? title;
+  const isHeaderOnly = titleOnly || items.length === 0;
+  const hideBody = isHeaderOnly;
+
+  if (items.length === 0 && !resolvedTitle) return null;
+  const resolvedGutter = gutter ?? [16, isCompactRow ? 8 : 16];
 
   const bg = surfaceBg ?? (surface ? "var(--imex-form-surface)" : undefined);
   const headBg = surfaceHeaderBg ?? (surface ? "var(--imex-form-surface-head)" : undefined);
+  const borderColor = surfaceBorderColor ?? (surface ? "var(--imex-form-surface-border)" : undefined);
 
   const mergedStyles = mergeSemanticStyles(
     {
+      ...(wrapTitle ? INLINE_FORM_ROW_WRAP_TITLE_STYLES : null),
       header: {
-        paddingInline: 16,
-        background: headBg
+        paddingInline: isHeaderOnly ? 8 : isCompactRow ? 12 : 16,
+        background: headBg,
+        borderBottomColor: borderColor
       },
       body: {
-        padding: 16,
+        padding: hideBody ? 0 : isCompactRow ? 12 : 16,
+        display: hideBody ? "none" : undefined,
         background: bg
       }
     },
@@ -40,28 +54,12 @@ export default function LayoutFormRow({
   );
 
   const baseCardStyle = {
-    marginBottom: ".8rem",
+    marginBottom: isHeaderOnly ? "0" : isCompactRow ? "8px" : ".8rem",
     ...(bg ? { background: bg } : null), // ensures the “circled area” is tinted
+    ...(borderColor ? { borderColor } : null),
     ...cardProps.style
   };
 
-  // single child => just render it
-  if (items.length === 1) {
-    return (
-      <Card
-        {...cardProps}
-        title={cardProps.title ?? title}
-        size={cardProps.size ?? "small"}
-        variant={cardProps.variant ?? "outlined"}
-        className={["imex-form-row", cardProps.className].filter(Boolean).join(" ")}
-        style={baseCardStyle}
-        styles={mergedStyles}
-      >
-        {items[0]}
-      </Card>
-    );
-  }
-
   const count = items.length;
 
   // Modern responsive strategy leveraging Ant Design 6:
@@ -125,20 +123,32 @@ export default function LayoutFormRow({
   return (
     <Card
       {...cardProps}
-      title={cardProps.title ?? title}
+      title={resolvedTitle}
       size={cardProps.size ?? "small"}
       variant={cardProps.variant ?? "outlined"}
-      className={["imex-form-row", cardProps.className].filter(Boolean).join(" ")}
+      className={[
+        "imex-form-row",
+        isCompactRow ? "imex-form-row--compact" : null,
+        isHeaderOnly ? "imex-form-row--title-only" : null,
+        cardProps.className
+      ]
+        .filter(Boolean)
+        .join(" ")}
       style={baseCardStyle}
       styles={mergedStyles}
     >
-      <Row gutter={gutter} wrap {...rowProps}>
-        {items.map((child, idx) => (
-          <Col key={child?.key ?? idx} {...getColPropsForChild(child)}>
-            {child}
-          </Col>
+      {!isHeaderOnly &&
+        (items.length === 1 ? (
+          items[0]
+        ) : (
+          <Row gutter={resolvedGutter} wrap {...rowProps}>
+            {items.map((child, idx) => (
+              <Col key={child?.key ?? idx} {...getColPropsForChild(child)}>
+                {child}
+              </Col>
+            ))}
+          </Row>
         ))}
-      </Row>
     </Card>
   );
 }
@@ -152,6 +162,7 @@ function mergeSemanticStyles(defaults, userStyles) {
       return {
         ...defaults,
         ...computed,
+        title: { ...(defaults.title || {}), ...(computed.title || {}) },
         header: { ...defaults.header, ...(computed.header || {}) },
         body: { ...defaults.body, ...(computed.body || {}) }
       };
@@ -161,6 +172,7 @@ function mergeSemanticStyles(defaults, userStyles) {
   return {
     ...defaults,
     ...userStyles,
+    title: { ...(defaults.title || {}), ...(userStyles.title || {}) },
     header: { ...defaults.header, ...(userStyles.header || {}) },
     body: { ...defaults.body, ...(userStyles.body || {}) }
   };

client/src/components/layout-form-row/layout-form-row.styles.scss

@@ -13,6 +13,12 @@
   --imex-form-surface: #fafafa; /* subtle contrast vs white page */
   --imex-form-surface-head: #f5f5f5; /* header strip */
   --imex-form-surface-border: #d9d9d9; /* matches AntD-ish border */
+  --imex-form-title-input-bg: rgba(255, 255, 255, 0.96);
+  --imex-form-title-input-border: rgba(0, 0, 0, 0.08);
+  --imex-form-title-group-bg: rgba(255, 255, 255, 0.72);
+  --imex-form-title-group-border: rgba(0, 0, 0, 0.08);
+  --imex-form-title-label-bg: rgba(0, 0, 0, 0.04);
+  --imex-form-title-label-border: rgba(0, 0, 0, 0.06);
 }
 
 /* Pick the selector that matches your app and remove the rest */
@@ -20,6 +26,12 @@ html[data-theme="dark"] {
   --imex-form-surface: rgba(255, 255, 255, 0.01); /* subtle lift off page bg */
   --imex-form-surface-head: rgba(255, 255, 255, 0.06); /* slightly stronger for header strip */
   --imex-form-surface-border: rgba(5, 5, 5, 0.12);
+  --imex-form-title-input-bg: rgba(255, 255, 255, 0.12);
+  --imex-form-title-input-border: rgba(255, 255, 255, 0.2);
+  --imex-form-title-group-bg: rgba(255, 255, 255, 0.08);
+  --imex-form-title-group-border: rgba(255, 255, 255, 0.16);
+  --imex-form-title-label-bg: rgba(255, 255, 255, 0.06);
+  --imex-form-title-label-border: rgba(255, 255, 255, 0.12);
 }
 
 .imex-form-row {
@@ -38,18 +50,111 @@ html[data-theme="dark"] {
     border-color: var(--imex-form-surface-border);
   }
 
+  &.imex-form-row--error.ant-card {
+    border-color: var(--ant-color-error);
+    box-shadow: 0 0 0 1px color-mix(in srgb, var(--ant-color-error) 24%, transparent);
+  }
+
   .ant-card-head {
     background: var(--imex-form-surface-head);
     border-bottom-color: var(--imex-form-surface-border);
   }
 
+  &.imex-form-row--error {
+    .ant-card-head,
+    .ant-card-actions {
+      border-color: color-mix(in srgb, var(--ant-color-error) 34%, var(--imex-form-surface-border));
+    }
+  }
+
+  &.imex-form-row--compact {
+    .ant-card-head {
+      min-height: 40px;
+    }
+
+    .ant-card-head-title,
+    .ant-card-extra {
+      padding-block: 2px;
+    }
+
+    .ant-form-item {
+      margin-bottom: 12px;
+    }
+  }
+
+  &.imex-form-row--title-only {
+    .ant-card-head {
+      min-height: auto;
+      padding-inline: 6px;
+      padding-block: 0;
+      border-radius: inherit;
+    }
+
+    .ant-card-head-wrapper {
+      gap: 2px;
+      align-items: center;
+    }
+
+    .ant-card-head-title,
+    .ant-card-extra {
+      padding-block: 0;
+      display: flex;
+      align-items: center;
+    }
+
+    .ant-card-head-title {
+      white-space: normal;
+      overflow: visible;
+      text-overflow: unset;
+      font-size: var(--ant-font-size);
+      line-height: 1.1;
+      padding-inline: 4px;
+    }
+
+    .ant-card-body {
+      display: none;
+      padding: 0;
+    }
+
+    .ant-input,
+    .ant-input-number,
+    .ant-input-affix-wrapper,
+    .ant-select-selector,
+    .ant-picker {
+      background: var(--imex-form-title-input-bg);
+      border-color: var(--imex-form-title-input-border);
+    }
+
+    .ant-input-number-input {
+      background: transparent;
+    }
+  }
+
   .ant-card-body {
     background: var(--imex-form-surface);
   }
 
+  .ant-card-actions {
+    background: var(--imex-form-surface-head);
+    border-top-color: var(--imex-form-surface-border);
+  }
+
+  .ant-card-actions > li {
+    margin: 10px 0;
+    padding-inline: 12px;
+  }
+
+  .ant-card-actions .ant-btn {
+    width: 100%;
+  }
+
+  .ant-form-item:last-child {
+    margin-bottom: 4px;
+  }
+
   /* Optional: tighter spacing on phones for better space usage */
   @media (max-width: 575px) {
-    .ant-card-head {
+    &:not(.imex-form-row--title-only) .ant-card-head {
       padding-inline: 12px;
       padding-block: 12px;
     }
@@ -70,6 +175,14 @@ html[data-theme="dark"] {
     width: 100%;
   }
 
+  .ant-form-item:has(.imex-form-row--compact) {
+    margin-bottom: 8px;
+  }
+
+  .ant-form-item:has(.imex-form-row--title-only) {
+    margin-bottom: 4px;
+  }
+
   /* Better form item spacing on mobile */
   @media (max-width: 575px) {
     .ant-form-item {
@@ -77,3 +190,24 @@ html[data-theme="dark"] {
     }
   }
 }
+
+.imex-form-row-empty-state {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 24px 16px;
+  text-align: center;
+  color: var(--ant-color-text-description);
+  font-size: var(--ant-font-size);
+  line-height: 1.5;
+}
+
+.imex-inline-form-row-errors {
+  color: var(--ant-color-error);
+
+  .ant-form-item-explain,
+  .ant-form-item-explain-error,
+  .ant-form-item-additional {
+    color: var(--ant-color-error);
+  }
+}

client/src/components/notification-settings/column-header-checkbox.component.jsx

@@ -1,4 +1,3 @@
-import { notificationScenarios } from "../../utils/jobNotificationScenarios.js";
 import { Checkbox, Form } from "antd";
 import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
@@ -9,18 +8,18 @@ import PropTypes from "prop-types";
  * @param form
  * @param disabled
  * @param onHeaderChange
+ * @param scenarioKeys
  * @returns {JSX.Element}
  * @constructor
  */
-const ColumnHeaderCheckbox = ({ channel, form, disabled = false, onHeaderChange }) => {
+const ColumnHeaderCheckbox = ({ channel, form, disabled = false, onHeaderChange, scenarioKeys }) => {
   const { t } = useTranslation();
 
   // Subscribe to all form values so that this component re-renders on changes.
   const formValues = Form.useWatch([], form) || {};
 
   // Determine if all scenarios for this channel are checked.
-  const allChecked =
-    notificationScenarios.length > 0 && notificationScenarios.every((scenario) => formValues[scenario]?.[channel]);
+  const allChecked = scenarioKeys.length > 0 && scenarioKeys.every((scenario) => formValues[scenario]?.[channel]);
 
   const onChange = (e) => {
     const checked = e.target.checked;
@@ -28,7 +27,7 @@ const ColumnHeaderCheckbox = ({ channel, form, disabled = false, onHeaderChange
     const currentValues = form.getFieldsValue();
     // Update each scenario for this channel.
     const newValues = { ...currentValues };
-    notificationScenarios.forEach((scenario) => {
+    scenarioKeys.forEach((scenario) => {
       newValues[scenario] = { ...newValues[scenario], [channel]: checked };
     });
     // Update form values.
@@ -50,7 +49,8 @@ ColumnHeaderCheckbox.propTypes = {
   channel: PropTypes.oneOf(["app", "email", "fcm"]).isRequired,
   form: PropTypes.object.isRequired,
   disabled: PropTypes.bool,
-  onHeaderChange: PropTypes.func
+  onHeaderChange: PropTypes.func,
+  scenarioKeys: PropTypes.arrayOf(PropTypes.string).isRequired
 };
 
 export default ColumnHeaderCheckbox;

client/src/components/notification-settings/notification-settings-form.component.jsx

@@ -12,12 +12,13 @@ import {
   UPDATE_NOTIFICATION_SETTINGS,
   UPDATE_NOTIFICATIONS_AUTOADD
 } from "../../graphql/user.queries.js";
-import { notificationScenarios } from "../../utils/jobNotificationScenarios.js";
+import { getNotificationScenarios, notificationScenarioDefaults } from "../../utils/jobNotificationScenarios.js";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
 import PropTypes from "prop-types";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import ColumnHeaderCheckbox from "../notification-settings/column-header-checkbox.component.jsx";
 import { useIsEmployee } from "../../utils/useIsEmployee.js";
+import { hasDocumensoApiKey } from "../../utils/esignature.js";
 
 /**
  * Notifications Settings Form
@@ -35,6 +36,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
   const [initialAutoAdd, setInitialAutoAdd] = useState(false);
   const notification = useNotification();
   const isEmployee = useIsEmployee(bodyshop, currentUser);
+  const notificationScenarios = getNotificationScenarios({ includeEsign: hasDocumensoApiKey(bodyshop) });
 
   // Fetch notification settings and notifications_autoadd
   const { loading, error, data } = useQuery(QUERY_NOTIFICATION_SETTINGS, {
@@ -55,7 +57,8 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
 
       // Ensure each scenario has an object with { app, email, fcm }
       const formattedValues = notificationScenarios.reduce((acc, scenario) => {
-        acc[scenario] = settings[scenario] ?? { app: false, email: false, fcm: false };
+        acc[scenario] = settings[scenario] ??
+          notificationScenarioDefaults[scenario] ?? { app: false, email: false, fcm: false };
         return acc;
       }, {});
 
@@ -65,7 +68,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
       setInitialAutoAdd(autoAdd);
       setIsDirty(false); // Reset dirty state when new data loads
     }
-  }, [data, form]);
+  }, [data, form, notificationScenarios]);
 
   // Handle toggle of notifications_autoadd
   const handleAutoAddToggle = async (checked) => {
@@ -136,7 +139,14 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
       width: "80%"
     },
     {
-      title: <ColumnHeaderCheckbox channel="app" form={form} onHeaderChange={() => setIsDirty(true)} />,
+      title: (
+        <ColumnHeaderCheckbox
+          channel="app"
+          form={form}
+          onHeaderChange={() => setIsDirty(true)}
+          scenarioKeys={notificationScenarios}
+        />
+      ),
       dataIndex: "app",
       key: "app",
       align: "center",
@@ -147,7 +157,14 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
       )
     },
     {
-      title: <ColumnHeaderCheckbox channel="email" form={form} onHeaderChange={() => setIsDirty(true)} />,
+      title: (
+        <ColumnHeaderCheckbox
+          channel="email"
+          form={form}
+          onHeaderChange={() => setIsDirty(true)}
+          scenarioKeys={notificationScenarios}
+        />
+      ),
       dataIndex: "email",
       key: "email",
       align: "center",
@@ -162,7 +179,14 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
   // Currently disabled for prod
   if (!import.meta.env.PROD) {
     columns.push({
-      title: <ColumnHeaderCheckbox channel="fcm" form={form} onHeaderChange={() => setIsDirty(true)} />,
+      title: (
+        <ColumnHeaderCheckbox
+          channel="fcm"
+          form={form}
+          onHeaderChange={() => setIsDirty(true)}
+          scenarioKeys={notificationScenarios}
+        />
+      ),
       dataIndex: "fcm",
       key: "fcm",
       align: "center",

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

@@ -11,12 +11,13 @@ import ResponsiveTable from "../responsive-table/responsive-table.component";
 
 export default function OwnersListComponent({ loading, owners, total, refetch }) {
   const search = queryString.parse(useLocation().search);
-  const {
-    page
-    // sortcolumn, sortorder
-  } = search;
+  const { page, pageSize } = search;
   const history = useNavigate();
 
+  const currentPage = Number.parseInt(page || "1", 10);
+  const parsedPageSize = Number.parseInt(pageSize || String(pageLimit), 10);
+  const currentPageSize = Number.isNaN(parsedPageSize) ? pageLimit : parsedPageSize;
+
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" }
@@ -71,10 +72,14 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
+    const nextPageSize = pagination?.pageSize || currentPageSize;
+    const pageSizeChanged = nextPageSize !== currentPageSize;
+
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
     const updatedSearch = {
       ...search,
-      page: pagination.current,
+      pageSize: nextPageSize,
+      page: pageSizeChanged ? 1 : pagination.current,
       sortcolumn: sorter.columnKey,
       sortorder: sorter.order
     };
@@ -119,7 +124,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
     >
       <ResponsiveTable
         loading={loading}
-        pagination={{ placement: "top", pageSize: pageLimit, current: parseInt(page || 1, 10), total: total }}
+        pagination={{ placement: "top", pageSize: currentPageSize, current: currentPage, showSizeChanger: true, total: total }}
         columns={columns}
         mobileColumnKeys={["name", "ownr_ph1", "ownr_ph2"]}
         rowKey="id"

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

@@ -8,14 +8,19 @@ import { pageLimit } from "../../utils/config";
 
 export default function OwnersListContainer() {
   const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder, search } = searchParams;
+  const { page, sortcolumn, sortorder, search, pageSize } = searchParams;
+
+  const currentPage = Number.parseInt(page || "1", 10);
+  const parsedPageSize = Number.parseInt(pageSize || String(pageLimit), 10);
+  const currentPageSize = Number.isNaN(parsedPageSize) ? pageLimit : parsedPageSize;
+
   const { loading, error, data, refetch } = useQuery(QUERY_ALL_OWNERS_PAGINATED, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     variables: {
       search: search || "",
-      offset: page ? (page - 1) * pageLimit : 0,
-      limit: pageLimit,
+      offset: (currentPage - 1) * currentPageSize,
+      limit: currentPageSize,
       order: [
         {
           [sortcolumn || "created_at"]: sortorder ? (sortorder === "descend" ? "desc" : "asc") : "desc"

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

@@ -1,12 +1,13 @@
 import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
-import { Checkbox, Divider, Dropdown, Form, Input, InputNumber, Radio, Select, Space, Tag } from "antd";
+import { Button, Checkbox, Divider, Dropdown, Form, Input, InputNumber, Radio, Select, Space, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component";
@@ -50,6 +51,7 @@ export function PartsOrderModalComponent({
   });
 
   const { t } = useTranslation();
+  const partsOrderLines = Form.useWatch(["parts_order_lines", "data"], form) || [];
   const handleClick = ({ item }) => {
     form.setFieldsValue({ comments: item.props.value });
   };
@@ -128,10 +130,38 @@ export function PartsOrderModalComponent({
         {(fields, { remove, move }) => {
           return (
             <div>
-              {fields.map((field, index) => (
-                <Form.Item required={false} key={field.key}>
-                  <div style={{ display: "flex" }}>
-                    <LayoutFormRow grow noDivider style={{ flex: 1 }}>
+              {fields.map((field, index) => {
+                const partsOrderLine = partsOrderLines[field.name] || {};
+
+                return (
+                  <Form.Item required={false} key={field.key}>
+                    <LayoutFormRow
+                      grow
+                      noDivider
+                      title={getFormListItemTitle(
+                        t("parts_orders.fields.line_desc"),
+                        index,
+                        partsOrderLine.line_desc,
+                        partsOrderLine.oem_partno
+                      )}
+                      extra={
+                        <Space align="center" size="small">
+                          <Button
+                            type="text"
+                            icon={<DeleteFilled />}
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                          <FormListMoveArrows
+                            move={move}
+                            index={index}
+                            total={fields.length}
+                            orientation="horizontal"
+                          />
+                        </Space>
+                      }
+                    >
                       <Form.Item
                         //span={8}
                         label={t("parts_orders.fields.line_desc")}
@@ -146,6 +176,9 @@ export function PartsOrderModalComponent({
                       >
                         <Input />
                       </Form.Item>
+                      <Form.Item key={`${index}job_line_id`} name={[field.name, "job_line_id"]} hidden>
+                        <Input type="hidden" />
+                      </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.line_remarks")}
                         key={`${index}line_remarks`}
@@ -220,20 +253,9 @@ export function PartsOrderModalComponent({
                         </Form.Item>
                       )}
                     </LayoutFormRow>
-                    <Space wrap size="small" align="center">
-                      <div>
-                        <DeleteFilled
-                          style={{ margin: "1rem" }}
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                      </div>
-                      <FormListMoveArrows move={move} index={index} total={fields.length} />
-                    </Space>
-                  </div>
-                </Form.Item>
-              ))}
+                  </Form.Item>
+                );
+              })}
             </div>
           );
         }}

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -23,6 +23,7 @@ import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import _ from "lodash";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { buildSubmittedPartsOrderLines, getSubmittedPartsOrderJobLineIds } from "./parts-order-modal.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -82,15 +83,10 @@ export function PartsOrderModalContainer({
 
     // Force job_line_id from context so it never gets dropped by AntD form submission behavior.
     const submittedLines = values?.parts_order_lines?.data ?? [];
-    const forcedLines = submittedLines.map((p, index) => {
-      const originalLine = linesToOrder?.[index];
-      const jobLineId = isReturn ? originalLine?.joblineid : originalLine?.id;
-
-      return {
-        ...p,
-        job_line_id: jobLineId,
-        ...(isReturn && { cm_received: false })
-      };
+    const forcedLines = buildSubmittedPartsOrderLines({
+      submittedLines,
+      linesToOrder,
+      isReturn
     });
 
     let insertResult;
@@ -147,10 +143,7 @@ export function PartsOrderModalContainer({
       type: isReturn ? "jobspartsreturn" : "jobspartsorder"
     });
 
-    // Use linesToOrder from context instead of form values to preserve job line ids
-    const jobLineIds = (linesToOrder ?? [])
-      .filter((line) => (isReturn ? line.joblineid : line.id))
-      .map((line) => (isReturn ? line.joblineid : line.id));
+    const jobLineIds = getSubmittedPartsOrderJobLineIds(forcedLines);
 
     try {
       const jobLinesResult = await updateJobLines({
@@ -206,23 +199,20 @@ export function PartsOrderModalContainer({
             isinhouse: true,
             date: dayjs(),
             total: 0,
-            billlines: forcedLines.map((p, index) => {
-              const originalLine = linesToOrder?.[index];
-              return {
-                joblineid: isReturn ? originalLine?.joblineid : originalLine?.id,
-                actual_price: p.act_price,
-                actual_cost: 0, // p.act_price,
-                line_desc: p.line_desc,
-                line_remarks: p.line_remarks,
-                part_type: p.part_type,
-                quantity: p.quantity || 1,
-                applicable_taxes: {
-                  local: false,
-                  state: false,
-                  federal: false
-                }
-              };
-            })
+            billlines: forcedLines.map((p) => ({
+              joblineid: p.job_line_id,
+              actual_price: p.act_price,
+              actual_cost: 0, // p.act_price,
+              line_desc: p.line_desc,
+              line_remarks: p.line_remarks,
+              part_type: p.part_type,
+              quantity: p.quantity || 1,
+              applicable_taxes: {
+                local: false,
+                state: false,
+                federal: false
+              }
+            }))
           }
         }
       });

client/src/components/parts-order-modal/parts-order-modal.utils.js

@@ -0,0 +1,23 @@
+export const getPartsOrderJobLineId = ({ line, originalLine, isReturn }) => {
+  return line?.job_line_id || (isReturn ? originalLine?.joblineid : originalLine?.id);
+};
+
+export const buildSubmittedPartsOrderLines = ({ submittedLines = [], linesToOrder = [], isReturn }) => {
+  return submittedLines.map((line, index) => {
+    const jobLineId = getPartsOrderJobLineId({
+      line,
+      originalLine: linesToOrder?.[index],
+      isReturn
+    });
+
+    return {
+      ...line,
+      job_line_id: jobLineId,
+      ...(isReturn && { cm_received: false })
+    };
+  });
+};
+
+export const getSubmittedPartsOrderJobLineIds = (partsOrderLines = []) => {
+  return partsOrderLines.map((line) => line.job_line_id).filter(Boolean);
+};

client/src/components/parts-order-modal/parts-order-modal.utils.test.js

@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { buildSubmittedPartsOrderLines, getSubmittedPartsOrderJobLineIds } from "./parts-order-modal.utils.js";
+
+describe("parts order modal utilities", () => {
+  it("preserves submitted job line ids after a row is removed", () => {
+    const submittedLines = [
+      { line_desc: "second line", job_line_id: "job-line-2" },
+      { line_desc: "third line", job_line_id: "job-line-3" }
+    ];
+    const linesToOrder = [{ id: "job-line-1" }, { id: "job-line-2" }, { id: "job-line-3" }];
+
+    const result = buildSubmittedPartsOrderLines({ submittedLines, linesToOrder, isReturn: false });
+
+    expect(result.map((line) => line.job_line_id)).toEqual(["job-line-2", "job-line-3"]);
+    expect(getSubmittedPartsOrderJobLineIds(result)).toEqual(["job-line-2", "job-line-3"]);
+  });
+
+  it("falls back to original return line ids when the form omits hidden metadata", () => {
+    const submittedLines = [{ line_desc: "return line" }];
+    const linesToOrder = [{ joblineid: "return-job-line-1" }];
+
+    const result = buildSubmittedPartsOrderLines({ submittedLines, linesToOrder, isReturn: true });
+
+    expect(result).toEqual([
+      {
+        line_desc: "return line",
+        job_line_id: "return-job-line-1",
+        cm_received: false
+      }
+    ]);
+  });
+});

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

@@ -29,7 +29,10 @@ const mapStateToProps = createStructuredSelector({
 
 export function PartsQueueListComponent({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
-  const { selected, sortcolumn, sortorder, statusFilters } = searchParams;
+  const { selected, sortcolumn, sortorder, statusFilters, page, pageSize } = searchParams;
+  const currentPage = Number.parseInt(page || "1", 10);
+  const parsedPageSize = Number.parseInt(pageSize || String(pageLimit), 10);
+  const currentPageSize = Number.isNaN(parsedPageSize) ? pageLimit : parsedPageSize;
   const history = useNavigate();
   const [filter, setFilter] = useLocalStorage("filter_parts_queue", null);
   const [viewTimeStamp, setViewTimeStamp] = useLocalStorage("parts_queue_timestamps", false);
@@ -66,7 +69,11 @@ export function PartsQueueListComponent({ bodyshop }) {
     : [];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    //  searchParams.page = pagination.current;
+    const nextPageSize = pagination?.pageSize || currentPageSize;
+    const pageSizeChanged = nextPageSize !== currentPageSize;
+
+    searchParams.pageSize = nextPageSize;
+    searchParams.page = pageSizeChanged ? 1 : pagination.current;
     searchParams.sortcolumn = sorter.columnKey;
     searchParams.sortorder = sorter.order;
 
@@ -315,9 +322,10 @@ export function PartsQueueListComponent({ bodyshop }) {
         loading={loading}
         pagination={{
           placement: "top",
-          pageSize: pageLimit
-          // current: parseInt(page || 1),
-          // total: data && data.jobs_aggregate.aggregate.count,
+          pageSize: currentPageSize,
+          current: currentPage,
+          showSizeChanger: true,
+          total: jobs.length
         }}
         columns={columns}
         mobileColumnKeys={["ro_number", "ownr_ln", "status", "vehicle", "partsstatus"]}

client/src/components/parts-receive-modal/parts-receive-modal.component.jsx

@@ -1,10 +1,11 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Form, Input, InputNumber, Select, Typography } from "antd";
+import { Button, Form, Input, InputNumber, Select, Space, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -15,6 +16,7 @@ export default connect(mapStateToProps, null)(PartsReceiveModalComponent);
 
 export function PartsReceiveModalComponent({ bodyshop, form }) {
   const { t } = useTranslation();
+  const partsOrderLines = Form.useWatch(["partsorderlines"], form) || [];
 
   return (
     <div>
@@ -42,16 +44,43 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
         {(fields, { remove, move }) => {
           return (
             <div>
-              {fields.map((field, index) => (
-                <Form.Item required={false} key={field.key}>
-                  <div style={{ display: "flex", alignItems: "center" }}>
+              {fields.map((field, index) => {
+                const partsOrderLine = partsOrderLines[field.name] || {};
+
+                return (
+                  <Form.Item required={false} key={field.key}>
                     <Form.Item hidden key={`${index}joblineid`} name={[field.name, "joblineid"]}>
                       <Input />
                     </Form.Item>
                     <Form.Item hidden key={`${index}id`} name={[field.name, "id"]}>
                       <Input />
                     </Form.Item>
-                    <LayoutFormRow grow style={{ flex: 1 }}>
+                    <LayoutFormRow
+                      grow
+                      title={getFormListItemTitle(
+                        t("parts_orders.fields.line_desc"),
+                        index,
+                        partsOrderLine.line_desc,
+                        partsOrderLine.oem_partno
+                      )}
+                      extra={
+                        <Space align="center" size="small">
+                          <Button
+                            type="text"
+                            icon={<DeleteFilled />}
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                          <FormListMoveArrows
+                            move={move}
+                            index={index}
+                            total={fields.length}
+                            orientation="horizontal"
+                          />
+                        </Space>
+                      }
+                    >
                       <Form.Item
                         label={t("parts_orders.fields.line_desc")}
                         key={`${index}line_desc`}
@@ -84,7 +113,7 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                         key={`${index}location`}
                         name={[field.name, "location"]}
                       >
-                        <Select 
+                        <Select
                           style={{ width: "10rem" }}
                           options={bodyshop.md_parts_locations.map((loc, idx) => ({
                             key: idx,
@@ -101,16 +130,9 @@ export function PartsReceiveModalComponent({ bodyshop, form }) {
                         <InputNumber min={0} />
                       </Form.Item>
                     </LayoutFormRow>
-                    <DeleteFilled
-                      style={{ margin: "1rem" }}
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows move={move} index={index} total={fields.length} />
-                  </div>
-                </Form.Item>
-              ))}
+                  </Form.Item>
+                );
+              })}
             </div>
           );
         }}

client/src/components/parts-shop-info/parts-email-presets.component.jsx

@@ -2,10 +2,13 @@ import { DeleteFilled } from "@ant-design/icons";
 import { Button, Form, Input, Select, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function PartsEmailPresetsComponent() {
   const { t } = useTranslation();
+  const form = Form.useFormInstance();
+  const emailPresets = Form.useWatch(["md_to_emails"], form) || [];
 
   return (
     <div>
@@ -14,31 +17,46 @@ export default function PartsEmailPresetsComponent() {
           {(fields, { add, remove, move }) => {
             return (
               <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("bodyshop.labels.md_to_emails_emails")}
-                        key={`${index}emails`}
-                        name={[field.name, "emails"]}
-                      >
-                        <Select mode="tags" tokenSeparators={[",", ";"]} />
-                      </Form.Item>
+                {fields.map((field, index) => {
+                  const preset = emailPresets[field.name] || {};
 
-                      <Space>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
+                  return (
+                    <Form.Item key={field.key}>
+                      <LayoutFormRow
+                        noDivider
+                        title={getFormListItemTitle(t("general.labels.label"), index, preset.label, preset.emails)}
+                        extra={
+                          <Space align="center" size="small">
+                            <Button
+                              type="text"
+                              icon={<DeleteFilled />}
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                            <FormListMoveArrows
+                              move={move}
+                              index={index}
+                              total={fields.length}
+                              orientation="horizontal"
+                            />
+                          </Space>
+                        }
+                      >
+                        <Form.Item label={t("general.labels.label")} key={`${index}label`} name={[field.name, "label"]}>
+                          <Input />
+                        </Form.Item>
+                        <Form.Item
+                          label={t("bodyshop.labels.md_to_emails_emails")}
+                          key={`${index}emails`}
+                          name={[field.name, "emails"]}
+                        >
+                          <Select mode="tags" tokenSeparators={[",", ";"]} />
+                        </Form.Item>
+                      </LayoutFormRow>
+                    </Form.Item>
+                  );
+                })}
                 <Form.Item>
                   <Button
                     type="dashed"

client/src/components/parts-shop-info/parts-locations.component.jsx

@@ -2,10 +2,13 @@ import { DeleteFilled } from "@ant-design/icons";
 import { Button, Form, Input, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function PartsLocationsComponent() {
   const { t } = useTranslation();
+  const form = Form.useFormInstance();
+  const partsLocations = Form.useWatch(["md_parts_locations"], form) || [];
 
   return (
     <div>
@@ -14,34 +17,49 @@ export default function PartsLocationsComponent() {
           {(fields, { add, remove, move }) => {
             return (
               <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item
-                        className="imex-flex-row__margin"
-                        label={t("bodyshop.fields.partslocation")}
-                        key={`${index}`}
-                        name={[field.name]}
-                        rules={[
-                          {
-                            required: true
-                          }
-                        ]}
+                {fields.map((field, index) => {
+                  const location = partsLocations[field.name];
+
+                  return (
+                    <Form.Item key={field.key}>
+                      <LayoutFormRow
+                        noDivider
+                        title={getFormListItemTitle(t("bodyshop.fields.partslocation"), index, location)}
+                        extra={
+                          <Space align="center" size="small">
+                            <Button
+                              type="text"
+                              icon={<DeleteFilled />}
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                            <FormListMoveArrows
+                              move={move}
+                              index={index}
+                              total={fields.length}
+                              orientation="horizontal"
+                            />
+                          </Space>
+                        }
                       >
-                        <Input />
-                      </Form.Item>
-                      <Space wrap>
-                        <DeleteFilled
+                        <Form.Item
                           className="imex-flex-row__margin"
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
+                          label={t("bodyshop.fields.partslocation")}
+                          key={`${index}`}
+                          name={[field.name]}
+                          rules={[
+                            {
+                              required: true
+                            }
+                          ]}
+                        >
+                          <Input />
+                        </Form.Item>
+                      </LayoutFormRow>
+                    </Form.Item>
+                  );
+                })}
                 <Form.Item>
                   <Button
                     type="dashed"

client/src/components/parts-shop-info/parts-order-comments.component.jsx

@@ -2,10 +2,13 @@ import { DeleteFilled } from "@ant-design/icons";
 import { Button, Form, Input, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function PartsOrderCommentsComponent() {
   const { t } = useTranslation();
+  const form = Form.useFormInstance();
+  const orderComments = Form.useWatch(["md_parts_order_comment"], form) || [];
 
   return (
     <div>
@@ -14,45 +17,65 @@ export default function PartsOrderCommentsComponent() {
           {(fields, { add, remove, move }) => {
             return (
               <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item
-                        label={t("general.labels.label")}
-                        key={`${index}label`}
-                        name={[field.name, "label"]}
-                        rules={[
-                          {
-                            required: true
-                          }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("parts_orders.fields.comments")}
-                        key={`${index}comment`}
-                        name={[field.name, "comment"]}
-                        rules={[
-                          {
-                            required: true
-                          }
-                        ]}
-                      >
-                        <Input.TextArea autoSize />
-                      </Form.Item>
+                {fields.map((field, index) => {
+                  const comment = orderComments[field.name] || {};
 
-                      <Space wrap>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
+                  return (
+                    <Form.Item key={field.key}>
+                      <LayoutFormRow
+                        noDivider
+                        title={getFormListItemTitle(
+                          t("parts_orders.fields.comments"),
+                          index,
+                          comment.label,
+                          comment.comment
+                        )}
+                        extra={
+                          <Space align="center" size="small">
+                            <Button
+                              type="text"
+                              icon={<DeleteFilled />}
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                            <FormListMoveArrows
+                              move={move}
+                              index={index}
+                              total={fields.length}
+                              orientation="horizontal"
+                            />
+                          </Space>
+                        }
+                      >
+                        <Form.Item
+                          label={t("general.labels.label")}
+                          key={`${index}label`}
+                          name={[field.name, "label"]}
+                          rules={[
+                            {
+                              required: true
+                            }
+                          ]}
+                        >
+                          <Input />
+                        </Form.Item>
+                        <Form.Item
+                          label={t("parts_orders.fields.comments")}
+                          key={`${index}comment`}
+                          name={[field.name, "comment"]}
+                          rules={[
+                            {
+                              required: true
+                            }
+                          ]}
+                        >
+                          <Input.TextArea autoSize />
+                        </Form.Item>
+                      </LayoutFormRow>
+                    </Form.Item>
+                  );
+                })}
                 <Form.Item>
                   <Button
                     type="dashed"

client/src/components/print-center-item/print-center-item.component.jsx

@@ -1,4 +1,4 @@
-import { MailOutlined, PrinterOutlined } from "@ant-design/icons";
+import { MailOutlined, PrinterOutlined, SignatureFilled } from "@ant-design/icons";
 import { Space, Spin } from "antd";
 import { useState } from "react";
 import { connect } from "react-redux";
@@ -10,6 +10,9 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import { HasFeatureAccess } from "./../feature-wrapper/feature-wrapper.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import axios from "axios";
+import { setModalContext } from "../../redux/modals/modals.actions.js";
+import { hasDocumensoApiKey } from "../../utils/esignature.js";
 
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
@@ -17,12 +20,29 @@ const mapStateToProps = createStructuredSelector({
   technician: selectTechnician
 });
 
-const mapDispatchToProps = () => ({});
+const mapDispatchToProps = (dispatch) => ({
+  setEsignatureContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "esignature"
+      })
+    )
+});
 
-export function PrintCenterItemComponent({ printCenterModal, item, id, bodyshop, disabled, technician }) {
+export function PrintCenterItemComponent({
+  printCenterModal,
+  setEsignatureContext,
+  item,
+  id,
+  bodyshop,
+  disabled,
+  technician
+}) {
   const [loading, setLoading] = useState(false);
   const { context } = printCenterModal;
   const notification = useNotification();
+  const esignatureEnabled = hasDocumensoApiKey(bodyshop);
 
   const renderToNewWindow = async () => {
     setLoading(true);
@@ -39,6 +59,30 @@ export function PrintCenterItemComponent({ printCenterModal, item, id, bodyshop,
     setLoading(false);
   };
 
+  const esignatureGenerate = async () => {
+    setLoading(true);
+    try {
+      const {
+        data: { token, documentId, envelopeId }
+      } = await axios.post("/esign/new", {
+        name: item.key,
+        jobid: id,
+        context,
+        bodyshop,
+        templateObject: {
+          name: item.key,
+          variables: { id: id }
+        }
+      });
+
+      setEsignatureContext({ context: { token, documentId, envelopeId, jobid: id } });
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
   if (
     disabled ||
     (item.featureNameRestricted && !HasFeatureAccess({ featureName: item.featureNameRestricted, bodyshop }))
@@ -54,6 +98,7 @@ export function PrintCenterItemComponent({ printCenterModal, item, id, bodyshop,
     <li>
       <Space wrap>
         {item.title}
+        {esignatureEnabled && <SignatureFilled onClick={esignatureGenerate} />}
         <PrinterOutlined onClick={renderToNewWindow} />
         {!technician ? (
           <MailOutlined

client/src/components/print-center-jobs/print-center-jobs.component.jsx

@@ -9,11 +9,13 @@ import { selectPrintCenter } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { TemplateList } from "../../utils/TemplateConstants";
 import Jobd3RdPartyModal from "../job-3rd-party-modal/job-3rd-party-modal.component";
+import EsignatureCustomDocument from "../esignature-custom-document/esignature-custom-document.component";
 import PrintCenterItem from "../print-center-item/print-center-item.component";
 import PrintCenterJobsLabels from "../print-center-jobs-labels/print-center-jobs-labels.component";
 import PrintCenterSpeedPrint from "../print-center-speed-print/print-center-speed-print.component";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils";
+import { bodyshopHasDmsKey, DMS_MAP, getDmsMode } from "../../utils/dmsUtils";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { hasDocumensoApiKey } from "../../utils/esignature.js";
 
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
@@ -36,6 +38,9 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop, technicia
     splitKey: bodyshop.imexshopid
   });
   const hasDMSKey = bodyshopHasDmsKey(bodyshop);
+  const dmsMode = getDmsMode(bodyshop, "off");
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
+  const esignatureEnabled = hasDocumensoApiKey(bodyshop);
 
   const Templates = !hasDMSKey
     ? Object.keys(tempList)
@@ -60,8 +65,9 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop, technicia
             (temp.regions && temp.regions[bodyshop.region_config]) ||
             (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
         )
+        .filter((temp) => !isReynoldsMode || !temp.excludedDmsModes?.includes(dmsMode))
         .filter((temp) => !technician || temp.group !== "financial");
-        
+
   const JobsReportsList =
     Enhanced_Payroll.treatment === "on"
       ? Object.keys(Templates)
@@ -94,6 +100,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop, technicia
             extra={
               <Space wrap>
                 <PrintCenterJobsLabels jobId={jobId} />
+                {esignatureEnabled && <EsignatureCustomDocument jobId={jobId} />}
                 <Jobd3RdPartyModal jobId={jobId} job={job} />
                 <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} enterButton />
               </Space>

client/src/components/production-board-kanban/production-board-kanban-card.component.jsx

@@ -80,14 +80,14 @@ const ModelInfoToolTip = ({ metadata, cardSettings }) =>
     <Col span={24}>
       <EllipsesToolTip
         title={
-          metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc
-            ? `${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`
+          metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc || metadata.v_color
+            ? `${metadata.v_model_yr || ""} ${metadata.v_color || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`
             : null
         }
         kiosk={cardSettings.kiosk}
       >
-        {metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc ? (
-          `${metadata.v_model_yr || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`
+        {metadata.v_model_yr || metadata.v_make_desc || metadata.v_model_desc || metadata.v_color ? (
+          `${metadata.v_model_yr || ""} ${metadata.v_color || ""} ${metadata.v_make_desc || ""} ${metadata.v_model_desc || ""}`
         ) : (
           <span>&nbsp;</span>
         )}
@@ -431,6 +431,7 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
     <Card
       className={`react-trello-card ${cardSettings.kiosk ? "kiosk-mode" : ""}`}
       size="small"
+      styles={{ header: { backgroundColor: "var(--card-bg-fallback)" } }}
       style={{
         backgroundColor: cardSettings?.cardcolor
           ? bgColor.fallback || `rgba(${bgColor.r},${bgColor.g},${bgColor.b},${bgColor.a || 1})`

client/src/components/production-board-kanban/production-board-kanban.statistics.jsx

@@ -28,11 +28,14 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
   const { t } = useTranslation();
 
   const calculateTotal = (items, key, subKey) => {
-    return items.reduce((acc, item) => acc + (item[key]?.aggregate?.sum?.[subKey] || 0), 0);
+    return items.reduce((acc, item) => acc + (item?.[key]?.aggregate?.sum?.[subKey] ?? 0), 0);
   };
 
   const calculateTotalAmount = (items, key) => {
-    return items.reduce((acc, item) => acc.add(Dinero(item[key]?.totals?.subtotal ?? Dinero())), Dinero({ amount: 0 }));
+    return items.reduce(
+      (acc, item) => acc.add(Dinero(item?.[key]?.totals?.subtotal ?? Dinero())),
+      Dinero({ amount: 0 })
+    );
   };
 
   const calculateReducerTotalAmount = (lanes, key) => {
@@ -67,58 +70,83 @@ const ProductionStatistics = ({ data, cardSettings, reducerData }) => {
     return value;
   };
 
+  const filteredData = cardSettings.excludeSuspended === true ? data.filter((item) => item.suspended !== true) : data;
+  const filteredReducerData =
+    cardSettings.excludeSuspended === true
+      ? {
+          ...reducerData,
+          lanes: reducerData.lanes.map((lane) => ({
+            ...lane,
+            cards: lane.cards.filter((card) => card.metadata.suspended !== true)
+          }))
+        }
+      : reducerData;
+
   const totalHrs = cardSettings.totalHrs
-    ? parseFloat((calculateTotal(data, "labhrs", "mod_lb_hrs") + calculateTotal(data, "larhrs", "mod_lb_hrs")).toFixed(2))
+    ? parseFloat(
+        (
+          calculateTotal(filteredData, "labhrs", "mod_lb_hrs") + calculateTotal(filteredData, "larhrs", "mod_lb_hrs")
+        ).toFixed(2)
+      )
     : null;
 
   const totalLAB = cardSettings.totalLAB
-    ? parseFloat(calculateTotal(data, "labhrs", "mod_lb_hrs").toFixed(2))
+    ? parseFloat(calculateTotal(filteredData, "labhrs", "mod_lb_hrs").toFixed(2))
     : null;
 
   const totalLAR = cardSettings.totalLAR
-    ? parseFloat(calculateTotal(data, "larhrs", "mod_lb_hrs").toFixed(2))
+    ? parseFloat(calculateTotal(filteredData, "larhrs", "mod_lb_hrs").toFixed(2))
     : null;
 
-  const jobsInProduction = cardSettings.jobsInProduction ? data.length : null;
+  const jobsInProduction = cardSettings.jobsInProduction ? filteredData.length : null;
 
   const totalAmountInProduction = cardSettings.totalAmountInProduction
-    ? calculateTotalAmount(data, "job_totals").toFormat("$0,0.00")
+    ? calculateTotalAmount(filteredData, "job_totals").toFormat("$0,0.00")
     : null;
 
-  const totalAmountOnBoard = reducerData && cardSettings.totalAmountOnBoard
-    ? calculateReducerTotalAmount(reducerData.lanes, "job_totals").toFormat("$0,0.00")
-    : null;
+  const totalAmountOnBoard =
+    filteredReducerData && cardSettings.totalAmountOnBoard
+      ? calculateReducerTotalAmount(filteredReducerData.lanes, "job_totals").toFormat("$0,0.00")
+      : null;
 
-  const totalHrsOnBoard = reducerData && cardSettings.totalHrsOnBoard
-    ? parseFloat((
-        calculateReducerTotal(reducerData.lanes, "labhrs", "mod_lb_hrs") +
-        calculateReducerTotal(reducerData.lanes, "larhrs", "mod_lb_hrs")
-      ).toFixed(2))
-    : null;
+  const totalHrsOnBoard =
+    filteredReducerData && cardSettings.totalHrsOnBoard
+      ? parseFloat(
+          (
+            calculateReducerTotal(filteredReducerData.lanes, "labhrs", "mod_lb_hrs") +
+            calculateReducerTotal(filteredReducerData.lanes, "larhrs", "mod_lb_hrs")
+          ).toFixed(2)
+        )
+      : null;
 
-  const totalLABOnBoard = reducerData && cardSettings.totalLABOnBoard
-    ? parseFloat(calculateReducerTotal(reducerData.lanes, "labhrs", "mod_lb_hrs").toFixed(2))
-    : null;
+  const totalLABOnBoard =
+    filteredReducerData && cardSettings.totalLABOnBoard
+      ? parseFloat(calculateReducerTotal(filteredReducerData.lanes, "labhrs", "mod_lb_hrs").toFixed(2))
+      : null;
 
-  const totalLAROnBoard = reducerData && cardSettings.totalLAROnBoard
-    ? parseFloat(calculateReducerTotal(reducerData.lanes, "larhrs", "mod_lb_hrs").toFixed(2))
-    : null;
+  const totalLAROnBoard =
+    filteredReducerData && cardSettings.totalLAROnBoard
+      ? parseFloat(calculateReducerTotal(filteredReducerData.lanes, "larhrs", "mod_lb_hrs").toFixed(2))
+      : null;
 
-  const jobsOnBoard = reducerData && cardSettings.jobsOnBoard
-    ? reducerData.lanes.reduce((acc, lane) => acc + lane.cards.length, 0)
-    : null;
+  const jobsOnBoard =
+    filteredReducerData && cardSettings.jobsOnBoard
+      ? filteredReducerData.lanes.reduce((acc, lane) => acc + lane.cards.length, 0)
+      : null;
 
   const tasksInProduction = cardSettings.tasksInProduction
-    ? data.reduce((acc, item) => acc + (item.tasks_aggregate?.aggregate?.count || 0), 0)
+    ? filteredData.reduce((acc, item) => acc + (item.tasks_aggregate?.aggregate?.count || 0), 0)
     : null;
 
-  const tasksOnBoard = reducerData && cardSettings.tasksOnBoard
-    ? reducerData.lanes.reduce((acc, lane) => {
-        return (
-          acc + lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata.tasks_aggregate?.aggregate?.count || 0), 0)
-        );
-      }, 0)
-    : null;
+  const tasksOnBoard =
+    filteredReducerData && cardSettings.tasksOnBoard
+      ? filteredReducerData.lanes.reduce((acc, lane) => {
+          return (
+            acc +
+            lane.cards.reduce((laneAcc, card) => laneAcc + (card.metadata.tasks_aggregate?.aggregate?.count || 0), 0)
+          );
+        }, 0)
+      : null;
 
   const statistics = mergeStatistics(statisticsItems, [
     { id: 0, value: totalHrs, type: StatisticType.HOURS },

client/src/components/production-board-kanban/settings/StatisticsSettings.jsx

@@ -14,7 +14,16 @@ const StatisticsSettings = ({ t, statisticsOrder, setStatisticsOrder, setHasChan
   };
 
   return (
-    <Card title={t("production.settings.statistics_title")}>
+    <Card
+      title={t("production.settings.statistics_title")}
+      extra={
+        <div style={{ display: "flex", alignItems: "center" }}>
+          <Form.Item name="excludeSuspended" valuePropName="checked" style={{ marginBottom: 0 }}>
+            <Checkbox>{t("production.settings.statistics.exclude_suspended")}</Checkbox>
+          </Form.Item>
+        </div>
+      }
+    >
       <DragDropContext onDragEnd={onDragEnd}>
         <Droppable direction="grid" droppableId="statistics">
           {(provided) => (

client/src/components/production-board-kanban/settings/defaultKanbanSettings.js

@@ -91,7 +91,8 @@ const defaultKanbanSettings = {
   subtotal: false,
   statisticsOrder: statisticsItems.map((item) => item.id),
   selectedMdInsCos: [],
-  selectedEstimators: []
+  selectedEstimators: [],
+  excludeSuspended: false
 };
 
 const defaultFilters = { search: "", employeeId: null, alert: false };

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

@@ -58,6 +58,7 @@ export function ProductionColumnsComponent({
 
   const columnKeys = columns.map((i) => i.key);
   const cols = dataSource({
+    bodyshop,
     technician,
     data,
     state: tableState,

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

@@ -140,13 +140,11 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       sortOrder: state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) =>
         technician ? (
-          <>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${
-            record.v_color || ""
-          } ${record.plate_no || ""}`}</>
+          <>{`${record.v_model_yr || ""} ${record.v_color || ""}${record.v_make_desc || ""} ${record.v_model_desc || ""} ${record.plate_no || ""}`}</>
         ) : (
-          <Link to={`/manage/vehicles/${record.vehicleid}`}>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          } ${record.v_color || ""} ${record.plate_no || ""}`}</Link>
+          <Link
+            to={`/manage/vehicles/${record.vehicleid}`}
+          >{`${record.v_model_yr || ""} ${record.v_color || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${record.plate_no || ""}`}</Link>
         )
     },
     {
@@ -609,7 +607,19 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       ellipsis: true,
 
       render: (text, record) => <TimeFormatter>{record.date_repairstarted}</TimeFormatter>
-    }
+    },
+    ...(bodyshop && bodyshop.rr_dealerid
+      ? [
+          {
+            title: i18n.t("jobs.fields.dms.id"),
+            dataIndex: "dms_id",
+            key: "dms_id",
+            ellipsis: true,
+            sorter: (a, b) => alphaSort(a.dms_id, b.dms_id),
+            sortOrder: state.sortedInfo.columnKey === "dms_id" && state.sortedInfo.order
+          }
+        ]
+      : [])
   ];
 };
 export default productionListColumnsData;

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

@@ -244,6 +244,7 @@ export function ProductionListConfigManager({
           nextConfig.columns.columnKeys.map((k) => {
             return {
               ...ProductionListColumns({
+                bodyshop,
                 technician,
                 state: ensureDefaultState(state),
                 refetch,
@@ -270,6 +271,7 @@ export function ProductionListConfigManager({
           activeConfig.columns.columnKeys.map((k) => {
             return {
               ...ProductionListColumns({
+                bodyshop,
                 technician,
                 state: ensureDefaultState(state),
                 refetch,

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -12,6 +12,7 @@ import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DatePickerRanges from "../../utils/DatePickerRanges";
+import { DMS_MAP, getDmsMode } from "../../utils/dmsUtils";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import dayjs from "../../utils/day";
@@ -48,12 +49,18 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const Templates = TemplateList("report_center");
+  const dmsMode = getDmsMode(bodyshop, "off");
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
   const ReportsList = Object.keys(Templates)
     .map((key) => Templates[key])
     .filter((temp) => {
       const enhancedPayrollOn = Enhanced_Payroll.treatment === "on";
       const adpPayrollOn = ADPPayroll.treatment === "on";
 
+      if (isReynoldsMode && temp.excludedDmsModes?.includes(dmsMode)) {
+        return false;
+      }
+
       if (enhancedPayrollOn && adpPayrollOn) {
         return temp.enhanced_payroll !== false || temp.adp_payroll !== false;
       }
@@ -408,6 +415,6 @@ const restrictedReports = [
   { key: "job_costing_ro_estimator", days: 183 },
   { key: "job_lifecycle_date_detail", days: 183 },
   { key: "job_lifecycle_date_summary", days: 183 },
-  { key: "customer_list", days: 183 },
-  { key: "customer_list_excel", days: 183 }
+  { key: "customer_list", days: 736 },
+  { key: "customer_list_excel", days: 736 }
 ];

client/src/components/schedule-verify-integrity/schedule-verify-integrity.component.jsx

@@ -48,7 +48,7 @@ export function ScheduleVerifyIntegrity({ currentUser }) {
     setLoading(false);
   };
 
-  if (currentUser.email === "patrick@imex.prod")
+  if (currentUser.email === "allan@imex.prod"  || currentUser.email === "dave@imex.prod")
     return (
       <Button loading={loading} onClick={handleVerify}>
         Developer Use Only - Verify Schedule Integrity

client/src/components/shop-employees/shop-employees-add-vacation.component.jsx

@@ -8,7 +8,7 @@ import { INSERT_VACATION } from "../../graphql/employees.queries";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
-export default function ShopEmployeeAddVacation({ employee }) {
+export default function ShopEmployeeAddVacation({ employee, buttonProps }) {
   const { t } = useTranslation();
   const [insertVacation] = useMutation(INSERT_VACATION);
 
@@ -117,7 +117,7 @@ export default function ShopEmployeeAddVacation({ employee }) {
 
   return (
     <Popover content={overlay} open={visibility}>
-      <Button loading={loading} disabled={!employee?.active} onClick={handleClick}>
+      <Button loading={loading} disabled={!employee?.active} onClick={handleClick} {...buttonProps}>
         {t("employees.actions.addvacation")}
       </Button>
     </Popover>

client/src/components/shop-employees/shop-employees-form.component.jsx

@@ -1,11 +1,10 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation, useQuery } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
-import { Button, Card, Form, Input, InputNumber, Select, Switch } from "antd";
+import { Button, Card, Col, Form, Input, InputNumber, Row, Select, Space, Switch } from "antd";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
-import { useForm } from "antd/es/form/Form";
 import queryString from "query-string";
-import { useEffect } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
@@ -26,9 +25,24 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import AlertComponent from "../alert/alert.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
+import FormsFieldChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import {
+  INLINE_TITLE_GROUP_STYLE,
+  INLINE_TITLE_HANDLE_STYLE,
+  INLINE_TITLE_INPUT_STYLE,
+  INLINE_TITLE_LABEL_STYLE,
+  INLINE_TITLE_ROW_STYLE,
+  INLINE_TITLE_SEPARATOR_STYLE,
+  INLINE_TITLE_SWITCH_GROUP_STYLE,
+  INLINE_TITLE_TEXT_STYLE,
+  InlineTitleListIcon
+} from "../layout-form-row/inline-form-row-title.utils.js";
 import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
+import FormItemEmail from "../form-items-formatted/email-form-item.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -37,19 +51,38 @@ const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function ShopEmployeesFormComponent({ bodyshop }) {
+export function ShopEmployeesFormComponent({ bodyshop, form, onDirtyChange, isDirty }) {
+  const submitActionRef = useRef("save");
   const { t } = useTranslation();
-  const [form] = useForm();
+  const [internalIsDirty, setInternalIsDirty] = useState(false);
+  const resolvedIsDirty = typeof isDirty === "boolean" ? isDirty : internalIsDirty;
+  const employeeNumber = Form.useWatch("employee_number", form);
+  const firstName = Form.useWatch("first_name", form);
+  const lastName = Form.useWatch("last_name", form);
+  const employeeOptionsColProps = {
+    xs: 24,
+    sm: 12,
+    md: 12,
+    lg: 8,
+    xl: 8,
+    xxl: 8
+  };
   const history = useNavigate();
   const search = queryString.parse(useLocation().search);
   const [deleteVacation] = useMutation(DELETE_VACATION);
-  const { error, data } = useQuery(QUERY_EMPLOYEE_BY_ID, {
+  const { error, data, refetch } = useQuery(QUERY_EMPLOYEE_BY_ID, {
     variables: { id: search.employeeId },
     skip: !search.employeeId || search.employeeId === "new",
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
   const notification = useNotification();
+  const isNewEmployee = search.employeeId === "new";
+  const currentEmployeeData = data?.employees_by_pk?.id === search.employeeId ? data.employees_by_pk : null;
+  const employeeTitleName = [firstName, lastName].filter(Boolean).join(" ").trim();
+  const employeeCardTitle =
+    [employeeNumber, employeeTitleName].filter(Boolean).join(" - ") ||
+    (isNewEmployee ? t("employees.actions.new") : t("bodyshop.labels.employees"));
 
   const {
     treatments: { Enhanced_Payroll }
@@ -59,56 +92,154 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
     splitKey: bodyshop.imexshopid
   });
 
+  const updateDirtyState = useCallback(
+    (nextDirtyState) => {
+      setInternalIsDirty(nextDirtyState);
+      onDirtyChange?.(nextDirtyState);
+    },
+    [onDirtyChange]
+  );
+
   const client = useApolloClient();
-  useEffect(() => {
-    if (data && data.employees_by_pk) form.setFieldsValue(data.employees_by_pk);
-    else {
-      form.resetFields();
+  const clearEmployeeFormMeta = useCallback(() => {
+    const fieldMeta = form.getFieldsError().map(({ name }) => ({
+      name,
+      touched: false,
+      validating: false,
+      errors: [],
+      warnings: []
+    }));
+
+    if (fieldMeta.length > 0) {
+      form.setFields(fieldMeta);
     }
-  }, [form, data, search.employeeId]);
+
+    updateDirtyState(false);
+  }, [form, updateDirtyState]);
+
+  const resetEmployeeFormToCurrentData = useCallback(() => {
+    form.resetFields();
+
+    if (currentEmployeeData) {
+      form.setFieldsValue(currentEmployeeData);
+    }
+
+    window.requestAnimationFrame(() => {
+      clearEmployeeFormMeta();
+    });
+  }, [clearEmployeeFormMeta, currentEmployeeData, form]);
+
+  const syncEmployeeFormToSavedData = useCallback(
+    (employeeData) => {
+      if (employeeData) {
+        form.setFieldsValue(employeeData);
+      }
+
+      window.requestAnimationFrame(() => {
+        clearEmployeeFormMeta();
+      });
+    },
+    [clearEmployeeFormMeta, form]
+  );
+
+  useEffect(() => {
+    resetEmployeeFormToCurrentData();
+  }, [resetEmployeeFormToCurrentData, search.employeeId]);
 
   const [updateEmployee] = useMutation(UPDATE_EMPLOYEE);
   const [insertEmployees] = useMutation(INSERT_EMPLOYEES);
+  const saveAndResetSubmitAction = useCallback(() => {
+    const submitAction = submitActionRef.current;
+    submitActionRef.current = "save";
+    return submitAction;
+  }, []);
+  const submitEmployeeForm = useCallback(
+    (submitAction = "save") => {
+      submitActionRef.current = submitAction;
+      form.submit();
+    },
+    [form]
+  );
+  const navigateToEmployee = useCallback(
+    (employeeId) => {
+      history({
+        search: queryString.stringify({
+          ...search,
+          employeeId
+        })
+      });
+    },
+    [history, search]
+  );
+
+  const handleFinish = async (values) => {
+    const submitAction = saveAndResetSubmitAction();
+    const normalizedValues = {
+      ...values,
+      user_email: values.user_email === "" ? null : values.user_email
+    };
 
-  const handleFinish = (values) => {
     if (search.employeeId && search.employeeId !== "new") {
       //Update a record.
       logImEXEvent("shop_employee_update");
 
-      updateEmployee({
-        variables: {
-          id: search.employeeId,
-          employee: {
-            ...values,
-            user_email: values.user_email === "" ? null : values.user_email
+      try {
+        const result = await updateEmployee({
+          variables: {
+            id: search.employeeId,
+            employee: normalizedValues
           }
-        }
-      })
-        .then(() => {
-          notification.success({
-            title: t("employees.successes.save")
-          });
-        })
-        .catch((error) => {
-          notification.error({
-            title: t("employees.errors.save", {
-              message: JSON.stringify(error)
-            })
-          });
         });
-    } else {
-      //New record, insert it.
-      logImEXEvent("shop_employee_insert");
 
-      insertEmployees({
-        variables: { employees: [{ ...values, shopid: bodyshop.id }] },
-        refetchQueries: ["QUERY_EMPLOYEES"]
-      }).then((r) => {
-        search.employeeId = r.data.insert_employees.returning[0].id;
-        history({ search: queryString.stringify(search) });
+        syncEmployeeFormToSavedData(result?.data?.update_employees?.returning?.[0] ?? normalizedValues);
+        void refetch();
+        if (submitAction === "saveAndNew") {
+          navigateToEmployee("new");
+        }
         notification.success({
           title: t("employees.successes.save")
         });
+      } catch (error) {
+        notification.error({
+          title: t("employees.errors.save", {
+            message: JSON.stringify(error)
+          })
+        });
+      }
+
+      return;
+    }
+
+    //New record, insert it.
+    logImEXEvent("shop_employee_insert");
+
+    try {
+      const result = await insertEmployees({
+        variables: { employees: [{ ...normalizedValues, shopid: bodyshop.id }] },
+        refetchQueries: ["QUERY_EMPLOYEES"]
+      });
+      const savedEmployee = result?.data?.insert_employees?.returning?.[0];
+
+      if (submitAction === "saveAndNew") {
+        if (isNewEmployee) {
+          resetEmployeeFormToCurrentData();
+        }
+        navigateToEmployee("new");
+      } else if (savedEmployee?.id) {
+        syncEmployeeFormToSavedData(savedEmployee ?? normalizedValues);
+        navigateToEmployee(savedEmployee.id);
+      } else {
+        syncEmployeeFormToSavedData(savedEmployee ?? normalizedValues);
+      }
+
+      notification.success({
+        title: t("employees.successes.save")
+      });
+    } catch (error) {
+      notification.error({
+        title: t("employees.errors.save", {
+          message: JSON.stringify(error)
+        })
       });
     }
   };
@@ -141,6 +272,8 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
       key: "actions",
       render: (text, record) => (
         <Button
+          type="text"
+          danger
           onClick={async () => {
             await deleteVacation({
               variables: { id: record.id },
@@ -168,225 +301,365 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
 
   return (
     <Card
+      title={employeeCardTitle}
       extra={
-        <Button type="primary" onClick={() => form.submit()}>
-          {t("general.actions.save")}
-        </Button>
+        <Space wrap>
+          <Button onClick={() => submitEmployeeForm("saveAndNew")} disabled={!resolvedIsDirty} style={{ minWidth: 170 }}>
+            {t("general.actions.saveandnew") || "Save and New"}
+          </Button>
+          <Button
+            type="primary"
+            onClick={() => submitEmployeeForm("save")}
+            disabled={!resolvedIsDirty}
+            style={{ minWidth: 170 }}
+          >
+            {t("employees.actions.save_employee")}
+          </Button>
+        </Space>
       }
     >
-      <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
-        <LayoutFormRow>
-          <Form.Item
-            name="first_name"
-            label={t("employees.fields.first_name")}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            label={t("employees.fields.last_name")}
-            name="last_name"
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            name="employee_number"
-            label={t("employees.fields.employee_number")}
-            validateTrigger="onBlur"
-            hasFeedback
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              },
-              () => ({
-                async validator(rule, value) {
-                  if (value) {
-                    const response = await client.query({
-                      query: CHECK_EMPLOYEE_NUMBER,
-                      variables: {
-                        employeenumber: value
-                      }
-                    });
-
-                    if (response.data.employees_aggregate.aggregate.count === 0) {
-                      return Promise.resolve();
-                    } else if (
-                      response.data.employees_aggregate.nodes.length === 1 &&
-                      response.data.employees_aggregate.nodes[0].id === form.getFieldValue("id")
-                    ) {
-                      return Promise.resolve();
-                    }
-                    return Promise.reject(t("employees.validation.unique_employee_number"));
-                  } else {
-                    return Promise.resolve();
+      <Form
+        onFinish={handleFinish}
+        onFinishFailed={saveAndResetSubmitAction}
+        autoComplete={"off"}
+        layout="vertical"
+        form={form}
+        onValuesChange={() => {
+          updateDirtyState(form.isFieldsTouched());
+        }}
+      >
+        <FormsFieldChanged form={form} onReset={resetEmployeeFormToCurrentData} onDirtyChange={updateDirtyState} />
+        <LayoutFormRow
+          title={
+            <div
+              style={{
+                ...INLINE_TITLE_ROW_STYLE,
+                justifyContent: "space-between"
+              }}
+            >
+              <div
+                style={{
+                  ...INLINE_TITLE_TEXT_STYLE,
+                  marginRight: "auto"
+                }}
+              >
+                {t("bodyshop.labels.employee_options")}
+              </div>
+              <div
+                style={{
+                  display: "flex",
+                  alignItems: "center",
+                  gap: 4,
+                  flexWrap: "wrap",
+                  marginLeft: "auto"
+                }}
+              >
+                <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                <div
+                  style={{
+                    ...INLINE_TITLE_SWITCH_GROUP_STYLE
+                  }}
+                >
+                  <div style={INLINE_TITLE_LABEL_STYLE}>{t("employees.labels.active")}</div>
+                  <Form.Item noStyle valuePropName="checked" name="active">
+                    <Switch />
+                  </Form.Item>
+                </div>
+                <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                <div
+                  style={{
+                    ...INLINE_TITLE_SWITCH_GROUP_STYLE
+                  }}
+                >
+                  <div style={INLINE_TITLE_LABEL_STYLE}>{t("employees.fields.flat_rate")}</div>
+                  <Form.Item noStyle valuePropName="checked" name="flat_rate">
+                    <Switch />
+                  </Form.Item>
+                </div>
+              </div>
+            </div>
+          }
+          wrapTitle
+        >
+          <Row gutter={[16, 16]} wrap>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item
+                name="first_name"
+                label={t("employees.fields.first_name")}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
                   }
-                }
-              })
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            label={t("employees.fields.pin")}
-            name="pin"
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-        </LayoutFormRow>
-        <LayoutFormRow>
-          <Form.Item label={t("employees.fields.active")} valuePropName="checked" name="active">
-            <Switch />
-          </Form.Item>
-          <Form.Item label={t("employees.fields.flat_rate")} name="flat_rate" valuePropName="checked">
-            <Switch />
-          </Form.Item>
-          <Form.Item
-            name="hire_date"
-            label={t("employees.fields.hire_date")}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <DateTimePicker isDateOnly />
-          </Form.Item>
-          <Form.Item label={t("employees.fields.termination_date")} name="termination_date">
-            <DateTimePicker isDateOnly />
-          </Form.Item>
-          <Form.Item
-            label={t("employees.fields.user_email")}
-            name="user_email"
-            validateTrigger="onBlur"
-            rules={[
-              ({ getFieldValue }) => ({
-                async validator(rule, value) {
-                  const user_email = getFieldValue("user_email");
-
-                  if (user_email && value) {
-                    const response = await client.query({
-                      query: QUERY_USERS_BY_EMAIL,
-                      variables: {
-                        email: user_email
-                      }
-                    });
-
-                    if (response.data.users.length === 1) {
-                      return Promise.resolve();
-                    }
-                    return Promise.reject(t("bodyshop.validation.useremailmustexist"));
-                  } else {
-                    return Promise.resolve();
+                ]}
+              >
+                <Input />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item
+                label={t("employees.fields.last_name")}
+                name="last_name"
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
                   }
-                }
-              })
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item label={t("employees.fields.external_id")} name="external_id">
-            <Input />
-          </Form.Item>
+                ]}
+              >
+                <Input />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item
+                name="employee_number"
+                label={t("employees.fields.employee_number")}
+                validateTrigger="onBlur"
+                hasFeedback
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  },
+                  () => ({
+                    async validator(rule, value) {
+                      if (value) {
+                        const response = await client.query({
+                          query: CHECK_EMPLOYEE_NUMBER,
+                          variables: {
+                            employeenumber: value
+                          }
+                        });
+
+                        if (response.data.employees_aggregate.aggregate.count === 0) {
+                          return Promise.resolve();
+                        } else if (
+                          response.data.employees_aggregate.nodes.length === 1 &&
+                          response.data.employees_aggregate.nodes[0].id === form.getFieldValue("id")
+                        ) {
+                          return Promise.resolve();
+                        }
+                        return Promise.reject(t("employees.validation.unique_employee_number"));
+                      } else {
+                        return Promise.resolve();
+                      }
+                    }
+                  })
+                ]}
+              >
+                <Input />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item
+                label={t("employees.fields.pin")}
+                name="pin"
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Input />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item
+                name="hire_date"
+                label={t("employees.fields.hire_date")}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <DateTimePicker isDateOnly />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item label={t("employees.fields.termination_date")} name="termination_date">
+                <DateTimePicker isDateOnly />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item
+                label={t("employees.fields.user_email")}
+                name="user_email"
+                validateTrigger="onBlur"
+                rules={[
+                  ({ getFieldValue }) => ({
+                    async validator(rule, value) {
+                      const user_email = getFieldValue("user_email");
+
+                      if (user_email && value) {
+                        const response = await client.query({
+                          query: QUERY_USERS_BY_EMAIL,
+                          variables: {
+                            email: user_email
+                          }
+                        });
+
+                        if (response.data.users.length === 1) {
+                          return Promise.resolve();
+                        }
+                        return Promise.reject(t("bodyshop.validation.useremailmustexist"));
+                      } else {
+                        return Promise.resolve();
+                      }
+                    }
+                  })
+                ]}
+              >
+                <FormItemEmail />
+              </Form.Item>
+            </Col>
+            <Col {...employeeOptionsColProps}>
+              <Form.Item label={t("employees.fields.external_id")} name="external_id">
+                <Input />
+              </Form.Item>
+            </Col>
+          </Row>
         </LayoutFormRow>
         <Form.List name={["rates"]}>
           {(fields, { add, remove, move }) => {
             return (
-              <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                    <LayoutFormRow grow>
-                      <Form.Item
-                        label={t("employees.fields.cost_center")}
-                        key={`${field.key}-cost_center`}
-                        name={[field.name, "cost_center"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Select
-                          options={[
-                            { value: "timetickets.labels.shift", label: t("timetickets.labels.shift") },
-                            ...(bodyshop.cdk_dealerid ||
-                            bodyshop.pbs_serialnumber ||
-                            bodyshop.rr_dealerid ||
-                            Enhanced_Payroll.treatment === "on"
-                              ? CiecaSelect(false, true)
-                              : bodyshop.md_responsibility_centers.costs.map((c) => ({
-                                  value: c.name,
-                                  label: c.name
-                                })))
-                          ]}
-                        />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("employees.fields.rate")}
-                        key={`${field.key}-rate`}
-                        name={[field.name, "rate"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <InputNumber min={0} precision={2} />
-                      </Form.Item>
-                      <DeleteFilled
-                        onClick={() => {
-                          remove(field.name);
-                        }}
-                      />
-                      <FormListMoveArrows move={move} index={index} total={fields.length} />
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
-                <Form.Item>
+              <LayoutFormRow
+                title={t("bodyshop.labels.employee_rates")}
+                actions={[
                   <Button
-                    type="dashed"
+                    key="add-rate"
+                    type="primary"
+                    block
                     onClick={() => {
                       add();
                     }}
-                    style={{ width: "100%" }}
                     id="add-employee-rate-button"
                   >
-                    <span id="new-employee-rate">{t("employees.actions.newrate")}</span>
+                    <span id="new-employee-rate">{t("employees.actions.addrate")}</span>
                   </Button>
-                </Form.Item>
-              </div>
+                ]}
+              >
+                <div>
+                  {fields.length === 0 ? (
+                    <ConfigListEmptyState actionLabel={t("employees.actions.addrate")} />
+                  ) : (
+                    fields.map((field, index) => {
+                      return (
+                        <Form.Item noStyle key={field.key}>
+                          <InlineValidatedFormRow
+                            form={form}
+                            errorNames={[["rates", field.name, "cost_center"]]}
+                            noDivider
+                            title={
+                              <div style={INLINE_TITLE_ROW_STYLE}>
+                                <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                                <div style={INLINE_TITLE_GROUP_STYLE}>
+                                  <div style={INLINE_TITLE_LABEL_STYLE}>{t("employees.fields.cost_center")}</div>
+                                  <Form.Item
+                                    noStyle
+                                    name={[field.name, "cost_center"]}
+                                    rules={[
+                                      {
+                                        required: true
+                                      }
+                                    ]}
+                                  >
+                                    <Select
+                                      size="small"
+                                      options={[
+                                        { value: "timetickets.labels.shift", label: t("timetickets.labels.shift") },
+                                        ...(bodyshop.cdk_dealerid ||
+                                        bodyshop.pbs_serialnumber ||
+                                        bodyshop.rr_dealerid ||
+                                        Enhanced_Payroll.treatment === "on"
+                                          ? CiecaSelect(false, true)
+                                          : bodyshop.md_responsibility_centers.costs.map((c) => ({
+                                              value: c.name,
+                                              label: c.name
+                                            })))
+                                      ]}
+                                      style={{ width: "100%" }}
+                                      styles={{
+                                        selector: INLINE_TITLE_INPUT_STYLE
+                                      }}
+                                    />
+                                  </Form.Item>
+                                </div>
+                              </div>
+                            }
+                            wrapTitle
+                            extra={
+                              <Space align="center" size="small">
+                                <Button
+                                  type="text"
+                                  danger
+                                  icon={<DeleteFilled />}
+                                  onClick={() => {
+                                    remove(field.name);
+                                  }}
+                                />
+                                <FormListMoveArrows
+                                  move={move}
+                                  index={index}
+                                  total={fields.length}
+                                  orientation="horizontal"
+                                />
+                              </Space>
+                            }
+                          >
+                            <Form.Item
+                              label={t("employees.fields.rate")}
+                              name={[field.name, "rate"]}
+                              rules={[
+                                {
+                                  required: true
+                                }
+                              ]}
+                              style={{ marginBottom: 0 }}
+                            >
+                              <InputNumber min={0} precision={2} style={{ width: "100%" }} />
+                            </Form.Item>
+                          </InlineValidatedFormRow>
+                        </Form.Item>
+                      );
+                    })
+                  )}
+                </div>
+              </LayoutFormRow>
             );
           }}
         </Form.List>
       </Form>
 
-      <ResponsiveTable
-        title={() => <ShopEmployeeAddVacation employee={data && data.employees_by_pk} />}
-        columns={columns}
-        mobileColumnKeys={["start", "length", "actions"]}
-        rowKey={"id"}
-        dataSource={data?.employees_by_pk?.employee_vacations ?? []}
-      />
+      <LayoutFormRow
+        title={t("bodyshop.labels.employee_vacation")}
+        actions={[
+          <ShopEmployeeAddVacation
+            key="add-vacation"
+            employee={data && data.employees_by_pk}
+            buttonProps={{
+              type: "primary",
+              block: true
+            }}
+          />
+        ]}
+      >
+        {(data?.employees_by_pk?.employee_vacations ?? []).length === 0 ? (
+          <ConfigListEmptyState actionLabel={t("employees.actions.addvacation")} />
+        ) : (
+          <div>
+            <ResponsiveTable
+              columns={columns}
+              mobileColumnKeys={["start", "length", "actions"]}
+              rowKey={"id"}
+              dataSource={data?.employees_by_pk?.employee_vacations ?? []}
+              pagination={false}
+            />
+          </div>
+        )}
+      </LayoutFormRow>
     </Card>
   );
 }

client/src/components/shop-employees/shop-employees-form.component.test.jsx

@@ -0,0 +1,359 @@
+import { useApolloClient } from "@apollo/client/react";
+import { Form } from "antd";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { useEffect } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import {
+  DELETE_VACATION,
+  INSERT_EMPLOYEES,
+  QUERY_EMPLOYEE_BY_ID,
+  UPDATE_EMPLOYEE
+} from "../../graphql/employees.queries";
+import { ShopEmployeesFormComponent } from "./shop-employees-form.component.jsx";
+
+const insertEmployeesMock = vi.fn();
+const updateEmployeeMock = vi.fn();
+const deleteVacationMock = vi.fn();
+const useQueryMock = vi.fn();
+const useMutationMock = vi.fn();
+const navigateMock = vi.fn();
+const notification = {
+  error: vi.fn(),
+  success: vi.fn()
+};
+
+vi.mock("@apollo/client/react", async () => {
+  const actual = await vi.importActual("@apollo/client/react");
+
+  return {
+    ...actual,
+    useApolloClient: vi.fn(),
+    useQuery: (...args) => useQueryMock(...args),
+    useMutation: (...args) => useMutationMock(...args)
+  };
+});
+
+vi.mock("@splitsoftware/splitio-react", () => ({
+  useTreatmentsWithConfig: () => ({
+    treatments: {
+      Enhanced_Payroll: {
+        treatment: "off"
+      }
+    }
+  })
+}));
+
+vi.mock("react-router-dom", () => ({
+  useLocation: () => ({
+    search: "?employeeId=new"
+  }),
+  useNavigate: () => navigateMock
+}));
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key, values = {}) => {
+      const translations = {
+        "bodyshop.labels.employee_options": "Employee Options",
+        "bodyshop.labels.employee_rates": "Employee Rates",
+        "bodyshop.labels.employee_vacation": "Employee Vacation",
+        "bodyshop.labels.employees": "Employees",
+        "employees.actions.addrate": "Add Rate",
+        "employees.actions.addvacation": "Add Vacation",
+        "employees.actions.new": "New Employee",
+        "employees.actions.save_employee": "Save Employee",
+        "employees.fields.active": "Active",
+        "employees.fields.employee_number": "Employee Number",
+        "employees.fields.external_id": "External Id",
+        "employees.fields.first_name": "First Name",
+        "employees.fields.flat_rate": "Flat Rate",
+        "employees.fields.hire_date": "Hire Date",
+        "employees.fields.last_name": "Last Name",
+        "employees.fields.pin": "PIN",
+        "employees.fields.rate": "Rate",
+        "employees.fields.termination_date": "Termination Date",
+        "employees.fields.user_email": "User Email",
+        "employees.labels.active": "Active",
+        "employees.successes.save": "Saved",
+        "general.actions.saveandnew": "Save and New",
+        "general.labels.actions": "Actions"
+      };
+
+      if (key === "employees.errors.save") {
+        return `Save failed: ${values.message ?? ""}`;
+      }
+
+      if (key === "employees.validation.unique_employee_number") {
+        return "Employee number must be unique";
+      }
+
+      if (key === "bodyshop.validation.useremailmustexist") {
+        return "User email must exist";
+      }
+
+      return translations[key] || key;
+    }
+  })
+}));
+
+vi.mock("../../contexts/Notifications/notificationContext.jsx", () => ({
+  useNotification: () => notification
+}));
+
+vi.mock("../../firebase/firebase.utils", () => ({
+  logImEXEvent: vi.fn()
+}));
+
+vi.mock("../alert/alert.component", () => ({
+  default: ({ title }) => <div>{title}</div>
+}));
+
+vi.mock("../form-fields-changed-alert/form-fields-changed-alert.component.jsx", () => ({
+  default: () => null
+}));
+
+vi.mock("../form-date-time-picker/form-date-time-picker.component.jsx", () => ({
+  default: ({ id, value, onChange }) => (
+    <input id={id} type="text" value={value ?? ""} onChange={(event) => onChange?.(event.target.value)} />
+  )
+}));
+
+vi.mock("../form-items-formatted/email-form-item.component.jsx", () => ({
+  default: ({ id, value, onChange }) => (
+    <input id={id} type="email" value={value ?? ""} onChange={(event) => onChange?.(event.target.value)} />
+  )
+}));
+
+vi.mock("../layout-form-row/layout-form-row.component", () => ({
+  default: ({ title, extra, actions, children }) => (
+    <div>
+      {title}
+      {extra}
+      {children}
+      {actions}
+    </div>
+  )
+}));
+
+vi.mock("../layout-form-row/inline-validated-form-row.component.jsx", () => ({
+  default: ({ title, extra, children }) => (
+    <div>
+      {title}
+      {extra}
+      {children}
+    </div>
+  )
+}));
+
+vi.mock("../layout-form-row/config-list-empty-state.component.jsx", () => ({
+  default: ({ actionLabel }) => <div>{actionLabel}</div>
+}));
+
+vi.mock("../form-list-move-arrows/form-list-move-arrows.component", () => ({
+  default: () => null
+}));
+
+vi.mock("../responsive-table/responsive-table.component", () => ({
+  default: () => null
+}));
+
+vi.mock("./shop-employees-add-vacation.component", () => ({
+  default: () => null
+}));
+
+vi.mock("../../utils/Ciecaselect", () => ({
+  default: () => []
+}));
+
+const bodyshop = {
+  id: "shop-1",
+  imexshopid: "split-shop-1",
+  md_responsibility_centers: {
+    costs: []
+  }
+};
+
+describe("ShopEmployeesFormComponent", () => {
+  let formInstance;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    useQueryMock.mockImplementation((query) => {
+      if (query === QUERY_EMPLOYEE_BY_ID) {
+        return {
+          error: null,
+          data: null,
+          refetch: vi.fn(),
+          loading: false
+        };
+      }
+
+      return {
+        error: null,
+        data: null,
+        loading: false
+      };
+    });
+
+    useMutationMock.mockImplementation((mutation) => {
+      if (mutation === INSERT_EMPLOYEES) return [insertEmployeesMock];
+      if (mutation === UPDATE_EMPLOYEE) return [updateEmployeeMock];
+      if (mutation === DELETE_VACATION) return [deleteVacationMock];
+      return [vi.fn()];
+    });
+
+    useApolloClient.mockReturnValue({
+      query: vi.fn().mockResolvedValue({
+        data: {
+          employees_aggregate: {
+            aggregate: {
+              count: 0
+            },
+            nodes: []
+          },
+          users: []
+        }
+      })
+    });
+
+    insertEmployeesMock.mockResolvedValue({
+      data: {
+        insert_employees: {
+          returning: [
+            {
+              id: "employee-123",
+              first_name: "Jamie",
+              last_name: "Rivera",
+              employee_number: "42",
+              active: true,
+              termination_date: null,
+              hire_date: "2026-04-20",
+              flat_rate: false,
+              rates: [],
+              pin: "1234",
+              user_email: null
+            }
+          ]
+        }
+      }
+    });
+
+    function TestHarness({ onFormReady }) {
+      const [form] = Form.useForm();
+
+      useEffect(() => {
+        onFormReady(form);
+      }, [form, onFormReady]);
+
+      return <ShopEmployeesFormComponent bodyshop={bodyshop} form={form} />;
+    }
+
+    render(
+      <TestHarness
+        onFormReady={(form) => {
+          formInstance = form;
+        }}
+      />
+    );
+  });
+
+  it("marks a new employee form clean after save", async () => {
+    fireEvent.change(screen.getByRole("textbox", { name: "First Name" }), {
+      target: { value: "Jamie" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Last Name" }), {
+      target: { value: "Rivera" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Employee Number" }), {
+      target: { value: "42" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "PIN" }), {
+      target: { value: "1234" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Hire Date" }), {
+      target: { value: "2026-04-20" }
+    });
+
+    const saveButton = screen.getByRole("button", { name: "Save Employee" });
+
+    await waitFor(() => {
+      expect(saveButton.disabled).toBe(false);
+    });
+
+    fireEvent.click(saveButton);
+
+    await waitFor(() => {
+      expect(insertEmployeesMock).toHaveBeenCalledWith({
+        variables: {
+          employees: [
+            expect.objectContaining({
+              first_name: "Jamie",
+              last_name: "Rivera",
+              employee_number: "42",
+              pin: "1234",
+              hire_date: "2026-04-20",
+              shopid: "shop-1"
+            })
+          ]
+        },
+        refetchQueries: ["QUERY_EMPLOYEES"]
+      });
+    });
+
+    await waitFor(() => {
+      expect(formInstance.isFieldsTouched()).toBe(false);
+    });
+
+    expect(notification.success).toHaveBeenCalledWith({
+      title: "Saved"
+    });
+    expect(navigateMock).toHaveBeenCalledWith({
+      search: "employeeId=employee-123"
+    });
+  });
+
+  it("saves a new employee and opens a fresh employee form when save and new is clicked", async () => {
+    fireEvent.change(screen.getByRole("textbox", { name: "First Name" }), {
+      target: { value: "Jamie" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Last Name" }), {
+      target: { value: "Rivera" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Employee Number" }), {
+      target: { value: "42" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "PIN" }), {
+      target: { value: "1234" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Hire Date" }), {
+      target: { value: "2026-04-20" }
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: "Save and New" }));
+
+    await waitFor(() => {
+      expect(insertEmployeesMock).toHaveBeenCalledTimes(1);
+    });
+
+    await waitFor(() => {
+      expect(formInstance.isFieldsTouched()).toBe(false);
+    });
+
+    await waitFor(() => {
+      expect(screen.getByRole("textbox", { name: "First Name" })).toHaveValue("");
+      expect(screen.getByRole("textbox", { name: "Last Name" })).toHaveValue("");
+      expect(screen.getByRole("textbox", { name: "Employee Number" })).toHaveValue("");
+      expect(screen.getByRole("textbox", { name: "PIN" })).toHaveValue("");
+      expect(screen.getByRole("textbox", { name: "Hire Date" })).toHaveValue("");
+    });
+
+    expect(screen.getByText("New Employee")).toBeInTheDocument();
+    expect(navigateMock).toHaveBeenCalledWith({
+      search: "employeeId=new"
+    });
+    expect(notification.success).toHaveBeenCalledWith({
+      title: "Saved"
+    });
+  });
+});

client/src/components/shop-employees/shop-employees-list.component.jsx

@@ -4,9 +4,16 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate } from "react-router-dom";
 import { alphaSort } from "../../utils/sorters";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 
-export default function ShopEmployeesListComponent({ loading, employees }) {
+export default function ShopEmployeesListComponent({
+  loading,
+  employees,
+  onRequestEmployeeChange,
+  selectedEmployeeId
+}) {
   const { t } = useTranslation();
   const history = useNavigate();
   const search = queryString.parse(useLocation().search);
@@ -16,13 +23,33 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
     filteredInfo: { text: "" }
   });
 
+  const navigateToEmployee = (employeeId) => {
+    if (onRequestEmployeeChange) {
+      onRequestEmployeeChange(employeeId);
+      return;
+    }
+
+    history({
+      search: queryString.stringify({
+        ...search,
+        employeeId
+      })
+    });
+  };
+
+  const clearEmployeeSelection = () => {
+    const { employeeId, ...nextSearch } = search;
+    void employeeId;
+    history({
+      search: queryString.stringify(nextSearch)
+    });
+  };
+
   const handleOnRowClick = (record) => {
     if (record) {
-      search.employeeId = record.id;
-      history({ search: queryString.stringify(search) });
+      navigateToEmployee(record.id);
     } else {
-      delete search.employeeId;
-      history({ search: queryString.stringify(search) });
+      clearEmployeeSelection();
     }
   };
   const handleTableChange = (pagination, filters, sorter) => {
@@ -30,7 +57,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
   };
   const columns = [
     {
-      title: t("employees.fields.employee_number"),
+      title: t("employees.labels.employee_number_short"),
       dataIndex: "employee_number",
       key: "employee_number",
       sorter: (a, b) => alphaSort(a.employee_number, b.employee_number),
@@ -89,44 +116,39 @@ export default function ShopEmployeesListComponent({ loading, employees }) {
     }
   ];
   return (
-    <div>
-      <ResponsiveTable
-        title={() => {
-          return (
-            <Button
-              type="primary"
-              onClick={() => {
-                search.employeeId = "new";
-                history({ search: queryString.stringify(search) });
-              }}
-            >
-              {t("employees.actions.new")}
-            </Button>
-          );
-        }}
-        loading={loading}
-        pagination={{ placement: "top" }}
-        columns={columns}
-        mobileColumnKeys={["employee_number", "employee_name", "active"]}
-        rowKey="id"
-        dataSource={employees}
-        rowSelection={{
-          onSelect: (props) => {
-            search.employeeId = props.id;
-            history({ search: queryString.stringify(search) });
-          },
-          type: "radio",
-          selectedRowKeys: [search.employeeId]
-        }}
-        onChange={handleTableChange}
-        onRow={(record) => {
-          return {
-            onClick: () => {
-              handleOnRowClick(record);
-            }
-          };
-        }}
-      />
-    </div>
+    <LayoutFormRow
+      title={t("bodyshop.labels.employees")}
+      actions={[
+        <Button key="new-employee" type="primary" block onClick={() => navigateToEmployee("new")}>
+          {t("employees.actions.new")}
+        </Button>
+      ]}
+    >
+      {employees.length === 0 ? (
+        <ConfigListEmptyState actionLabel={t("employees.actions.new")} />
+      ) : (
+        <ResponsiveTable
+          loading={loading}
+          pagination={{ placement: "top" }}
+          columns={columns}
+          mobileColumnKeys={["employee_number", "employee_name", "active"]}
+          rowKey="id"
+          dataSource={employees}
+          rowSelection={{
+            onSelect: (props) => navigateToEmployee(props.id),
+            type: "radio",
+            selectedRowKeys: [selectedEmployeeId || search.employeeId]
+          }}
+          onChange={handleTableChange}
+          onRow={(record) => {
+            return {
+              onClick: () => {
+                handleOnRowClick(record);
+              }
+            };
+          }}
+        />
+      )}
+    </LayoutFormRow>
   );
 }

client/src/components/shop-employees/shop-employees.container.jsx

@@ -1,29 +1,101 @@
+import { Drawer, Form, Grid } from "antd";
 import { useQuery } from "@apollo/client/react";
+import queryString from "query-string";
 import { connect } from "react-redux";
+import { useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_EMPLOYEES } from "../../graphql/employees.queries";
+import useConfirmDirtyFormNavigation from "../../hooks/useConfirmDirtyFormNavigation.jsx";
 import AlertComponent from "../alert/alert.component";
 import ShopEmployeesFormComponent from "./shop-employees-form.component";
 import ShopEmployeesListComponent from "./shop-employees-list.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+import "./shop-employees.styles.scss";
 
 const mapStateToProps = createStructuredSelector({});
 
 function ShopEmployeesContainer() {
+  const [form] = Form.useForm();
+  const [isEmployeeFormDirty, setIsEmployeeFormDirty] = useState(false);
+  const location = useLocation();
+  const navigate = useNavigate();
+  const search = queryString.parse(location.search);
   const { loading, error, data } = useQuery(QUERY_EMPLOYEES, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
+  const screens = Grid.useBreakpoint();
+  const hasSelectedEmployee = Boolean(search.employeeId);
+
+  const bpoints = {
+    xs: "100%",
+    sm: "100%",
+    md: "92%",
+    lg: "80%",
+    xl: "80%",
+    xxl: "80%"
+  };
+
+  let drawerPercentage = "100%";
+  if (screens.xxl) drawerPercentage = bpoints.xxl;
+  else if (screens.xl) drawerPercentage = bpoints.xl;
+  else if (screens.lg) drawerPercentage = bpoints.lg;
+  else if (screens.md) drawerPercentage = bpoints.md;
+  else if (screens.sm) drawerPercentage = bpoints.sm;
+  else if (screens.xs) drawerPercentage = bpoints.xs;
+
+  const hasDirtyEmployeeForm = Boolean(search.employeeId) && (isEmployeeFormDirty || form.isFieldsTouched());
+  const confirmCloseDirtyEmployee = useConfirmDirtyFormNavigation(hasDirtyEmployeeForm);
+
+  const navigateToEmployee = (employeeId) => {
+    if (employeeId === search.employeeId) return;
+    if (!confirmCloseDirtyEmployee()) return;
+
+    const nextSearch = { ...search, employeeId };
+    setIsEmployeeFormDirty(false);
+    navigate({
+      search: queryString.stringify(nextSearch)
+    });
+  };
+
+  const handleDrawerClose = () => {
+    if (!confirmCloseDirtyEmployee()) return;
+
+    const nextSearch = { ...search };
+    delete nextSearch.employeeId;
+    setIsEmployeeFormDirty(false);
+    navigate({
+      search: queryString.stringify(nextSearch)
+    });
+  };
 
   if (error) return <AlertComponent title={error.message} type="error" />;
 
   return (
-    <div>
-      <RbacWrapper action="employees:page">
-        <ShopEmployeesListComponent employees={data ? data.employees : []} loading={loading} />
-        <ShopEmployeesFormComponent />
-      </RbacWrapper>
-    </div>
+    <RbacWrapper action="employees:page">
+      <div className="shop-employees-layout">
+        <div className="shop-employees-layout__list">
+          <ShopEmployeesListComponent
+            employees={data ? data.employees : []}
+            loading={loading}
+            onRequestEmployeeChange={navigateToEmployee}
+            selectedEmployeeId={search.employeeId}
+          />
+        </div>
+      </div>
+      <Drawer
+        open={hasSelectedEmployee}
+        destroyOnHidden
+        placement="right"
+        size={drawerPercentage}
+        onClose={handleDrawerClose}
+      >
+        {hasSelectedEmployee ? (
+          <ShopEmployeesFormComponent form={form} onDirtyChange={setIsEmployeeFormDirty} isDirty={isEmployeeFormDirty} />
+        ) : null}
+      </Drawer>
+    </RbacWrapper>
   );
 }
 

client/src/components/shop-employees/shop-employees.styles.scss

@@ -0,0 +1,7 @@
+.shop-employees-layout {
+  min-width: 0;
+}
+
+.shop-employees-layout__list {
+  min-width: 0;
+}

client/src/components/shop-info/shop-info.color.utils.js

@@ -0,0 +1,304 @@
+/**
+ * Default translucent card color used for tinting card surfaces when no specific color is provided.
+ * @type {{r: number, g: number, b: number, a: number}}
+ */
+export const DEFAULT_TRANSLUCENT_CARD_COLOR = {
+  r: 22,
+  g: 119,
+  b: 255,
+  a: 0.5
+};
+
+/**
+ * Rounds a color channel value to two decimal places.
+ * @param value
+ * @returns {number}
+ */
+const roundColorChannel = (value) => Math.round(value * 100) / 100;
+
+/**
+ * Rounds a tint percentage value to two decimal places.
+ * @param value
+ * @returns {number}
+ */
+const roundTintPercentage = (value) => Math.round(value * 100) / 100;
+
+/**
+ * Clamps an alpha value to the range [0, 1] and rounds it to two decimal places.
+ * @param value
+ * @returns {number}
+ */
+const clampAlpha = (value) => {
+  const numericValue = Number(value);
+
+  if (!Number.isFinite(numericValue)) return 1;
+  if (numericValue <= 0) return 0;
+  if (numericValue >= 1) return 1;
+
+  return numericValue;
+};
+
+/**
+ * Converts an RGB color object to a hexadecimal color string.
+ * @param param0
+ * @param param0.r
+ * @param param0.g
+ * @param param0.b
+ * @returns {`#${string}`}
+ */
+const rgbToHex = ({ r, g, b }) =>
+  `#${[r, g, b].map((channel) => Math.round(channel).toString(16).padStart(2, "0")).join("")}`;
+
+/**
+ * Converts an RGB color object to an HSL color object.
+ * @param param0
+ * @param param0.r
+ * @param param0.g
+ * @param param0.b
+ * @param param0.a
+ * @returns {{h: number, s: number, l: number, a: number}|{h: number, s: number, l: number, a: number}}
+ */
+const rgbToHsl = ({ r, g, b, a = 1 }) => {
+  const red = r / 255;
+  const green = g / 255;
+  const blue = b / 255;
+  const max = Math.max(red, green, blue);
+  const min = Math.min(red, green, blue);
+  const delta = max - min;
+  const lightness = (max + min) / 2;
+
+  if (delta === 0) {
+    return { h: 0, s: 0, l: roundColorChannel(lightness), a };
+  }
+
+  const saturation = lightness > 0.5 ? delta / (2 - max - min) : delta / (max + min);
+  let hue;
+
+  switch (max) {
+    case red:
+      hue = (green - blue) / delta + (green < blue ? 6 : 0);
+      break;
+    case green:
+      hue = (blue - red) / delta + 2;
+      break;
+    default:
+      hue = (red - green) / delta + 4;
+      break;
+  }
+
+  return {
+    h: roundColorChannel(hue * 60),
+    s: roundColorChannel(saturation),
+    l: roundColorChannel(lightness),
+    a
+  };
+};
+
+/**
+ * Converts an RGB color object to an HSV color object.
+ * @param param0
+ * @param param0.r
+ * @param param0.g
+ * @param param0.b
+ * @param param0.a
+ * @returns {{h: number, s: number, v: number, a: number}}
+ */
+const rgbToHsv = ({ r, g, b, a = 1 }) => {
+  const red = r / 255;
+  const green = g / 255;
+  const blue = b / 255;
+  const max = Math.max(red, green, blue);
+  const min = Math.min(red, green, blue);
+  const delta = max - min;
+  const saturation = max === 0 ? 0 : delta / max;
+  let hue = 0;
+
+  if (delta !== 0) {
+    switch (max) {
+      case red:
+        hue = (green - blue) / delta + (green < blue ? 6 : 0);
+        break;
+      case green:
+        hue = (blue - red) / delta + 2;
+        break;
+      default:
+        hue = (red - green) / delta + 4;
+        break;
+    }
+  }
+
+  return {
+    h: roundColorChannel(hue * 60),
+    s: roundColorChannel(saturation),
+    v: roundColorChannel(max),
+    a
+  };
+};
+
+/**
+ * Builds a comprehensive color value object for a color picker component based on an input RGB color object.
+ * @param rgb
+ * @returns {{hex: `#${string}`, rgb: *, hsl: {h: number, s: number, l: number, a: number}, hsv: {h: number, s: number, v: number, a: number}, oldHue: number, source: string}}
+ */
+const buildPickerColorValue = (rgb) => {
+  const hsl = rgbToHsl(rgb);
+
+  return {
+    hex: rgbToHex(rgb),
+    rgb: { ...rgb },
+    hsl,
+    hsv: rgbToHsv(rgb),
+    oldHue: hsl.h,
+    source: "rgb"
+  };
+};
+
+/**
+ * Default color value object for the color picker component, derived from the default translucent card color.
+ * @type {{hex: `#${string}`, rgb: *, hsl: {h: number, s: number, l: number, a: number}, hsv: {h: number, s: number, v: number, a: number}, oldHue: number, source: string}}
+ */
+export const DEFAULT_TRANSLUCENT_PICKER_COLOR = buildPickerColorValue(DEFAULT_TRANSLUCENT_CARD_COLOR);
+
+/**
+ * Parses a color string that may be a JSON representation of a color object. If the string is valid JSON and represents
+ * a color, it returns the parsed object; otherwise, it returns the original string.
+ * @param color
+ * @returns {*|string}
+ */
+const parseJsonColorString = (color) => {
+  if (typeof color !== "string") return color;
+
+  const trimmedColor = color.trim();
+  if (!trimmedColor.startsWith("{") && !trimmedColor.startsWith("[")) return color;
+
+  try {
+    return JSON.parse(trimmedColor);
+  } catch {
+    return color;
+  }
+};
+
+/**
+ * Parses a hexadecimal color string (e.g., "#RRGGBB" or "#RRGGBBAA") and returns an object containing the corresponding
+ * RGB color value and alpha transparency. Supports both 3/4-digit and 6/8-digit hex formats.
+ * @param color
+ * @returns {{colorCssValue: string, alpha: number}|null}
+ */
+const parseHexColor = (color) => {
+  if (typeof color !== "string") return null;
+
+  const normalizedHex = color.trim().replace(/^#/, "");
+
+  if (![3, 4, 6, 8].includes(normalizedHex.length) || /[^0-9a-f]/i.test(normalizedHex)) {
+    return null;
+  }
+
+  const expandedHex =
+    normalizedHex.length <= 4
+      ? normalizedHex
+          .split("")
+          .map((character) => `${character}${character}`)
+          .join("")
+      : normalizedHex;
+
+  const hasAlpha = expandedHex.length === 8;
+  const red = Number.parseInt(expandedHex.slice(0, 2), 16);
+  const green = Number.parseInt(expandedHex.slice(2, 4), 16);
+  const blue = Number.parseInt(expandedHex.slice(4, 6), 16);
+  const alpha = hasAlpha ? Number.parseInt(expandedHex.slice(6, 8), 16) / 255 : 1;
+
+  return {
+    colorCssValue: `rgb(${red}, ${green}, ${blue})`,
+    alpha: clampAlpha(alpha)
+  };
+};
+
+/**
+ * Parses an RGB or RGBA color string (e.g., "rgb(255, 0, 0)" or "rgba(255, 0, 0, 0.5)") and returns an object
+ * containing the corresponding RGB color value and alpha transparency. Supports both integer and percentage formats for
+ * color channels and alpha.
+ * @param color
+ * @returns {{colorCssValue: string, alpha: number}|null}
+ */
+const parseRgbColor = (color) => {
+  if (typeof color !== "string") return null;
+
+  const rgbMatch = color.trim().match(/^rgba?\(\s*([\d.]+)\s*,\s*([\d.]+)\s*,\s*([\d.]+)(?:\s*,\s*([\d.]+))?\s*\)$/i);
+
+  if (!rgbMatch) return null;
+
+  const [, red, green, blue, alpha = 1] = rgbMatch;
+
+  return {
+    colorCssValue: `rgb(${red}, ${green}, ${blue})`,
+    alpha: clampAlpha(alpha)
+  };
+};
+
+/**
+ * Normalizes a color input into a consistent descriptor object containing a CSS color value and an alpha transparency
+ * level.
+ * @param color
+ * @returns {{colorCssValue: string, alpha: number}|{colorCssValue: string, alpha: number}|*|{colorCssValue: string, alpha: number}|null}
+ */
+const getNormalizedColorDescriptor = (color) => {
+  if (!color) return null;
+
+  const normalizedColor = parseJsonColorString(color);
+
+  if (typeof normalizedColor === "string") {
+    return (
+      parseHexColor(normalizedColor) ||
+      parseRgbColor(normalizedColor) || {
+        colorCssValue: normalizedColor,
+        alpha: 1
+      }
+    );
+  }
+
+  if (typeof normalizedColor === "object" && normalizedColor.rgb) {
+    return getNormalizedColorDescriptor(normalizedColor.rgb);
+  }
+
+  if (typeof normalizedColor === "object" && typeof normalizedColor.hex === "string") {
+    return getNormalizedColorDescriptor(normalizedColor.hex);
+  }
+
+  if (
+    typeof normalizedColor === "object" &&
+    normalizedColor.r !== undefined &&
+    normalizedColor.g !== undefined &&
+    normalizedColor.b !== undefined
+  ) {
+    return {
+      colorCssValue: `rgb(${normalizedColor.r}, ${normalizedColor.g}, ${normalizedColor.b})`,
+      alpha: clampAlpha(normalizedColor.a)
+    };
+  }
+
+  return null;
+};
+
+/**
+ * Generates CSS styles for tinting card surfaces based on a provided color input. The function normalizes the input
+ * color,
+ * @param color
+ * @returns {{surfaceBg: string, surfaceHeaderBg: string, surfaceBorderColor: string}|{}}
+ */
+export const getTintedCardSurfaceStyles = (color) => {
+  const normalizedColor = getNormalizedColorDescriptor(color);
+  if (!normalizedColor?.colorCssValue) return {};
+
+  const tintStrength = clampAlpha(normalizedColor.alpha);
+  if (tintStrength === 0) return {};
+
+  const backgroundTint = roundTintPercentage(10 * tintStrength);
+  const headerTint = roundTintPercentage(18 * tintStrength);
+  const borderTint = roundTintPercentage(30 * tintStrength);
+
+  return {
+    surfaceBg: `color-mix(in srgb, ${normalizedColor.colorCssValue} ${backgroundTint}%, var(--imex-form-surface))`,
+    surfaceHeaderBg: `color-mix(in srgb, ${normalizedColor.colorCssValue} ${headerTint}%, var(--imex-form-surface-head))`,
+    surfaceBorderColor: `color-mix(in srgb, ${normalizedColor.colorCssValue} ${borderTint}%, var(--imex-form-surface-border))`
+  };
+};

client/src/components/shop-info/shop-info.color.utils.test.js

@@ -0,0 +1,52 @@
+import { describe, expect, it } from "vitest";
+import { getTintedCardSurfaceStyles } from "./shop-info.color.utils";
+
+describe("shop info color utilities", () => {
+  it("scales card tint intensity with alpha for plain rgba values", () => {
+    expect(
+      getTintedCardSurfaceStyles({
+        r: 22,
+        g: 119,
+        b: 255,
+        a: 0.5
+      })
+    ).toEqual({
+      surfaceBg: "color-mix(in srgb, rgb(22, 119, 255) 5%, var(--imex-form-surface))",
+      surfaceHeaderBg: "color-mix(in srgb, rgb(22, 119, 255) 9%, var(--imex-form-surface-head))",
+      surfaceBorderColor: "color-mix(in srgb, rgb(22, 119, 255) 15%, var(--imex-form-surface-border))"
+    });
+  });
+
+  it("returns no tint when the selected color alpha is zero", () => {
+    expect(
+      getTintedCardSurfaceStyles({
+        hex: "#1677ff",
+        rgb: {
+          r: 22,
+          g: 119,
+          b: 255,
+          a: 0
+        }
+      })
+    ).toEqual({});
+  });
+
+  it("supports legacy JSON-stringified picker values", () => {
+    expect(
+      getTintedCardSurfaceStyles(
+        JSON.stringify({
+          rgb: {
+            r: 255,
+            g: 0,
+            b: 0,
+            a: 0.25
+          }
+        })
+      )
+    ).toEqual({
+      surfaceBg: "color-mix(in srgb, rgb(255, 0, 0) 2.5%, var(--imex-form-surface))",
+      surfaceHeaderBg: "color-mix(in srgb, rgb(255, 0, 0) 4.5%, var(--imex-form-surface-head))",
+      surfaceBorderColor: "color-mix(in srgb, rgb(255, 0, 0) 7.5%, var(--imex-form-surface-border))"
+    });
+  });
+});

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

@@ -1,6 +1,7 @@
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { Button, Card, Tabs } from "antd";
 import queryString from "query-string";
+import { useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
@@ -21,6 +22,7 @@ import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycen
 import ShopInfoRoGuard from "./shop-info.roguard.component";
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
+import ShopInfoSectionNavigator from "./shop-info.section-navigator.component.jsx";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
 import ShopInfoTaskPresets from "./shop-info.task-presets.component";
 import ShopInfoIntellipay from "./shop-intellipay-config.component";
@@ -33,7 +35,7 @@ const mapDispatchToProps = () => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
 
-export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
+export function ShopInfoComponent({ bodyshop, form, saveLoading, isDirty }) {
   const {
     treatments: { CriticalPartsScanning, Enhanced_Payroll }
   } = useTreatmentsWithConfig({
@@ -47,6 +49,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
   const history = useNavigate();
   const location = useLocation();
   const search = queryString.parse(location.search);
+  const tabsRef = useRef(null);
 
   const tabItems = [
     {
@@ -154,23 +157,35 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
         ]
       : [])
   ];
+  const activeTabKey = search.subtab || tabItems[0]?.key;
+
   return (
     <Card
+      title={<ShopInfoSectionNavigator tabsRef={tabsRef} activeTabKey={activeTabKey} />}
       extra={
-        <Button type="primary" loading={saveLoading} onClick={() => form.submit()} id="shop-info-save-button">
-          {t("general.actions.save")}
+        <Button
+          type="primary"
+          disabled={!isDirty || saveLoading}
+          loading={saveLoading}
+          onClick={() => form.submit()}
+          id="shop-info-save-button"
+          style={{ minWidth: 210 }}
+        >
+          {t("bodyshop.actions.save_shop_information")}
         </Button>
       }
     >
-      <Tabs
-        defaultActiveKey={search.subtab}
-        onChange={(key) =>
-          history({
-            search: `?tab=${search.tab}&subtab=${key}`
-          })
-        }
-        items={tabItems}
-      />
+      <div ref={tabsRef}>
+        <Tabs
+          activeKey={activeTabKey}
+          onChange={(key) =>
+            history({
+              search: `?tab=${search.tab}&subtab=${key}`
+            })
+          }
+          items={tabItems}
+        />
+      </div>
     </Card>
   );
 }

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

@@ -1,4 +1,4 @@
-import { Card, Typography } from "antd";
+import { Card } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,9 +15,8 @@ function ShopInfoConsentComponent({ bodyshop }) {
   const { t } = useTranslation();
 
   return (
-    <Card>
-      <Typography.Title level={4}>{t("settings.title")}</Typography.Title>
-      {<PhoneNumberConsentList bodyshop={bodyshop} />}
+    <Card title={t("settings.title")}>
+      <PhoneNumberConsentList bodyshop={bodyshop} />
     </Card>
   );
 }

client/src/components/shop-info/shop-info.container.jsx

@@ -1,6 +1,6 @@
 import { useMutation, useQuery } from "@apollo/client/react";
 import { Form } from "antd";
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -15,6 +15,7 @@ import { FEATURE_CONFIGS, useFormDataPreservation } from "./useFormDataPreservat
 export default function ShopInfoContainer() {
   const [form] = Form.useForm();
   const { t } = useTranslation();
+  const [isShopInfoDirty, setIsShopInfoDirty] = useState(false);
   const [saveLoading, setSaveLoading] = useState(false);
   const [updateBodyshop] = useMutation(UPDATE_SHOP);
   const { loading, error, data, refetch } = useQuery(QUERY_BODYSHOP, {
@@ -33,7 +34,10 @@ export default function ShopInfoContainer() {
         return acc;
       }, {});
 
-  const combinedFeatureConfig = combineFeatureConfigs(FEATURE_CONFIGS.general, FEATURE_CONFIGS.responsibilitycenters);
+  const combinedFeatureConfig = useMemo(
+    () => combineFeatureConfigs(FEATURE_CONFIGS.general, FEATURE_CONFIGS.responsibilitycenters),
+    []
+  );
 
   // Use form data preservation for all shop-info features
   const { createSubmissionHandler, preserveHiddenFormData } = useFormDataPreservation(
@@ -51,7 +55,10 @@ export default function ShopInfoContainer() {
     })
       .then(() => {
         notification.success({ title: t("bodyshop.successes.save") });
-        refetch().then(() => form.resetFields());
+        refetch().then(() => {
+          form.resetFields();
+          setIsShopInfoDirty(false);
+        });
       })
       .catch((error) => {
         notification.error({
@@ -66,6 +73,7 @@ export default function ShopInfoContainer() {
     form.resetFields();
     // After reset, re-apply hidden field preservation so values aren't wiped
     preserveHiddenFormData();
+    setIsShopInfoDirty(false);
   }, [data, form, preserveHiddenFormData]);
 
   if (error) return <AlertComponent title={error.message} type="error" />;
@@ -76,6 +84,9 @@ export default function ShopInfoContainer() {
       layout="vertical"
       autoComplete="new-password"
       onFinish={handleFinish}
+      onValuesChange={() => {
+        setIsShopInfoDirty(form.isFieldsTouched());
+      }}
       initialValues={
         data
           ? data?.bodyshops?.[0]?.accountingconfig?.ClosingPeriod
@@ -99,8 +110,8 @@ export default function ShopInfoContainer() {
           : null
       }
     >
-      <FormsFieldChanged form={form} />
-      <ShopInfoComponent form={form} saveLoading={saveLoading} />
+      <FormsFieldChanged form={form} onDirtyChange={setIsShopInfoDirty} />
+      <ShopInfoComponent form={form} saveLoading={saveLoading} isDirty={isShopInfoDirty} />
     </Form>
   );
 }

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

@@ -5,7 +5,19 @@ import styled from "styled-components";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ConfigFormTypes from "../config-form-components/config-form-types";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import {
+  INLINE_TITLE_GROUP_STYLE,
+  INLINE_TITLE_HANDLE_STYLE,
+  INLINE_TITLE_INPUT_STYLE,
+  INLINE_TITLE_LABEL_STYLE,
+  INLINE_TITLE_ROW_STYLE,
+  INLINE_TITLE_SEPARATOR_STYLE,
+  INLINE_TITLE_SWITCH_GROUP_STYLE,
+  InlineTitleListIcon
+} from "../layout-form-row/inline-form-row-title.utils.js";
 
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
@@ -19,306 +31,386 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
   const TemplateListGenerated = TemplateList();
   return (
     <div>
-      <LayoutFormRow header={t("bodyshop.labels.intakechecklist")} id="intakechecklist">
-        <Form.List name={["intakechecklist", "form"]}>
-          {(fields, { add, remove, move }) => {
-            return (
-              <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item
-                        label={t("jobs.fields.intake.name")}
-                        key={`${index}name`}
-                        name={[field.name, "name"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.intake.type")}
-                        key={`${index}type`}
-                        name={[field.name, "type"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Select options={Object.keys(ConfigFormTypes).map((i) => ({ value: i, label: i }))} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.intake.label")}
-                        key={`${index}label`}
-                        name={[field.name, "label"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-
-                      <Form.Item shouldUpdate>
-                        {() => {
-                          if (form.getFieldValue(["intakechecklist", "form", index, "type"]) !== "slider") return null;
-                          return (
-                            <>
-                              <Form.Item
-                                label={t("jobs.fields.intake.min")}
-                                key={`${index}min`}
-                                name={[field.name, "min"]}
-                                dependencies={[[field.name, "type"]]}
-                                rules={[
-                                  {
-                                    required: true
-                                    //message: t("general.validation.required"),
-                                  }
-                                ]}
-                              >
-                                <InputNumber />
-                              </Form.Item>
-                              <Form.Item
-                                label={t("jobs.fields.intake.max")}
-                                key={`${index}max`}
-                                name={[field.name, "max"]}
-                                rules={[
-                                  {
-                                    required: true
-                                    //message: t("general.validation.required"),
-                                  }
-                                ]}
-                              >
-                                <InputNumber />
-                              </Form.Item>
-                            </>
-                          );
-                        }}
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.intake.required")}
-                        key={`${index}required`}
-                        name={[field.name, "required"]}
-                        valuePropName="checked"
-                      >
-                        <Switch />
-                      </Form.Item>
-                      <Space wrap>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
-                <Form.Item>
-                  <Button
-                    type="dashed"
-                    onClick={() => {
-                      add();
-                    }}
-                    style={{ width: "100%" }}
-                  >
-                    {t("general.actions.add")}
-                  </Button>
-                </Form.Item>
-              </div>
-            );
-          }}
-        </Form.List>
-      </LayoutFormRow>
       <SelectorDiv>
-        <Form.Item
-          name={["intakechecklist", "templates"]}
-          label={t("bodyshop.fields.intake.templates")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-              type: "array"
-            }
-          ]}
-        >
-          <Select
-            mode="multiple"
-            options={Object.keys(TemplateListGenerated).map((i) => ({
-              value: TemplateListGenerated[i].key,
-              label: TemplateListGenerated[i].title
-            }))}
-          />
-        </Form.Item>
-        <Form.Item
-          name={["intakechecklist", "next_contact_hours"]}
-          label={t("bodyshop.fields.intake.next_contact_hours")}
-        >
-          <InputNumber min={0} precision={0} />
-        </Form.Item>
+        <LayoutFormRow header={t("bodyshop.labels.intake_delivery")} id="intake-delivery">
+          <Form.Item
+            col={{ xs: 24, sm: 24, md: 24, lg: 24, xl: 24, xxl: 24 }}
+            name={["intakechecklist", "templates"]}
+            label={t("bodyshop.fields.intake.templates")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+            >
+              <Select
+                mode="multiple"
+                options={Object.keys(TemplateListGenerated).map((i) => ({
+                  value: TemplateListGenerated[i].key,
+                  label: TemplateListGenerated[i].title
+                }))}
+              />
+            </Form.Item>
+          <Form.Item
+            col={{ xs: 24, sm: 24, md: 24, lg: 24, xl: 24, xxl: 24 }}
+            name={["deliverchecklist", "templates"]}
+            label={t("bodyshop.fields.deliver.templates")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <Select
+              mode="multiple"
+                options={Object.keys(TemplateListGenerated).map((i) => ({
+                  value: TemplateListGenerated[i].key,
+                  label: TemplateListGenerated[i].title
+                }))}
+              />
+            </Form.Item>
+          <Form.Item
+            col={{ xs: 24, sm: 10, md: 8, lg: 8, xl: 8, xxl: 8 }}
+            name={["intakechecklist", "next_contact_hours"]}
+            label={t("bodyshop.fields.intake.next_contact_hours")}
+          >
+            <InputNumber min={0} precision={0} suffix="hrs" />
+          </Form.Item>
+          <Form.Item
+            col={{ xs: 24, sm: 14, md: 16, lg: 16, xl: 16, xxl: 16 }}
+            name={["deliverchecklist", "actual_delivery"]}
+            label={t("bodyshop.fields.deliver.require_actual_delivery_date")}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+          >
+            <Switch />
+          </Form.Item>
+        </LayoutFormRow>
       </SelectorDiv>
-
-      <LayoutFormRow header={t("bodyshop.labels.deliverchecklist")} id="deliverchecklist">
-        <Form.List name={["deliverchecklist", "form"]}>
-          {(fields, { add, remove, move }) => {
-            return (
+      <Form.List name={["intakechecklist", "form"]}>
+        {(fields, { add, remove, move }) => {
+          return (
+            <LayoutFormRow
+              header={t("bodyshop.labels.intakechecklist")}
+              id="intakechecklist"
+              actions={[
+                <Button
+                  key="add-intake-checklist-item"
+                  type="primary"
+                  block
+                  onClick={() => {
+                    add();
+                  }}
+                >
+                  {t("bodyshop.actions.add_intake_checklist_item")}
+                </Button>
+              ]}
+            >
               <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item
-                        label={t("jobs.fields.intake.name")}
-                        key={`${index}named`}
-                        name={[field.name, "name"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
+                {fields.length === 0 ? (
+                  <ConfigListEmptyState actionLabel={t("bodyshop.actions.add_intake_checklist_item")} />
+                ) : (
+                  fields.map((field, index) => {
+                    return (
+                      <Form.Item noStyle key={field.key}>
+                        <InlineValidatedFormRow
+                          form={form}
+                          errorNames={[["intakechecklist", "form", field.name, "name"]]}
+                          noDivider
+                          title={
+                            <div style={INLINE_TITLE_ROW_STYLE}>
+                              <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                              <div style={INLINE_TITLE_GROUP_STYLE}>
+                                <div style={INLINE_TITLE_LABEL_STYLE}>{t("jobs.fields.intake.name")}</div>
+                                <Form.Item
+                                  noStyle
+                                  name={[field.name, "name"]}
+                                  rules={[
+                                    {
+                                      required: true
+                                    }
+                                  ]}
+                                >
+                                  <Input
+                                    size="small"
+                                    placeholder={t("jobs.fields.intake.name")}
+                                    style={{
+                                      ...INLINE_TITLE_INPUT_STYLE,
+                                      width: "100%"
+                                    }}
+                                  />
+                                </Form.Item>
+                              </div>
+                              <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                              <div style={INLINE_TITLE_SWITCH_GROUP_STYLE}>
+                                <div style={INLINE_TITLE_LABEL_STYLE}>{t("jobs.fields.intake.required")}</div>
+                                <Form.Item noStyle name={[field.name, "required"]} valuePropName="checked">
+                                  <Switch />
+                                </Form.Item>
+                              </div>
+                            </div>
                           }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-
-                      <Form.Item
-                        label={t("jobs.fields.intake.type")}
-                        key={`${index}typed`}
-                        name={[field.name, "type"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
+                          wrapTitle
+                          extra={
+                            <Space align="center" size="small">
+                              <Button
+                                type="text"
+                                danger
+                                icon={<DeleteFilled />}
+                                onClick={() => {
+                                  remove(field.name);
+                                }}
+                              />
+                              <FormListMoveArrows
+                                move={move}
+                                index={index}
+                                total={fields.length}
+                                orientation="horizontal"
+                              />
+                            </Space>
                           }
-                        ]}
-                      >
-                        <Select options={Object.keys(ConfigFormTypes).map((i) => ({ value: i, label: i }))} />
-                      </Form.Item>
+                        >
+                          <Form.Item
+                            label={t("jobs.fields.intake.type")}
+                            key={`${index}type`}
+                            name={[field.name, "type"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <Select options={Object.keys(ConfigFormTypes).map((i) => ({ value: i, label: i }))} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.intake.label")}
+                            key={`${index}label`}
+                            name={[field.name, "label"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <Input />
+                          </Form.Item>
 
-                      <Form.Item
-                        label={t("jobs.fields.intake.label")}
-                        key={`${index}labeld`}
-                        name={[field.name, "label"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Input />
+                          <Form.Item shouldUpdate>
+                            {() => {
+                              if (form.getFieldValue(["intakechecklist", "form", index, "type"]) !== "slider")
+                                return null;
+                              return (
+                                <>
+                                  <Form.Item
+                                    label={t("jobs.fields.intake.min")}
+                                    key={`${index}min`}
+                                    name={[field.name, "min"]}
+                                    dependencies={[[field.name, "type"]]}
+                                    rules={[
+                                      {
+                                        required: true
+                                        //message: t("general.validation.required"),
+                                      }
+                                    ]}
+                                  >
+                                    <InputNumber />
+                                  </Form.Item>
+                                  <Form.Item
+                                    label={t("jobs.fields.intake.max")}
+                                    key={`${index}max`}
+                                    name={[field.name, "max"]}
+                                    rules={[
+                                      {
+                                        required: true
+                                        //message: t("general.validation.required"),
+                                      }
+                                    ]}
+                                  >
+                                    <InputNumber />
+                                  </Form.Item>
+                                </>
+                              );
+                            }}
+                          </Form.Item>
+                        </InlineValidatedFormRow>
                       </Form.Item>
-
-                      <Form.Item shouldUpdate>
-                        {() => {
-                          if (form.getFieldValue(["deliverchecklist", "form", index, "type"]) !== "slider") return null;
-                          return (
-                            <>
-                              <Form.Item
-                                label={t("jobs.fields.intake.min")}
-                                key={`${index}mind`}
-                                name={[field.name, "min"]}
-                                dependencies={[[field.name, "type"]]}
-                                rules={[
-                                  {
-                                    required: form.getFieldValue([field.name, "type"]) === "slider"
-                                    //message: t("general.validation.required"),
-                                  }
-                                ]}
-                              >
-                                <InputNumber />
-                              </Form.Item>
-                              <Form.Item
-                                label={t("jobs.fields.intake.max")}
-                                key={`${index}maxd`}
-                                name={[field.name, "max"]}
-                                dependencies={[[field.name, "type"]]}
-                                rules={[
-                                  {
-                                    required: form.getFieldValue([field.name, "type"]) === "slider"
-                                    //message: t("general.validation.required"),
-                                  }
-                                ]}
-                              >
-                                <InputNumber />
-                              </Form.Item>
-                            </>
-                          );
-                        }}
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.intake.required")}
-                        key={`${index}requiredd`}
-                        name={[field.name, "required"]}
-                        valuePropName="checked"
-                      >
-                        <Switch />
-                      </Form.Item>
-                      <DeleteFilled
-                        onClick={() => {
-                          remove(field.name);
-                        }}
-                      />
-                      <FormListMoveArrows move={move} index={index} total={fields.length} />
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
-                <Form.Item>
-                  <Button
-                    type="dashed"
-                    onClick={() => {
-                      add();
-                    }}
-                    style={{ width: "100%" }}
-                  >
-                    {t("general.actions.add")}
-                  </Button>
-                </Form.Item>
+                    );
+                  })
+                )}
               </div>
-            );
-          }}
-        </Form.List>
-      </LayoutFormRow>
-      <SelectorDiv>
-        <Form.Item
-          name={["deliverchecklist", "templates"]}
-          label={t("bodyshop.fields.deliver.templates")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-              type: "array"
-            }
-          ]}
-        >
-          <Select
-            mode="multiple"
-            options={Object.keys(TemplateListGenerated).map((i) => ({
-              value: TemplateListGenerated[i].key,
-              label: TemplateListGenerated[i].title
-            }))}
-          />
-        </Form.Item>
-        <Form.Item
-          name={["deliverchecklist", "actual_delivery"]}
-          label={t("bodyshop.fields.deliver.require_actual_delivery_date")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-        >
-          <Switch />
-        </Form.Item>
-      </SelectorDiv>
+            </LayoutFormRow>
+          );
+        }}
+      </Form.List>
+      <Form.List name={["deliverchecklist", "form"]}>
+        {(fields, { add, remove, move }) => {
+          return (
+            <LayoutFormRow
+              header={t("bodyshop.labels.deliverchecklist")}
+              id="deliverchecklist"
+              actions={[
+                <Button
+                  key="add-delivery-checklist-item"
+                  type="primary"
+                  block
+                  onClick={() => {
+                    add();
+                  }}
+                >
+                  {t("bodyshop.actions.add_delivery_checklist_item")}
+                </Button>
+              ]}
+            >
+              <div>
+                {fields.length === 0 ? (
+                  <ConfigListEmptyState actionLabel={t("bodyshop.actions.add_delivery_checklist_item")} />
+                ) : (
+                  fields.map((field, index) => {
+                    return (
+                      <Form.Item noStyle key={field.key}>
+                        <InlineValidatedFormRow
+                          form={form}
+                          errorNames={[["deliverchecklist", "form", field.name, "name"]]}
+                          noDivider
+                          title={
+                            <div style={INLINE_TITLE_ROW_STYLE}>
+                              <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                              <div style={INLINE_TITLE_GROUP_STYLE}>
+                                <div style={INLINE_TITLE_LABEL_STYLE}>{t("jobs.fields.intake.name")}</div>
+                                <Form.Item
+                                  noStyle
+                                  name={[field.name, "name"]}
+                                  rules={[
+                                    {
+                                      required: true
+                                    }
+                                  ]}
+                                >
+                                  <Input
+                                    size="small"
+                                    placeholder={t("jobs.fields.intake.name")}
+                                    style={{
+                                      ...INLINE_TITLE_INPUT_STYLE,
+                                      width: "100%"
+                                    }}
+                                  />
+                                </Form.Item>
+                              </div>
+                              <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                              <div style={INLINE_TITLE_SWITCH_GROUP_STYLE}>
+                                <div style={INLINE_TITLE_LABEL_STYLE}>{t("jobs.fields.intake.required")}</div>
+                                <Form.Item noStyle name={[field.name, "required"]} valuePropName="checked">
+                                  <Switch />
+                                </Form.Item>
+                              </div>
+                            </div>
+                          }
+                          wrapTitle
+                          extra={
+                            <Space align="center" size="small">
+                              <Button
+                                type="text"
+                                danger
+                                icon={<DeleteFilled />}
+                                onClick={() => {
+                                  remove(field.name);
+                                }}
+                              />
+                              <FormListMoveArrows
+                                move={move}
+                                index={index}
+                                total={fields.length}
+                                orientation="horizontal"
+                              />
+                            </Space>
+                          }
+                        >
+                          <Form.Item
+                            label={t("jobs.fields.intake.type")}
+                            key={`${index}typed`}
+                            name={[field.name, "type"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <Select options={Object.keys(ConfigFormTypes).map((i) => ({ value: i, label: i }))} />
+                          </Form.Item>
+
+                          <Form.Item
+                            label={t("jobs.fields.intake.label")}
+                            key={`${index}labeld`}
+                            name={[field.name, "label"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <Input />
+                          </Form.Item>
+
+                          <Form.Item shouldUpdate>
+                            {() => {
+                              if (form.getFieldValue(["deliverchecklist", "form", index, "type"]) !== "slider")
+                                return null;
+                              return (
+                                <>
+                                  <Form.Item
+                                    label={t("jobs.fields.intake.min")}
+                                    key={`${index}mind`}
+                                    name={[field.name, "min"]}
+                                    dependencies={[[field.name, "type"]]}
+                                    rules={[
+                                      {
+                                        required: form.getFieldValue([field.name, "type"]) === "slider"
+                                        //message: t("general.validation.required"),
+                                      }
+                                    ]}
+                                  >
+                                    <InputNumber />
+                                  </Form.Item>
+                                  <Form.Item
+                                    label={t("jobs.fields.intake.max")}
+                                    key={`${index}maxd`}
+                                    name={[field.name, "max"]}
+                                    dependencies={[[field.name, "type"]]}
+                                    rules={[
+                                      {
+                                        required: form.getFieldValue([field.name, "type"]) === "slider"
+                                        //message: t("general.validation.required"),
+                                      }
+                                    ]}
+                                  >
+                                    <InputNumber />
+                                  </Form.Item>
+                                </>
+                              );
+                            }}
+                          </Form.Item>
+                        </InlineValidatedFormRow>
+                      </Form.Item>
+                    );
+                  })
+                )}
+              </div>
+            </LayoutFormRow>
+          );
+        }}
+      </Form.List>
     </div>
   );
 }

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

@@ -3,344 +3,392 @@ import { Button, Form, Input, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import {
+  INLINE_TITLE_GROUP_STYLE,
+  INLINE_TITLE_HANDLE_STYLE,
+  INLINE_TITLE_INPUT_STYLE,
+  INLINE_TITLE_LABEL_STYLE,
+  INLINE_TITLE_ROW_STYLE,
+  InlineTitleListIcon
+} from "../layout-form-row/inline-form-row-title.utils.js";
 
 export default function ShopInfoLaborRates() {
   const { t } = useTranslation();
+  const form = Form.useFormInstance();
 
   return (
     <>
       <LayoutFormRow header={t("bodyshop.labels.shoprates")}>
         <Form.Item label={t("jobs.fields.rate_ats")} name={["shoprates", "rate_ats"]}>
-          <CurrencyInput min={0} />
+          <CurrencyInput prefix="$" min={0} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_ats_flat")} name={["shoprates", "rate_ats_flat"]}>
-          <CurrencyInput min={0} />
+          <CurrencyInput prefix="$" min={0} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.laborrates")}>
-        <Form.List name={["md_labor_rates"]}>
-          {(fields, { add, remove, move }) => {
-            return (
+      <Form.List name={["md_labor_rates"]}>
+        {(fields, { add, remove, move }) => {
+          return (
+            <LayoutFormRow
+              header={t("bodyshop.labels.laborrates")}
+              actions={[
+                <Button
+                  key="add-labor-rate"
+                  type="primary"
+                  block
+                  onClick={() => {
+                    add();
+                  }}
+                >
+                  {t("bodyshop.actions.newlaborrate")}
+                </Button>
+              ]}
+            >
               <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider={index === 0}>
-                      <Form.Item
-                        label={t("jobs.fields.labor_rate_desc")}
-                        key={`${index}rate_label`}
-                        name={[field.name, "rate_label"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
+                {fields.length === 0 ? (
+                  <ConfigListEmptyState actionLabel={t("bodyshop.actions.newlaborrate")} />
+                ) : (
+                  fields.map((field, index) => {
+                    return (
+                      <Form.Item noStyle key={field.key}>
+                        <InlineValidatedFormRow
+                          form={form}
+                          errorNames={[["md_labor_rates", field.name, "rate_label"]]}
+                          noDivider={index === 0}
+                          title={
+                            <div style={INLINE_TITLE_ROW_STYLE}>
+                              <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                              <div style={INLINE_TITLE_GROUP_STYLE}>
+                                <div style={INLINE_TITLE_LABEL_STYLE}>{t("jobs.fields.labor_rate_desc")}</div>
+                                <Form.Item
+                                  noStyle
+                                  name={[field.name, "rate_label"]}
+                                  rules={[
+                                    {
+                                      required: true
+                                    }
+                                  ]}
+                                >
+                                  <Input
+                                    size="small"
+                                    placeholder={t("jobs.fields.labor_rate_desc")}
+                                    style={{
+                                      ...INLINE_TITLE_INPUT_STYLE,
+                                      width: "100%"
+                                    }}
+                                  />
+                                </Form.Item>
+                              </div>
+                            </div>
                           }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_laa")}
-                        key={`${index}rate_laa`}
-                        name={[field.name, "rate_laa"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
+                          wrapTitle
+                          extra={
+                            <Space align="center" size="small">
+                              <Button
+                                type="text"
+                                danger
+                                icon={<DeleteFilled />}
+                                onClick={() => {
+                                  remove(field.name);
+                                }}
+                              />
+                              <FormListMoveArrows
+                                move={move}
+                                index={index}
+                                total={fields.length}
+                                orientation="horizontal"
+                              />
+                            </Space>
                           }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lab")}
-                        key={`${index}rate_lab`}
-                        name={[field.name, "rate_lab"]}
-                        rules={[
+                        >
+                          <Form.Item
+                            label={t("jobs.fields.rate_laa")}
+                            key={`${index}rate_laa`}
+                            name={[field.name, "rate_laa"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_lab")}
+                            key={`${index}rate_lab`}
+                            name={[field.name, "rate_lab"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_lad")}
+                            key={`${index}rate_lad`}
+                            name={[field.name, "rate_lad"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_lae")}
+                            key={`${index}rate_lae`}
+                            name={[field.name, "rate_lae"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_laf")}
+                            key={`${index}rate_laf`}
+                            name={[field.name, "rate_laf"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_lag")}
+                            key={`${index}rate_lag`}
+                            name={[field.name, "rate_lag"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_lam")}
+                            key={`${index}rate_lam`}
+                            name={[field.name, "rate_lam"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_lar")}
+                            key={`${index}rate_lar`}
+                            name={[field.name, "rate_lar"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_las")}
+                            key={`${index}rate_las`}
+                            name={[field.name, "rate_las"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_la1")}
+                            key={`${index}rate_la1`}
+                            name={[field.name, "rate_la1"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_la2")}
+                            key={`${index}rate_la2`}
+                            name={[field.name, "rate_la2"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_la3")}
+                            key={`${index}rate_la3`}
+                            name={[field.name, "rate_la3"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_la4")}
+                            key={`${index}rate_la4`}
+                            name={[field.name, "rate_la4"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_mash")}
+                            key={`${index}rate_mash`}
+                            name={[field.name, "rate_mash"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_mapa")}
+                            key={`${index}rate_mapa`}
+                            name={[field.name, "rate_mapa"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_ma2s")}
+                            key={`${index}rate_ma2s`}
+                            name={[field.name, "rate_ma2s"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_ma3s")}
+                            key={`${index}rate_ma3s`}
+                            name={[field.name, "rate_ma3s"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
                           {
-                            required: true
-                            //message: t("general.validation.required"),
+                            // <Form.Item
+                            //   label={t("jobs.fields.rate_mabl")}
+                            //   key={`${index}rate_mabl`}
+                            //   name={[field.name, "rate_mabl"]}
+                            //   rules={[
+                            //     {
+                            //       required: true,
+                            //       //message: t("general.validation.required"),
+                            //     },
+                            //   ]}
+                            // >
+                            //   <CurrencyInput min={0} />
+                            // </Form.Item>
+                            // <Form.Item
+                            //   label={t("jobs.fields.rate_macs")}
+                            //   key={`${index}rate_macs`}
+                            //   name={[field.name, "rate_macs"]}
+                            //   rules={[
+                            //     {
+                            //       required: true,
+                            //       //message: t("general.validation.required"),
+                            //     },
+                            //   ]}
+                            // >
+                            //   <CurrencyInput min={0} />
+                            // </Form.Item>
                           }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
+                          <Form.Item
+                            label={t("jobs.fields.rate_matd")}
+                            key={`${index}rate_matd`}
+                            name={[field.name, "rate_matd"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("jobs.fields.rate_mahw")}
+                            key={`${index}rate_mahw`}
+                            name={[field.name, "rate_mahw"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <CurrencyInput prefix="$" min={0} />
+                          </Form.Item>
+                        </InlineValidatedFormRow>
                       </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lad")}
-                        key={`${index}rate_lad`}
-                        name={[field.name, "rate_lad"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lae")}
-                        key={`${index}rate_lae`}
-                        name={[field.name, "rate_lae"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_laf")}
-                        key={`${index}rate_laf`}
-                        name={[field.name, "rate_laf"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lag")}
-                        key={`${index}rate_lag`}
-                        name={[field.name, "rate_lag"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lam")}
-                        key={`${index}rate_lam`}
-                        name={[field.name, "rate_lam"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_lar")}
-                        key={`${index}rate_lar`}
-                        name={[field.name, "rate_lar"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_las")}
-                        key={`${index}rate_las`}
-                        name={[field.name, "rate_las"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la1")}
-                        key={`${index}rate_la1`}
-                        name={[field.name, "rate_la1"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la2")}
-                        key={`${index}rate_la2`}
-                        name={[field.name, "rate_la2"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la3")}
-                        key={`${index}rate_la3`}
-                        name={[field.name, "rate_la3"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_la4")}
-                        key={`${index}rate_la4`}
-                        name={[field.name, "rate_la4"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_mash")}
-                        key={`${index}rate_mash`}
-                        name={[field.name, "rate_mash"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_mapa")}
-                        key={`${index}rate_mapa`}
-                        name={[field.name, "rate_mapa"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_ma2s")}
-                        key={`${index}rate_ma2s`}
-                        name={[field.name, "rate_ma2s"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_ma3s")}
-                        key={`${index}rate_ma3s`}
-                        name={[field.name, "rate_ma3s"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      {
-                        // <Form.Item
-                        //   label={t("jobs.fields.rate_mabl")}
-                        //   key={`${index}rate_mabl`}
-                        //   name={[field.name, "rate_mabl"]}
-                        //   rules={[
-                        //     {
-                        //       required: true,
-                        //       //message: t("general.validation.required"),
-                        //     },
-                        //   ]}
-                        // >
-                        //   <CurrencyInput min={0} />
-                        // </Form.Item>
-                        // <Form.Item
-                        //   label={t("jobs.fields.rate_macs")}
-                        //   key={`${index}rate_macs`}
-                        //   name={[field.name, "rate_macs"]}
-                        //   rules={[
-                        //     {
-                        //       required: true,
-                        //       //message: t("general.validation.required"),
-                        //     },
-                        //   ]}
-                        // >
-                        //   <CurrencyInput min={0} />
-                        // </Form.Item>
-                      }
-                      <Form.Item
-                        label={t("jobs.fields.rate_matd")}
-                        key={`${index}rate_matd`}
-                        name={[field.name, "rate_matd"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("jobs.fields.rate_mahw")}
-                        key={`${index}rate_mahw`}
-                        name={[field.name, "rate_mahw"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                      <Space>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.rate_length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
-                <Form.Item>
-                  <Button
-                    type="dashed"
-                    onClick={() => {
-                      add();
-                    }}
-                    style={{ width: "100%" }}
-                  >
-                    {t("bodyshop.actions.newlaborrate")}
-                  </Button>
-                </Form.Item>
+                    );
+                  })
+                )}
               </div>
-            );
-          }}
-        </Form.List>
-      </LayoutFormRow>
+            </LayoutFormRow>
+          );
+        }}
+      </Form.List>
     </>
   );
 }

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

@@ -1,6 +1,7 @@
 import { Form, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component.jsx";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const { Text, Paragraph } = Typography;
 
@@ -11,43 +12,45 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
   const employeeOptions = bodyshop?.employees?.filter((e) => e.active && e.user_email && e.id) || [];
 
   return (
-    <div>
-      <Paragraph>{t("bodyshop.fields.notifications.description")}</Paragraph>
-      <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={[
-            {
-              type: "array",
-              message: t("general.validation.array")
-            },
-            {
-              validator: async (_, value) => {
-                if (!value || value.length === 0) {
-                  return Promise.resolve(); // Allow empty array
+    <LayoutFormRow header={t("bodyshop.labels.notification_options")}>
+      <div>
+        <Paragraph>{t("bodyshop.fields.notifications.description")}</Paragraph>
+        <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={[
+              {
+                type: "array",
+                message: t("general.validation.array")
+              },
+              {
+                validator: async (_, value) => {
+                  if (!value || value.length === 0) {
+                    return Promise.resolve(); // Allow empty array
+                  }
+                  const hasInvalid = value.some((id) => id == null || typeof id !== "string" || id.trim() === "");
+                  if (hasInvalid) {
+                    return Promise.reject(new Error(t("bodyshop.fields.notifications.invalid_followers")));
+                  }
+                  return Promise.resolve();
                 }
-                const hasInvalid = value.some((id) => id == null || typeof id !== "string" || id.trim() === "");
-                if (hasInvalid) {
-                  return Promise.reject(new Error(t("bodyshop.fields.notifications.invalid_followers")));
-                }
-                return Promise.resolve();
               }
-            }
-          ]}
-        >
-          <EmployeeSearchSelectComponent
-            style={{ minWidth: "100%" }}
-            mode="multiple"
-            options={employeeOptions}
-            placeholder={t("bodyshop.fields.notifications.placeholder")}
-            showEmail={true}
-          />
-        </Form.Item>
-      ) : (
-        <Text type="secondary">{t("bodyshop.fields.no_employees_available")}</Text>
-      )}
-    </div>
+            ]}
+          >
+            <EmployeeSearchSelectComponent
+              style={{ minWidth: "100%" }}
+              mode="multiple"
+              options={employeeOptions}
+              placeholder={t("bodyshop.fields.notifications.placeholder")}
+              showEmail={true}
+            />
+          </Form.Item>
+        ) : (
+          <Text type="secondary">{t("bodyshop.fields.no_employees_available")}</Text>
+        )}
+      </div>
+    </LayoutFormRow>
   );
 }

client/src/components/shop-info/shop-info.parts-scan.jsx

@@ -3,7 +3,19 @@ import { Button, Col, Form, Input, Row, Select, Space, Switch } from "antd";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import {
+  INLINE_TITLE_GROUP_STYLE,
+  INLINE_TITLE_HANDLE_STYLE,
+  INLINE_TITLE_INPUT_STYLE,
+  INLINE_TITLE_LABEL_STYLE,
+  INLINE_TITLE_ROW_STYLE,
+  INLINE_TITLE_SEPARATOR_STYLE,
+  INLINE_TITLE_SWITCH_GROUP_STYLE,
+  InlineTitleListIcon
+} from "../layout-form-row/inline-form-row-title.utils.js";
 import i18n from "i18next";
 
 const predefinedPartTypes = ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"];
@@ -68,195 +80,223 @@ export default function ShopInfoPartsScan({ form }) {
 
   return (
     <div>
-      <LayoutFormRow header={t("bodyshop.labels.md_parts_scan")}>
-        <Form.List name={["md_parts_scan"]}>
-          {(fields, { add, remove, move }) => (
+      <Form.List name={["md_parts_scan"]}>
+        {(fields, { add, remove, move }) => (
+          <LayoutFormRow
+            header={t("bodyshop.labels.md_parts_scan")}
+            actions={[
+              <Button
+                key="add-parts-scan-rule"
+                type="primary"
+                block
+                onClick={() =>
+                  add({
+                    field: "line_desc",
+                    operation: "contains",
+                    mark_critical: true,
+                    caseInsensitive: true
+                  })
+                }
+              >
+                {t("bodyshop.actions.addpartsrule")}
+              </Button>
+            ]}
+          >
             <div>
-              {fields.map((field, index) => {
-                const selectedField = watchedFields?.[index]?.field || "line_desc";
-                const fieldType = getFieldType(selectedField);
+              {fields.length === 0 ? (
+                <ConfigListEmptyState actionLabel={t("bodyshop.actions.addpartsrule")} />
+              ) : (
+                fields.map((field, index) => {
+                  const selectedField = watchedFields?.[index]?.field || "line_desc";
+                  const fieldType = getFieldType(selectedField);
 
-                return (
-                  <Form.Item key={field.key}>
-                    <Row gutter={[16, 16]} align="middle">
-                      {/* Select Field */}
-                      <Col span={6}>
-                        <Form.Item
-                          label={t("bodyshop.fields.md_parts_scan.field")}
-                          name={[field.name, "field"]}
-                          rules={[
-                            {
-                              required: true,
-                              message: t("general.validation.required", {
-                                label: t("bodyshop.fields.md_parts_scan.field")
-                              })
-                            }
-                          ]}
-                        >
-                          <Select
-                            options={fieldSelectOptions}
-                            onChange={() => {
-                              form.setFields([
-                                { name: ["md_parts_scan", index, "operation"], value: "contains" },
-                                { name: ["md_parts_scan", index, "value"], value: undefined }
-                              ]);
-                            }}
-                          />
-                        </Form.Item>
-                      </Col>
+                  return (
+                    <Form.Item noStyle key={field.key}>
+                      <InlineValidatedFormRow
+                        form={form}
+                        errorNames={[["md_parts_scan", field.name, "field"]]}
+                        noDivider
+                        title={
+                          <div style={INLINE_TITLE_ROW_STYLE}>
+                            <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                            <div style={INLINE_TITLE_GROUP_STYLE}>
+                              <div style={INLINE_TITLE_LABEL_STYLE}>{t("bodyshop.fields.md_parts_scan.field")}</div>
+                              <Form.Item
+                                noStyle
+                                name={[field.name, "field"]}
+                                rules={[
+                                  {
+                                    required: true,
+                                    message: t("general.validation.required", {
+                                      label: t("bodyshop.fields.md_parts_scan.field")
+                                    })
+                                  }
+                                ]}
+                              >
+                                <Select
+                                  options={fieldSelectOptions}
+                                  onChange={() => {
+                                    form.setFields([
+                                      { name: ["md_parts_scan", index, "operation"], value: "contains" },
+                                      { name: ["md_parts_scan", index, "value"], value: undefined }
+                                    ]);
+                                  }}
+                                  style={{
+                                    width: "100%"
+                                  }}
+                                  styles={{
+                                    selector: INLINE_TITLE_INPUT_STYLE
+                                  }}
+                                  size="small"
+                                />
+                              </Form.Item>
+                            </div>
+                            {fieldType === "string" && (
+                              <>
+                                <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                                <div style={INLINE_TITLE_SWITCH_GROUP_STYLE}>
+                                  <div style={INLINE_TITLE_LABEL_STYLE}>
+                                    {t("bodyshop.fields.md_parts_scan.caseInsensitive")}
+                                  </div>
+                                  <Form.Item noStyle name={[field.name, "caseInsensitive"]} valuePropName="checked">
+                                    <Switch />
+                                  </Form.Item>
+                                </div>
+                              </>
+                            )}
+                            <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                            <div style={INLINE_TITLE_SWITCH_GROUP_STYLE}>
+                              <div style={INLINE_TITLE_LABEL_STYLE}>
+                                {t("bodyshop.fields.md_parts_scan.mark_critical")}
+                              </div>
+                              <Form.Item noStyle name={[field.name, "mark_critical"]} valuePropName="checked">
+                                <Switch />
+                              </Form.Item>
+                            </div>
+                          </div>
+                        }
+                        wrapTitle
+                        extra={
+                          <Space align="center" size="small">
+                            <Button
+                              type="text"
+                              danger
+                              icon={<DeleteFilled />}
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                            <FormListMoveArrows
+                              move={move}
+                              index={index}
+                              total={fields.length}
+                              orientation="horizontal"
+                            />
+                          </Space>
+                        }
+                      >
+                        <Row gutter={[16, 16]} align="middle">
+                          {/* Operation */}
+                          {fieldType !== "predefined" && fieldType && (
+                            <Col span={6}>
+                              <Form.Item
+                                label={t("bodyshop.fields.md_parts_scan.operation")}
+                                name={[field.name, "operation"]}
+                                rules={[
+                                  {
+                                    required: true,
+                                    message: t("general.validation.required", {
+                                      label: t("bodyshop.fields.md_parts_scan.operation")
+                                    })
+                                  }
+                                ]}
+                              >
+                                <Select options={operationOptions[fieldType]} />
+                              </Form.Item>
+                            </Col>
+                          )}
 
-                      {/* Operation */}
-                      {fieldType !== "predefined" && fieldType && (
-                        <Col span={6}>
-                          <Form.Item
-                            label={t("bodyshop.fields.md_parts_scan.operation")}
-                            name={[field.name, "operation"]}
-                            rules={[
-                              {
-                                required: true,
-                                message: t("general.validation.required", {
-                                  label: t("bodyshop.fields.md_parts_scan.operation")
-                                })
-                              }
-                            ]}
-                          >
-                            <Select options={operationOptions[fieldType]} />
-                          </Form.Item>
-                        </Col>
-                      )}
+                          {/* Value */}
+                          {fieldType && (
+                            <Col span={6}>
+                              <Form.Item
+                                label={t("bodyshop.fields.md_parts_scan.value")}
+                                name={[field.name, "value"]}
+                                rules={[
+                                  {
+                                    required: true,
+                                    message: t("general.validation.required", {
+                                      label: t("bodyshop.fields.md_parts_scan.value")
+                                    })
+                                  }
+                                ]}
+                              >
+                                {fieldType === "predefined" ? (
+                                  <Select
+                                    options={
+                                      selectedField === "part_type"
+                                        ? predefinedPartTypes.map((type) => ({
+                                            label: type,
+                                            value: type
+                                          }))
+                                        : predefinedModLbrTypes.map((type) => ({
+                                            label: type,
+                                            value: type
+                                          }))
+                                    }
+                                  />
+                                ) : (
+                                  <Input />
+                                )}
+                              </Form.Item>
+                            </Col>
+                          )}
 
-                      {/* Value */}
-                      {fieldType && (
-                        <Col span={6}>
-                          <Form.Item
-                            label={t("bodyshop.fields.md_parts_scan.value")}
-                            name={[field.name, "value"]}
-                            rules={[
-                              {
-                                required: true,
-                                message: t("general.validation.required", {
-                                  label: t("bodyshop.fields.md_parts_scan.value")
-                                })
-                              }
-                            ]}
-                          >
-                            {fieldType === "predefined" ? (
+                          {/* Update Field */}
+                          <Col span={4}>
+                            <Form.Item
+                              label={t("bodyshop.fields.md_parts_scan.update_field")}
+                              name={[field.name, "update_field"]}
+                            >
                               <Select
-                                options={
-                                  selectedField === "part_type"
-                                    ? predefinedPartTypes.map((type) => ({
-                                        label: type,
-                                        value: type
-                                      }))
-                                    : predefinedModLbrTypes.map((type) => ({
-                                        label: type,
-                                        value: type
-                                      }))
+                                options={fieldSelectOptions}
+                                allowClear
+                                onClear={() =>
+                                  form.setFields([{ name: ["md_parts_scan", index, "update_field"], value: null }])
                                 }
                               />
-                            ) : (
+                            </Form.Item>
+                          </Col>
+
+                          {/* Update Field */}
+                          <Col span={4}>
+                            <Form.Item
+                              label={t("bodyshop.fields.md_parts_scan.update_value")}
+                              name={[field.name, "update_value"]}
+                              dependencies={[["md_parts_scan", index, "update_field"]]}
+                              tooltip={t("bodyshop.tooltips.md_parts_scan.update_value_tooltip")}
+                              rules={[
+                                {
+                                  required: form.getFieldValue(["md_parts_scan", index, "update_field"]),
+                                  message: t("general.validation.required", {
+                                    label: t("bodyshop.fields.md_parts_scan.update_value")
+                                  })
+                                }
+                              ]}
+                            >
                               <Input />
-                            )}
-                          </Form.Item>
-                        </Col>
-                      )}
-
-                      {/* Case Sensitivity */}
-                      {fieldType === "string" && (
-                        <Col span={4}>
-                          <Form.Item
-                            label={t("bodyshop.fields.md_parts_scan.caseInsensitive")}
-                            name={[field.name, "caseInsensitive"]}
-                            valuePropName="checked"
-                            labelCol={{ span: 14 }}
-                            wrapperCol={{ span: 10 }}
-                          >
-                            <Switch />
-                          </Form.Item>
-                        </Col>
-                      )}
-
-                      {/* Mark Line as Critical */}
-                      <Col span={4}>
-                        <Form.Item
-                          label={t("bodyshop.fields.md_parts_scan.mark_critical")}
-                          name={[field.name, "mark_critical"]}
-                          valuePropName="checked"
-                          labelCol={{ span: 14 }}
-                          wrapperCol={{ span: 10 }}
-                        >
-                          <Switch />
-                        </Form.Item>
-                      </Col>
-
-                      {/* Update Field */}
-                      <Col span={4}>
-                        <Form.Item
-                          label={t("bodyshop.fields.md_parts_scan.update_field")}
-                          name={[field.name, "update_field"]}
-                        >
-                          <Select
-                            options={fieldSelectOptions}
-                            allowClear
-                            onClear={() =>
-                              form.setFields([{ name: ["md_parts_scan", index, "update_field"], value: null }])
-                            }
-                          />
-                        </Form.Item>
-                      </Col>
-
-                      {/* Update Field */}
-                      <Col span={4}>
-                        <Form.Item
-                          label={t("bodyshop.fields.md_parts_scan.update_value")}
-                          name={[field.name, "update_value"]}
-                          dependencies={[["md_parts_scan", index, "update_field"]]}
-                          tooltip={t("bodyshop.tooltips.md_parts_scan.update_value_tooltip")}
-                          rules={[
-                            {
-                              required: form.getFieldValue(["md_parts_scan", index, "update_field"]),
-                              message: t("general.validation.required", {
-                                label: t("bodyshop.fields.md_parts_scan.update_value")
-                              })
-                            }
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                      </Col>
-
-                      {/* Actions */}
-                      <Col span={2}>
-                        <Space>
-                          <DeleteFilled onClick={() => remove(field.name)} />
-                          <FormListMoveArrows move={move} index={index} total={fields.length} />
-                        </Space>
-                      </Col>
-                    </Row>
-                  </Form.Item>
-                );
-              })}
-
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  onClick={() =>
-                    add({
-                      field: "line_desc",
-                      operation: "contains",
-                      mark_critical: true,
-                      caseInsensitive: true
-                    })
-                  }
-                  style={{ width: "100%" }}
-                >
-                  {t("bodyshop.actions.addpartsrule")}
-                </Button>
-              </Form.Item>
+                            </Form.Item>
+                          </Col>
+                        </Row>
+                      </InlineValidatedFormRow>
+                    </Form.Item>
+                  );
+                })
+              )}
             </div>
-          )}
-        </Form.List>
-      </LayoutFormRow>
+          </LayoutFormRow>
+        )}
+      </Form.List>
     </div>
   );
 }

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

@@ -27,7 +27,7 @@ export function ShopInfoRbacComponent({ bodyshop }) {
   });
   return (
     <RbacWrapper action="shop:rbac">
-      <LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.rbac_options")}>
         {[
           ...(HasFeatureAccess({ featureName: "export", bodyshop })
             ? [

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

@@ -1,4 +1,4 @@
-import { Collapse, Divider, Form, Input, InputNumber, Space, Switch } from "antd";
+import { Col, Collapse, Form, Input, InputNumber, Row, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -6,6 +6,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
+import "./shop-info.responsibilitycenters.taxes.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -16,53 +17,102 @@ const mapDispatchToProps = () => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoResponsibilityCenters);
 
+const taxRootColProps = {
+  xs: 24,
+  sm: 12,
+  md: 8,
+  lg: { flex: "0 0 280px" },
+  xl: { flex: "0 0 240px" },
+  xxl: { flex: "0 0 300px" }
+};
+
+const taxTierFieldColProps = {
+  xs: 24,
+  sm: 12,
+  lg: 6
+};
+
 export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
   const { t } = useTranslation();
-  //Iteratively build the form items.
-  const formItems = [];
-  for (let tyCounter = 1; tyCounter <= 5; tyCounter++) {
-    const section = [];
+  const profileTaxCards = [];
+  for (let typeNum = 1; typeNum <= 5; typeNum++) {
+    const rootTaxItems = getRootTaxFormItems({ typeNum, bodyshop, t });
 
-    section.push(
-      TaxFormItems({
-        typeNum: tyCounter,
-        rootElements: true,
-        bodyshop
-      })
+    profileTaxCards.push(
+      <LayoutFormRow key={`profile-tax-type-${typeNum}`} header={t("bodyshop.labels.responsibilitycenters.tax_type_card", { typeNum })}>
+        <div style={{ display: "grid", rowGap: 12 }}>
+          <Row gutter={[16, 16]} wrap>
+            {rootTaxItems.map((item, index) => (
+              <Col key={item.key ?? `tax-root-${typeNum}-${index}`} {...taxRootColProps}>
+                {item}
+              </Col>
+            ))}
+          </Row>
+          <Row gutter={[12, 12]} wrap className="responsibility-centers-tax-tier-grid">
+            {Array.from({ length: 5 }, (_, index) => {
+              const typeNumIterator = index + 1;
+              const tierTaxItems = getTierTaxFormItems({
+                typeNum,
+                typeNumIterator,
+                t
+              });
+
+              return (
+                <Col
+                  key={`tax-tier-row-${typeNum}-${typeNumIterator}`}
+                  xs={24}
+                  className="responsibility-centers-tax-tier-grid__col"
+                >
+                  <LayoutFormRow
+                    header={t("bodyshop.labels.responsibilitycenters.tax_tier_card", { typeNumIterator })}
+                    style={{ marginBottom: 0 }}
+                    styles={{
+                      header: {
+                        paddingInline: 12
+                      },
+                      body: {
+                        padding: 12
+                      }
+                    }}
+                  >
+                    <Row gutter={[12, 8]} wrap>
+                      {tierTaxItems.map((item, tierIndex) => (
+                        <Col key={item.key ?? `tax-tier-${typeNum}-${typeNumIterator}-${tierIndex}`} {...taxTierFieldColProps}>
+                          {item}
+                        </Col>
+                      ))}
+                    </Row>
+                  </LayoutFormRow>
+                </Col>
+              );
+            })}
+          </Row>
+        </div>
+      </LayoutFormRow>
     );
-    for (let iterator = 1; iterator <= 5; iterator++) {
-      section.push(
-        TaxFormItems({
-          typeNum: tyCounter,
-          typeNumIterator: iterator,
-          rootElements: false
-        })
-      );
-    }
-    formItems.push(<Space wrap>{section}</Space>);
-    formItems.push(<Divider />);
   }
+
   return (
     <>
-      <Divider titlePlacement="left" orientation="horizontal" style={{ marginTop: ".8rem" }}>
-        {t("jobs.labels.cieca_pft")}
-      </Divider>
-      {formItems}
+      <LayoutFormRow header={t("jobs.labels.cieca_pft")}>
+        <div>{profileTaxCards}</div>
+      </LayoutFormRow>
 
-      <Collapse
-        items={[
-          {
-            key: "cieca_pfl",
-            label: t("jobs.labels.cieca_pfl"),
-            forceRender: true,
-            children: (
-              <>
+      <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.default_tax_setup")}>
+        <Collapse
+          items={[
+            {
+              key: "cieca_pfl",
+              label: t("jobs.labels.cieca_pfl"),
+              forceRender: true,
+              children: (
+                <>
                 <LayoutFormRow header={t("joblines.fields.lbr_types.LAB")}>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAB", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -89,7 +139,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -135,7 +185,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAD", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -162,7 +212,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -208,7 +258,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAE", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -235,7 +285,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -281,7 +331,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAF", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -308,7 +358,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -354,7 +404,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAG", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -381,7 +431,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -427,7 +477,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAM", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -454,7 +504,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -500,7 +550,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAR", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -527,7 +577,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -573,7 +623,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.cieca_pfl.lbr_adjp")}
                     name={["md_responsibility_centers", "cieca_pfl", "LAS", "lbr_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfl.lbr_tax_in")}
@@ -673,7 +723,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={2} />
+                          <InputNumber min={0} max={100} precision={2} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -740,7 +790,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.materials.mat_adjp")}
                     name={["md_responsibility_centers", "cieca_pfm", "MAPA", "mat_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.materials.tax_ind")}
@@ -767,7 +817,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -825,7 +875,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     label={t("jobs.fields.materials.mat_adjp")}
                     name={["md_responsibility_centers", "cieca_pfm", "MASH", "mat_adjp"]}
                   >
-                    <InputNumber min={-100} max={100} precision={4} />
+                    <InputNumber min={-100} max={100} precision={4} suffix="%" />
                   </Form.Item>
                   <Form.Item
                     label={t("jobs.fields.materials.tax_ind")}
@@ -852,7 +902,7 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                             }
                           ]}
                         >
-                          <InputNumber min={0} max={100} precision={4} />
+                          <InputNumber min={0} max={100} precision={4} suffix="%" />
                         </Form.Item>
                       );
                     }}
@@ -893,15 +943,15 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     <Switch />
                   </Form.Item>
                 </LayoutFormRow>
-              </>
-            )
-          },
-          {
-            key: "cieca_pfo",
-            label: t("jobs.labels.cieca_pfo"),
-            forceRender: true,
-            children: (
-              <>
+                </>
+              )
+            },
+            {
+              key: "cieca_pfo",
+              label: t("jobs.labels.cieca_pfo"),
+              forceRender: true,
+              children: (
+                <>
                 <LayoutFormRow noDivider>
                   <Form.Item
                     label={t("jobs.fields.cieca_pfo.tow_t_in1")}
@@ -2145,76 +2195,74 @@ export function ShopInfoResponsibilityCenters({ bodyshop, form }) {
                     <InputNumber min={0} max={100} precision={4} />
                   </Form.Item>
                 </LayoutFormRow>
-              </>
-            )
-          }
-        ]}
-      />
+                </>
+              )
+            }
+          ]}
+        />
+      </LayoutFormRow>
     </>
   );
 }
 
-function TaxFormItems({ typeNum, typeNumIterator, rootElements, bodyshop }) {
-  const { t } = useTranslation();
-
-  if (rootElements)
-    return (
-      <>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_tax_type", {
-            typeNum,
-            typeNumIterator
-          })}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `tax_type${typeNum}`]}
-        >
-          <Input />
-        </Form.Item>
-
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenters.state_tax")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, "name"]}
-        >
-          <Input />
-        </Form.Item>
-
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, "accountdesc"]}
-        >
-          <Input />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_accountitem")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, "accountitem"]}
-        >
-          <Input />
-        </Form.Item>
-        {bodyshopHasDmsKey(bodyshop) && (
+function getRootTaxFormItems({ typeNum, bodyshop, t }) {
+  return [
+    <Form.Item
+      key={`tax_type_${typeNum}_type`}
+      label={t("bodyshop.fields.responsibilitycenter_tax_type", { typeNum })}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `tax_type${typeNum}`]}
+    >
+      <Input />
+    </Form.Item>,
+    <Form.Item
+      key={`tax_type_${typeNum}_name`}
+      label={t("bodyshop.fields.responsibilitycenters.state_tax")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, "name"]}
+    >
+      <Input />
+    </Form.Item>,
+    <Form.Item
+      key={`tax_type_${typeNum}_accountdesc`}
+      label={t("bodyshop.fields.responsibilitycenter_accountdesc")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, "accountdesc"]}
+    >
+      <Input />
+    </Form.Item>,
+    <Form.Item
+      key={`tax_type_${typeNum}_accountitem`}
+      label={t("bodyshop.fields.responsibilitycenter_accountitem")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, "accountitem"]}
+    >
+      <Input />
+    </Form.Item>,
+    ...(bodyshopHasDmsKey(bodyshop)
+      ? [
           <Form.Item
+            key={`tax_type_${typeNum}_dms_acctnumber`}
             label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
@@ -2226,71 +2274,64 @@ function TaxFormItems({ typeNum, typeNumIterator, rootElements, bodyshop }) {
           >
             <Input />
           </Form.Item>
-        )}
-      </>
-    );
-  return (
-    <>
-      <Form.Item
-        label={t("bodyshop.fields.responsibilitycenter_tax_tier", {
-          typeNum,
-          typeNumIterator
-        })}
-        rules={[
-          {
-            required: true
-            //message: t("general.validation.required"),
-          }
-        ]}
-        name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_tier${typeNumIterator}`]}
-      >
-        <InputNumber precision={0} min={0} />
-      </Form.Item>
-      <Form.Item
-        label={t("bodyshop.fields.responsibilitycenter_tax_thres", {
-          typeNum,
-          typeNumIterator
-        })}
-        rules={[
-          {
-            required: true
-            //message: t("general.validation.required"),
-          }
-        ]}
-        name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_thres${typeNumIterator}`]}
-      >
-        <InputNumber min={0} precision={2} />
-      </Form.Item>
-      <Form.Item
-        label={t("bodyshop.fields.responsibilitycenter_tax_rate", {
-          typeNum,
-          typeNumIterator
-        })}
-        rules={[
-          {
-            required: true
-            //message: t("general.validation.required"),
-          }
-        ]}
-        name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_rate${typeNumIterator}`]}
-      >
-        <InputNumber min={0} precision={2} />
-      </Form.Item>
-      <Form.Item
-        label={t("bodyshop.fields.responsibilitycenter_tax_sur", {
-          typeNum,
-          typeNumIterator
-        })}
-        rules={[
-          {
-            required: true
-            //message: t("general.validation.required"),
-          }
-        ]}
-        name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_sur${typeNumIterator}`]}
-      >
-        <InputNumber min={0} precision={2} />
-      </Form.Item>
-    </>
-  );
+        ]
+      : [])
+  ];
+}
+
+function getTierTaxFormItems({ typeNum, typeNumIterator, t }) {
+  return [
+    <Form.Item
+      key={`tax_type_${typeNum}_tier_${typeNumIterator}`}
+      label={t("bodyshop.labels.responsibilitycenters.tax_tier_short")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_tier${typeNumIterator}`]}
+    >
+      <InputNumber precision={0} min={0} />
+    </Form.Item>,
+    <Form.Item
+      key={`tax_type_${typeNum}_threshold_${typeNumIterator}`}
+      label={t("bodyshop.labels.responsibilitycenters.tax_threshold_short")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_thres${typeNumIterator}`]}
+    >
+      <InputNumber min={0} precision={2} />
+    </Form.Item>,
+    <Form.Item
+      key={`tax_type_${typeNum}_rate_${typeNumIterator}`}
+      label={t("bodyshop.labels.responsibilitycenters.tax_rate_short")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_rate${typeNumIterator}`]}
+    >
+      <InputNumber min={0} precision={2} suffix="%" />
+    </Form.Item>,
+    <Form.Item
+      key={`tax_type_${typeNum}_surcharge_${typeNumIterator}`}
+      label={t("bodyshop.labels.responsibilitycenters.tax_surcharge_short")}
+      rules={[
+        {
+          required: true
+          //message: t("general.validation.required"),
+        }
+      ]}
+      name={["md_responsibility_centers", "taxes", `tax_ty${typeNum}`, `ty${typeNum}_sur${typeNumIterator}`]}
+    >
+      <InputNumber min={0} precision={2} suffix="%" />
+    </Form.Item>
+  ];
 }

client/src/components/shop-info/shop-info.responsibilitycenters.taxes.styles.scss

@@ -0,0 +1,25 @@
+.responsibility-centers-tax-tier-grid__col.ant-col {
+  flex: 0 0 100%;
+  max-width: 100%;
+}
+
+@media (min-width: 992px) {
+  .responsibility-centers-tax-tier-grid__col.ant-col {
+    flex: 0 0 50%;
+    max-width: 50%;
+  }
+}
+
+@media (min-width: 1600px) {
+  .responsibility-centers-tax-tier-grid__col.ant-col {
+    flex: 0 0 25%;
+    max-width: 25%;
+  }
+}
+
+@media (min-width: 2400px) {
+  .responsibility-centers-tax-tier-grid__col.ant-col {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+}

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

@@ -21,7 +21,7 @@ export default function ShopInfoRoGuard({ form }) {
         {() => {
           const disabled = !form.getFieldValue(["md_ro_guard", "enabled"]);
           return (
-            <LayoutFormRow noDivider>
+            <LayoutFormRow header={t("bodyshop.labels.md_ro_guard_options")}>
               <Form.Item
                 label={t("bodyshop.fields.md_ro_guard.totalgppercent_minimum")}
                 name={["md_ro_guard", "totalgppercent_minimum"]}
@@ -32,7 +32,7 @@ export default function ShopInfoRoGuard({ form }) {
                   }
                 ]}
               >
-                <InputNumber min={0} max={100} precision={1} disabled={disabled} />
+                <InputNumber min={0} max={100} precision={1} suffix="%" disabled={disabled} />
               </Form.Item>
 
               <Form.Item

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

@@ -1,10 +1,17 @@
-import { DeleteFilled } from "@ant-design/icons";
+import { CloseOutlined, DeleteFilled, HolderOutlined } from "@ant-design/icons";
+import { closestCenter, DndContext, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
+import { arrayMove, rectSortingStrategy, SortableContext, useSortable } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
 import { Button, Form, Select, Space } from "antd";
-import { useState } from "react";
 import { ChromePicker } from "react-color";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { DEFAULT_TRANSLUCENT_CARD_COLOR, getTintedCardSurfaceStyles } from "./shop-info.color.utils";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,10 +31,341 @@ const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
     width: 200px;
   }
+
+  .production-status-color-title-select {
+    min-width: 160px;
+    width: 100%;
+  }
+
+  .production-status-color-title-select .ant-select-selector {
+    background: transparent !important;
+    border: none !important;
+    box-shadow: none !important;
+    padding-inline: 0 !important;
+  }
+
+  .production-status-color-title-select .ant-select-selection-item,
+  .production-status-color-title-select .ant-select-selection-placeholder {
+    font-weight: 500;
+  }
+
+  .job-statuses-source-select .ant-select-selector {
+    align-items: flex-start !important;
+  }
+
+  .job-statuses-source-select .ant-select-selection-wrap {
+    gap: 4px 0;
+  }
+
+  .job-statuses-source-tag-wrapper {
+    display: inline-flex;
+    max-width: 100%;
+    margin-inline-end: 6px;
+    touch-action: none;
+  }
+
+  .job-statuses-source-tag-wrapper .ant-select-selection-item {
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    min-height: 30px;
+    min-width: 132px;
+    max-width: 100%;
+    padding-inline: 10px;
+    border-radius: 999px;
+    border: 1px solid var(--ant-color-border);
+    background: var(--ant-color-fill-quaternary);
+    justify-content: space-between;
+    max-width: 100%;
+    cursor: grab;
+    margin-inline-end: 0;
+    user-select: none;
+  }
+
+  .job-statuses-source-tag-wrapper .job-statuses-source-tag-handle {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    color: var(--ant-color-text-tertiary);
+    flex: none;
+    font-size: 12px;
+  }
+
+  .job-statuses-source-tag-wrapper .ant-select-selection-item-content {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .job-statuses-source-tag-wrapper .ant-select-selection-item:active {
+    cursor: grabbing;
+  }
+
+  .job-statuses-source-tag-wrapper .ant-select-selection-item-remove {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    flex: none;
+    width: 18px;
+    height: 18px;
+    border-radius: 999px;
+    color: var(--ant-color-text-tertiary);
+    transition:
+      background 0.2s ease,
+      color 0.2s ease;
+  }
+
+  .job-statuses-source-tag-wrapper .ant-select-selection-item-remove:hover {
+    background: var(--ant-color-fill-secondary);
+    color: var(--ant-color-text);
+  }
+
+  .job-statuses-source-tag-wrapper--dragging {
+    opacity: 0.55;
+  }
 `;
 
+const normalizeStatuses = (statuses) => [...new Set((statuses || []).map((item) => item?.trim()).filter(Boolean))];
+
+const getTranslatedDragRect = (active, delta) => {
+  const rect = active?.rect?.current?.initial || active?.rect?.current?.translated;
+
+  if (!rect) return null;
+
+  const x = delta?.x || 0;
+  const y = delta?.y || 0;
+
+  return {
+    left: rect.left + x,
+    right: rect.right + x,
+    top: rect.top + y,
+    bottom: rect.bottom + y,
+    width: rect.width,
+    height: rect.height
+  };
+};
+
+const isPointWithinRect = (point, rect) => {
+  if (!point || !rect) return false;
+
+  return point.x >= rect.left && point.x <= rect.right && point.y >= rect.top && point.y <= rect.bottom;
+};
+
+const DraggableStatusTag = ({ label, value, closable, onClose }) => {
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
+    id: value
+  });
+  const labelText = String(label ?? value);
+
+  return (
+    <span
+      ref={setNodeRef}
+      className={`job-statuses-source-tag-wrapper ${isDragging ? "job-statuses-source-tag-wrapper--dragging" : ""}`}
+      data-status-tag-value={value}
+      style={{ transform: CSS.Transform.toString(transform), transition }}
+      onMouseDown={(event) => {
+        event.stopPropagation();
+      }}
+      onClick={(event) => {
+        event.stopPropagation();
+      }}
+      {...attributes}
+      {...listeners}
+    >
+      <span
+        className="ant-select-selection-item"
+        onMouseDown={(event) => {
+          if (event.target.closest(".ant-select-selection-item-remove")) {
+            event.stopPropagation();
+            return;
+          }
+
+          event.preventDefault();
+          event.stopPropagation();
+        }}
+        onClick={(event) => {
+          if (event.target.closest(".ant-select-selection-item-remove")) {
+            event.stopPropagation();
+            return;
+          }
+
+          event.stopPropagation();
+        }}
+        title={labelText}
+      >
+        <span className="job-statuses-source-tag-handle" aria-hidden>
+          <HolderOutlined />
+        </span>
+        <span className="ant-select-selection-item-content">{labelText}</span>
+        {closable ? (
+          <span
+            className="ant-select-selection-item-remove"
+            onClick={(event) => {
+              event.stopPropagation();
+              onClose?.(event);
+            }}
+            onMouseDown={(event) => {
+              event.stopPropagation();
+            }}
+          >
+            <CloseOutlined />
+          </span>
+        ) : null}
+      </span>
+    </span>
+  );
+};
+
+const SortableStatusesSelect = ({ value, onChange, mode = "tags", options = [] }) => {
+  const statuses = normalizeStatuses(value);
+  const isTagsMode = mode === "tags";
+  const [knownStatuses, setKnownStatuses] = useState(statuses);
+  const selectWrapperRef = useRef(null);
+  const dragRectRef = useRef(null);
+  const tagSensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        distance: 6
+      }
+    })
+  );
+
+  const handleStatusesChange = (nextValues) => {
+    const normalizedNextValues = normalizeStatuses(nextValues);
+    if (isTagsMode) {
+      setKnownStatuses((currentKnownStatuses) => normalizeStatuses([...currentKnownStatuses, ...normalizedNextValues]));
+    }
+    onChange?.(normalizedNextValues);
+  };
+
+  useEffect(() => {
+    if (isTagsMode) {
+      setKnownStatuses((currentKnownStatuses) => normalizeStatuses([...currentKnownStatuses, ...statuses]));
+    }
+  }, [isTagsMode, statuses]);
+
+  const shouldMoveStatusToEnd = (activeId, dragRect) => {
+    const selectRect =
+      selectWrapperRef.current?.querySelector?.(".ant-select-selector")?.getBoundingClientRect?.() ||
+      selectWrapperRef.current?.getBoundingClientRect?.();
+    if (!dragRect || !selectRect) return false;
+
+    const dragLeadingPoint = {
+      x: dragRect.left,
+      y: dragRect.top
+    };
+    const dragTrailingPoint = {
+      x: dragRect.right,
+      y: dragRect.bottom
+    };
+
+    if (!isPointWithinRect(dragLeadingPoint, selectRect) && !isPointWithinRect(dragTrailingPoint, selectRect)) {
+      return false;
+    }
+
+    const trailingStatus = statuses.filter((status) => status !== activeId).at(-1);
+    if (!trailingStatus) return false;
+
+    const trailingTagNode = selectWrapperRef.current?.querySelector?.(
+      `.job-statuses-source-tag-wrapper[data-status-tag-value="${CSS.escape(String(trailingStatus))}"]`
+    );
+    const trailingTagRect = trailingTagNode?.getBoundingClientRect?.();
+
+    if (!trailingTagRect) return false;
+
+    const isOnTrailingRow = dragRect.bottom >= trailingTagRect.top && dragRect.top <= trailingTagRect.bottom;
+    if (isOnTrailingRow) {
+      return dragRect.left >= trailingTagRect.right - 4;
+    }
+
+    return dragRect.top >= trailingTagRect.bottom - 4;
+  };
+
+  const handleStatusSortEnd = ({ active, over, delta }) => {
+    const oldIndex = statuses.indexOf(active.id);
+    const dragRect = dragRectRef.current || getTranslatedDragRect(active, delta);
+    dragRectRef.current = null;
+
+    if (oldIndex < 0) return;
+
+    if (!over) {
+      if (oldIndex !== statuses.length - 1 && shouldMoveStatusToEnd(active.id, dragRect)) {
+        onChange?.(arrayMove(statuses, oldIndex, statuses.length - 1));
+      }
+      return;
+    }
+
+    if (active.id === over.id) return;
+
+    const newIndex = statuses.indexOf(over.id);
+
+    if (newIndex < 0) return;
+
+    onChange?.(arrayMove(statuses, oldIndex, newIndex));
+  };
+
+  const renderStatusTag = ({ label, value: tagValue, closable, onClose }) => {
+    return <DraggableStatusTag closable={closable} label={label} onClose={onClose} value={tagValue} />;
+  };
+
+  const statusSelectOptions = isTagsMode
+    ? knownStatuses.map((status) => ({
+        value: status,
+        label: status
+      }))
+    : options;
+
+  if (statuses.length === 0) {
+    return (
+      <Select
+        className="job-statuses-source-select"
+        mode={mode}
+        onChange={handleStatusesChange}
+        options={statusSelectOptions}
+        value={statuses}
+      />
+    );
+  }
+
+  return (
+    <div ref={selectWrapperRef}>
+      <DndContext
+        collisionDetection={closestCenter}
+        onDragCancel={() => {
+          dragRectRef.current = null;
+        }}
+        onDragEnd={handleStatusSortEnd}
+        onDragMove={({ active, delta }) => {
+          dragRectRef.current = getTranslatedDragRect(active, delta);
+        }}
+        sensors={tagSensors}
+      >
+        <SortableContext items={statuses} strategy={rectSortingStrategy}>
+          <Select
+            className="job-statuses-source-select"
+            mode={mode}
+            onChange={handleStatusesChange}
+            options={statusSelectOptions}
+            tagRender={renderStatusTag}
+            value={statuses}
+          />
+        </SortableContext>
+      </DndContext>
+    </div>
+  );
+};
+
 export function ShopInfoROStatusComponent({ bodyshop, form }) {
   const { t } = useTranslation();
+  const allStatuses = normalizeStatuses(Form.useWatch(["md_ro_statuses", "statuses"], form));
+  const productionStatuses = Form.useWatch(["md_ro_statuses", "production_statuses"], form) || [];
+  const additionalBoardStatuses = Form.useWatch(["md_ro_statuses", "additional_board_statuses"], form) || [];
+  const productionColors = Form.useWatch(["md_ro_statuses", "production_colors"], form) || [];
+  const statusOptions = allStatuses;
+  const statusSelectOptions = statusOptions.map((item) => ({ value: item, label: item }));
+  const availableProductionStatuses = [...new Set([...productionStatuses, ...additionalBoardStatuses].filter(Boolean))];
 
   const {
     treatments: { Production_List_Status_Colors }
@@ -37,117 +375,119 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
     splitKey: bodyshop.imexshopid
   });
 
-  const [options, setOptions] = useState(form.getFieldValue(["md_ro_statuses", "statuses"]) || []);
-
-  const [productionStatus, setProductionStatus] = useState(
-    (form.getFieldValue(["md_ro_statuses", "production_statuses"]) || []).concat(
-      form.getFieldValue(["md_ro_statuses", "additional_board_statuses"]) || []
-    ) || []
-  );
-
-  const handleBlur = () => {
-    setOptions(form.getFieldValue(["md_ro_statuses", "statuses"]));
-    setProductionStatus(
-      form
-        .getFieldValue(["md_ro_statuses", "production_statuses"])
-        .concat(form.getFieldValue(["md_ro_statuses", "additional_board_statuses"]))
-    );
-  };
-
   return (
     <SelectorDiv id="jobstatus">
-      <Form.Item
-        name={["md_ro_statuses", "statuses"]}
-        label={t("bodyshop.labels.alljobstatuses")}
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="tags" onBlur={handleBlur} />
-      </Form.Item>
-      <Form.Item
-        name={["md_ro_statuses", "active_statuses"]}
-        label={t("bodyshop.fields.statuses.active_statuses")}
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
-      </Form.Item>
-      <Form.Item
-        name={["md_ro_statuses", "pre_production_statuses"]}
-        label={t("bodyshop.fields.statuses.pre_production_statuses")}
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
-      </Form.Item>
-      <Form.Item
-        name={["md_ro_statuses", "production_statuses"]}
-        label={t("bodyshop.fields.statuses.production_statuses")}
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
-      </Form.Item>
-      <Form.Item
-        name={["md_ro_statuses", "post_production_statuses"]}
-        label={t("bodyshop.fields.statuses.post_production_statuses")}
-        rules={[
-          {
-            required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
-      </Form.Item>
-      <Form.Item
-        name={["md_ro_statuses", "ready_statuses"]}
-        label={t("bodyshop.fields.statuses.ready_statuses")}
-        rules={[
-          {
-            //required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
-      </Form.Item>
-      <Form.Item
-        name={["md_ro_statuses", "additional_board_statuses"]}
-        label={t("bodyshop.fields.statuses.additional_board_statuses")}
-        rules={[
-          {
-            //required: true,
-            //message: t("general.validation.required"),
-            type: "array"
-          }
-        ]}
-      >
-        <Select mode="multiple" options={options.map((item) => ({ value: item, label: item }))} />
-      </Form.Item>
-      <LayoutFormRow noDivider>
+      <LayoutFormRow grow header={t("bodyshop.labels.job_status_options")}>
+        <div>
+          <Form.Item
+            name={["md_ro_statuses", "statuses"]}
+            label={t("bodyshop.labels.alljobstatuses")}
+            required
+            rules={[
+              {
+                validator: async (_, value) => {
+                  const populatedStatuses = normalizeStatuses(value);
+
+                  if (populatedStatuses.length === 0) {
+                    return Promise.reject(
+                      new Error(
+                        t("general.validation.required", {
+                          label: t("bodyshop.labels.alljobstatuses")
+                        })
+                      )
+                    );
+                  }
+
+                  if (populatedStatuses.length !== (value || []).filter(Boolean).length) {
+                    return Promise.reject(new Error(t("bodyshop.errors.duplicate_job_status")));
+                  }
+                }
+              }
+            ]}
+          >
+            <SortableStatusesSelect />
+          </Form.Item>
+          <Form.Item
+            name={["md_ro_statuses", "active_statuses"]}
+            label={t("bodyshop.fields.statuses.active_statuses")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <SortableStatusesSelect mode="multiple" options={statusSelectOptions} />
+          </Form.Item>
+          <Form.Item
+            name={["md_ro_statuses", "pre_production_statuses"]}
+            label={t("bodyshop.fields.statuses.pre_production_statuses")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <SortableStatusesSelect mode="multiple" options={statusSelectOptions} />
+          </Form.Item>
+          <Form.Item
+            name={["md_ro_statuses", "production_statuses"]}
+            label={t("bodyshop.fields.statuses.production_statuses")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <SortableStatusesSelect mode="multiple" options={statusSelectOptions} />
+          </Form.Item>
+          <Form.Item
+            name={["md_ro_statuses", "post_production_statuses"]}
+            label={t("bodyshop.fields.statuses.post_production_statuses")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <SortableStatusesSelect mode="multiple" options={statusSelectOptions} />
+          </Form.Item>
+          <Form.Item
+            name={["md_ro_statuses", "ready_statuses"]}
+            label={t("bodyshop.fields.statuses.ready_statuses")}
+            rules={[
+              {
+                //required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <SortableStatusesSelect mode="multiple" options={statusSelectOptions} />
+          </Form.Item>
+          <Form.Item
+            name={["md_ro_statuses", "additional_board_statuses"]}
+            label={t("bodyshop.fields.statuses.additional_board_statuses")}
+            rules={[
+              {
+                //required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <SortableStatusesSelect mode="multiple" options={statusSelectOptions} />
+          </Form.Item>
+        </div>
+      </LayoutFormRow>
+      <LayoutFormRow grow header={t("general.actions.defaults")}>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_scheduled")}
           rules={[
@@ -158,7 +498,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_scheduled"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_arrived")}
@@ -170,7 +510,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_arrived"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_exported")}
@@ -182,7 +522,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_exported"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_imported")}
@@ -194,7 +534,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_imported"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_invoiced")}
@@ -206,7 +546,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_invoiced"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_completed")}
@@ -218,7 +558,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_completed"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_delivered")}
@@ -230,7 +570,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_delivered"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.statuses.default_void")}
@@ -242,73 +582,122 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
           ]}
           name={["md_ro_statuses", "default_void"]}
         >
-          <Select options={options.map((item) => ({ value: item, label: item }))} />
+          <Select options={statusSelectOptions} />
         </Form.Item>
       </LayoutFormRow>
       {Production_List_Status_Colors.treatment === "on" && (
-        <LayoutFormRow grow header={t("bodyshop.fields.statuses.production_colors")} id="production_colors">
-          <Form.List name={["md_ro_statuses", "production_colors"]}>
-            {(fields, { add, remove }) => {
-              return (
+        <Form.List name={["md_ro_statuses", "production_colors"]}>
+          {(fields, { add, remove }) => {
+            return (
+              <LayoutFormRow
+                grow
+                header={t("bodyshop.fields.statuses.production_colors")}
+                id="production_colors"
+                actions={[
+                  <Button
+                    key="add-production-status-color"
+                    type="primary"
+                    block
+                    onClick={() => {
+                      add({
+                        color: { ...DEFAULT_TRANSLUCENT_CARD_COLOR }
+                      });
+                    }}
+                  >
+                    {t("bodyshop.actions.add_production_status_color")}
+                  </Button>
+                ]}
+              >
                 <div>
-                  <Space size="large" wrap>
-                    {fields.map((field, index) => (
-                      <Form.Item key={field.key}>
-                        <Space orientation="vertical">
-                          <div style={{ display: "flex" }}>
-                            <Form.Item
-                              style={{ flex: 1 }}
-                              label={t("jobs.fields.status")}
-                              key={`${index}status`}
-                              name={[field.name, "status"]}
-                              rules={[
-                                {
-                                  required: true
-                                  //message: t("general.validation.required"),
-                                }
-                              ]}
-                            >
-                              <Select options={productionStatus.map((item) => ({ value: item, label: item }))} />
-                            </Form.Item>
-                            <DeleteFilled
-                              onClick={() => {
-                                remove(field.name);
-                              }}
-                            />
-                          </div>
-                          <Form.Item
-                            label={t("bodyshop.fields.statuses.color")}
-                            key={`${index}color`}
-                            name={[field.name, "color"]}
-                            rules={[
-                              {
-                                required: true
-                                //message: t("general.validation.required"),
-                              }
-                            ]}
+                  {fields.length === 0 ? (
+                    <ConfigListEmptyState actionLabel={t("bodyshop.actions.add_production_status_color")} />
+                  ) : (
+                    <Space size="large" wrap align="start">
+                      {fields.map((field, index) => {
+                        const productionColor = productionColors[field.name] || {};
+                        const productionColorSurfaceStyles = getTintedCardSurfaceStyles(productionColor.color);
+                        const selectedProductionColorStatuses = productionColors
+                          .map((item) => item?.status)
+                          .filter(Boolean);
+                        const productionColorStatusOptions = [
+                          ...new Set([productionColor.status, ...availableProductionStatuses])
+                        ]
+                          .filter(Boolean)
+                          .filter(
+                            (status) =>
+                              status === productionColor.status || !selectedProductionColorStatuses.includes(status)
+                          );
+
+                        return (
+                          <InlineValidatedFormRow
+                            form={form}
+                            errorNames={[["md_ro_statuses", "production_colors", field.name, "status"]]}
+                            key={field.key}
+                            noDivider
+                            title={
+                              <Form.Item
+                                noStyle
+                                key={`${index}status`}
+                                name={[field.name, "status"]}
+                                rules={[
+                                  {
+                                    required: true
+                                    //message: t("general.validation.required"),
+                                  }
+                                ]}
+                              >
+                                <Select
+                                  className="production-status-color-title-select"
+                                  variant="borderless"
+                                  placeholder={getFormListItemTitle(
+                                    t("jobs.fields.status"),
+                                    index,
+                                    productionColor.status
+                                  )}
+                                  options={productionColorStatusOptions.map((item) => ({
+                                    value: item,
+                                    label: item
+                                  }))}
+                                />
+                              </Form.Item>
+                            }
+                            extra={
+                              <Button
+                                type="text"
+                                danger
+                                icon={<DeleteFilled />}
+                                onClick={() => {
+                                  remove(field.name);
+                                }}
+                              />
+                            }
+                            {...productionColorSurfaceStyles}
+                            style={{ width: 260, marginBottom: 0 }}
                           >
-                            <ColorPicker />
-                          </Form.Item>
-                        </Space>
-                      </Form.Item>
-                    ))}
-                  </Space>
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("general.actions.add")}
-                    </Button>
-                  </Form.Item>
+                            <div>
+                              <Form.Item
+                                key={`${index}color`}
+                                name={[field.name, "color"]}
+                                rules={[
+                                  {
+                                    required: true
+                                    //message: t("general.validation.required"),
+                                  }
+                                ]}
+                              >
+                                <ColorPicker />
+                              </Form.Item>
+                            </div>
+                          </InlineValidatedFormRow>
+                        );
+                      })}
+                    </Space>
+                  )}
                 </div>
-              );
-            }}
-          </Form.List>
-        </LayoutFormRow>
+              </LayoutFormRow>
+            );
+          }}
+        </Form.List>
       )}
     </SelectorDiv>
   );

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

@@ -1,5 +1,5 @@
-import { DeleteFilled } from "@ant-design/icons";
-import { Button, Divider, Form, Input, InputNumber, Select, Space, Switch, TimePicker } from "antd";
+import { DeleteFilled, ReloadOutlined } from "@ant-design/icons";
+import { Button, Col, Form, Input, InputNumber, Row, Select, Space, Switch, TimePicker, Tooltip } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -7,8 +7,16 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import ColorpickerFormItemComponent from "../form-items-formatted/colorpicker-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { ColorPicker } from "./shop-info.rostatus.component";
+import {
+  DEFAULT_TRANSLUCENT_CARD_COLOR,
+  DEFAULT_TRANSLUCENT_PICKER_COLOR,
+  getTintedCardSurfaceStyles
+} from "./shop-info.color.utils";
+import "./shop-info.scheduling.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -17,301 +25,514 @@ const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
+const WORKING_DAYS = [
+  { key: "sunday", labelKey: "general.labels.sunday" },
+  { key: "monday", labelKey: "general.labels.monday" },
+  { key: "tuesday", labelKey: "general.labels.tuesday" },
+  { key: "wednesday", labelKey: "general.labels.wednesday" },
+  { key: "thursday", labelKey: "general.labels.thursday" },
+  { key: "friday", labelKey: "general.labels.friday" },
+  { key: "saturday", labelKey: "general.labels.saturday" }
+];
+
+const APPOINTMENT_COLOR_PICKER_STYLES = {
+  default: {
+    wrap: {
+      display: "flex",
+      flexWrap: "wrap",
+      gap: "12px",
+      alignItems: "flex-start"
+    },
+    hue: {
+      flex: "1 1 180px",
+      height: "12px",
+      position: "relative",
+      marginTop: "20px"
+    },
+    swatches: {
+      flex: "1 1 160px"
+    }
+  }
+};
+
+const SCHEDULING_BUCKET_COLOR_PICKER_STYLES = {
+  default: {
+    picker: {
+      width: "100%",
+      height: "100%",
+      background: "color-mix(in srgb, var(--imex-form-surface) 92%, transparent)",
+      boxShadow: "none",
+      border: "1px solid color-mix(in srgb, var(--imex-form-surface-border) 72%, transparent)",
+      borderRadius: "8px",
+      boxSizing: "border-box",
+      overflow: "hidden"
+    },
+    saturation: {
+      width: "100%",
+      paddingBottom: "48%",
+      position: "relative",
+      borderRadius: "8px 8px 0 0",
+      overflow: "hidden"
+    },
+    body: {
+      padding: "12px"
+    },
+    controls: {
+      display: "flex",
+      gap: "10px"
+    },
+    color: {
+      width: "28px"
+    },
+    swatch: {
+      marginTop: "0",
+      width: "12px",
+      height: "12px",
+      borderRadius: "999px"
+    },
+    toggles: {
+      flex: "1"
+    },
+    hue: {
+      height: "10px",
+      position: "relative",
+      marginBottom: "8px"
+    },
+    alpha: {
+      height: "10px",
+      position: "relative"
+    }
+  }
+};
+
+const SECTION_TITLE_INPUT_STYLE = {
+  background: "color-mix(in srgb, var(--imex-form-surface) 78%, transparent)",
+  border: "1px solid color-mix(in srgb, var(--imex-form-surface-border) 72%, transparent)",
+  borderRadius: 6,
+  fontWeight: 500
+};
+
+const SECTION_TITLE_INPUT_ROW_STYLE = {
+  display: "flex",
+  gap: 8,
+  flexWrap: "wrap",
+  alignItems: "center",
+  minWidth: 180,
+  maxWidth: "100%"
+};
+
+const SECTION_TITLE_INPUT_GROUP_STYLE = {
+  display: "flex",
+  alignItems: "center",
+  gap: 6,
+  minWidth: 0
+};
+
+const SECTION_TITLE_INPUT_LABEL_STYLE = {
+  fontSize: 12,
+  lineHeight: 1.1,
+  opacity: 0.75,
+  whiteSpace: "nowrap"
+};
+
 export function ShopInfoSchedulingComponent({ form, bodyshop }) {
   const { t } = useTranslation();
+  const appointmentColors = Form.useWatch(["appt_colors"], form) || form.getFieldValue(["appt_colors"]) || [];
+  const schedulingBuckets = Form.useWatch(["ssbuckets"], form) || form.getFieldValue(["ssbuckets"]) || [];
 
   return (
     <div>
-      <LayoutFormRow id="shopinfo-scheduling">
-        <Form.Item
-          label={t("bodyshop.fields.appt_length")}
-          name={"appt_length"}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-        >
-          <InputNumber min={15} precision={0} />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.schedule_start_time")}
-          name={"schedule_start_time"}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          id="schedule_start_time"
-        >
-          <TimePicker disableSeconds={true} format="HH:mm" />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.schedule_end_time")}
-          name={"schedule_end_time"}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
-          id="schedule_end_time"
-        >
-          <TimePicker disableSeconds={true} format="HH:mm" />
-        </Form.Item>
-        <Form.Item
-          name={["appt_alt_transport"]}
-          label={t("bodyshop.fields.appt_alt_transport")}
-          rules={[
-            {
-              //message: t("general.validation.required"),
-              type: "array"
-            }
-          ]}
-        >
-          <Select mode="tags" />
-        </Form.Item>
-        <Form.Item
-          name={["ss_configuration", "dailyhrslimit"]}
-          label={t("bodyshop.fields.ss_configuration.dailyhrslimit")}
-        >
-          <InputNumber min={0} />
-        </Form.Item>
-        <Form.Item
-          name={["ss_configuration", "nobusinessdays"]}
-          label={t("bodyshop.fields.ss_configuration.nobusinessdays")}
-          valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
-        <Form.Item
-          name={["md_lost_sale_reasons"]}
-          label={t("bodyshop.fields.md_lost_sale_reasons")}
-          rules={[
-            {
-              // required: true,
-              //message: t("general.validation.required"),
-              type: "array"
-            }
-          ]}
-        >
-          <Select mode="tags" />
-        </Form.Item>
+      <LayoutFormRow grow header={t("bodyshop.labels.scheduling")} id="shopinfo-scheduling">
+        <>
+          <Form.Item
+            name={["appt_alt_transport"]}
+            label={t("bodyshop.fields.appt_alt_transport")}
+            rules={[
+              {
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>
+          <Form.Item
+            name={["md_lost_sale_reasons"]}
+            label={t("bodyshop.fields.md_lost_sale_reasons")}
+            rules={[
+              {
+                // required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>
+          <Row gutter={[16, 0]} wrap>
+            <Col xs={24} sm={12} xl={6}>
+              <Form.Item
+                label={t("bodyshop.fields.appt_length")}
+                name={"appt_length"}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <InputNumber min={15} precision={0} suffix="min" />
+              </Form.Item>
+            </Col>
+            <Col xs={24} sm={12} xl={6}>
+              <Form.Item
+                label={t("bodyshop.fields.schedule_start_time")}
+                name={"schedule_start_time"}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+                id="schedule_start_time"
+              >
+                <TimePicker disableSeconds={true} format="HH:mm" />
+              </Form.Item>
+            </Col>
+            <Col xs={24} sm={12} xl={6}>
+              <Form.Item
+                label={t("bodyshop.fields.schedule_end_time")}
+                name={"schedule_end_time"}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+                id="schedule_end_time"
+              >
+                <TimePicker disableSeconds={true} format="HH:mm" />
+              </Form.Item>
+            </Col>
+            <Col xs={24} sm={12} xl={6}>
+              <Form.Item
+                name={["ss_configuration", "dailyhrslimit"]}
+                label={t("bodyshop.fields.ss_configuration.dailyhrslimit")}
+              >
+                <InputNumber min={0} suffix="hrs" />
+              </Form.Item>
+            </Col>
+            <Col xs={24} sm={12} xl={6}>
+              <Form.Item
+                name={["ss_configuration", "nobusinessdays"]}
+                label={t("bodyshop.fields.ss_configuration.nobusinessdays")}
+                valuePropName="checked"
+              >
+                <Switch />
+              </Form.Item>
+            </Col>
+          </Row>
+        </>
       </LayoutFormRow>
-      <Divider titlePlacement="left">{t("bodyshop.labels.workingdays")}</Divider>
-      <Space wrap size="large" id="workingdays">
-        <Form.Item label={t("general.labels.sunday")} name={["workingdays", "sunday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("general.labels.monday")} name={["workingdays", "monday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("general.labels.tuesday")} name={["workingdays", "tuesday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("general.labels.wednesday")} name={["workingdays", "wednesday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("general.labels.thursday")} name={["workingdays", "thursday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("general.labels.friday")} name={["workingdays", "friday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("general.labels.saturday")} name={["workingdays", "saturday"]} valuePropName="checked">
-          <Switch />
-        </Form.Item>
-      </Space>
-      <LayoutFormRow header={t("bodyshop.labels.apptcolors")} id="apptcolors">
-        <Form.List name={["appt_colors"]}>
+      <LayoutFormRow header={t("bodyshop.labels.workingdays")} id="workingdays">
+        <Space wrap size="middle">
+          {WORKING_DAYS.map(({ key, labelKey }) => (
+            <Form.Item key={key} label={t(labelKey)} name={["workingdays", key]} valuePropName="checked">
+              <Switch />
+            </Form.Item>
+          ))}
+        </Space>
+      </LayoutFormRow>
+      <Form.List name={["appt_colors"]}>
+        {(fields, { add, remove, move }) => {
+          return (
+            <LayoutFormRow
+              header={t("bodyshop.labels.apptcolors")}
+              id="apptcolors"
+              actions={[
+                <Button
+                  key="add-appointment-color"
+                  type="primary"
+                  block
+                  onClick={() => {
+                    add({
+                      color: {
+                        ...DEFAULT_TRANSLUCENT_PICKER_COLOR,
+                        rgb: { ...DEFAULT_TRANSLUCENT_PICKER_COLOR.rgb }
+                      }
+                    });
+                  }}
+                >
+                  {t("bodyshop.actions.addapptcolor")}
+                </Button>
+              ]}
+            >
+              <div>
+                {fields.length === 0 ? (
+                  <ConfigListEmptyState actionLabel={t("bodyshop.actions.addapptcolor")} />
+                ) : (
+                  fields.map((field, index) => {
+                    const appointmentColor =
+                      appointmentColors[field.name] || form.getFieldValue(["appt_colors", field.name]) || {};
+                    const appointmentColorSurfaceStyles = getTintedCardSurfaceStyles(appointmentColor.color);
+
+                    return (
+                      <Form.Item noStyle key={field.key}>
+                        <InlineValidatedFormRow
+                          form={form}
+                          errorNames={[["appt_colors", field.name, "label"]]}
+                          noDivider
+                          title={
+                            <div style={{ minWidth: 180, maxWidth: "100%" }}>
+                              <Form.Item
+                                noStyle
+                                key={`${index}aptcolorlabel`}
+                                name={[field.name, "label"]}
+                                rules={[
+                                  {
+                                    required: true
+                                    //message: t("general.validation.required"),
+                                  }
+                                ]}
+                              >
+                                <Input
+                                  size="small"
+                                  placeholder={t("bodyshop.fields.appt_colors.label")}
+                                  style={SECTION_TITLE_INPUT_STYLE}
+                                />
+                              </Form.Item>
+                            </div>
+                          }
+                          extra={
+                            <Space align="center" size="small">
+                              <Button
+                                type="text"
+                                danger
+                                icon={<DeleteFilled />}
+                                onClick={() => {
+                                  remove(field.name);
+                                }}
+                              />
+                              <FormListMoveArrows
+                                move={move}
+                                index={index}
+                                total={fields.length}
+                                orientation="horizontal"
+                              />
+                            </Space>
+                          }
+                          {...appointmentColorSurfaceStyles}
+                        >
+                          <Form.Item
+                            key={`${index}aptcolorcolor`}
+                            name={[field.name, "color"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <ColorpickerFormItemComponent styles={APPOINTMENT_COLOR_PICKER_STYLES} />
+                          </Form.Item>
+                        </InlineValidatedFormRow>
+                      </Form.Item>
+                    );
+                  })
+                )}
+              </div>
+            </LayoutFormRow>
+          );
+        }}
+      </Form.List>
+      {HasFeatureAccess({ featureName: "smartscheduling", bodyshop }) && (
+        <Form.List name={["ssbuckets"]}>
           {(fields, { add, remove, move }) => {
             return (
-              <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item
-                        label={t("bodyshop.fields.appt_colors.label")}
-                        key={`${index}aptcolorlabel`}
-                        name={[field.name, "label"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("bodyshop.fields.appt_colors.color")}
-                        key={`${index}aptcolorcolor`}
-                        name={[field.name, "color"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <ColorpickerFormItemComponent />
-                      </Form.Item>
-                      <Space wrap>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
-                <Form.Item>
+              <LayoutFormRow
+                header={t("bodyshop.labels.ssbuckets")}
+                id="ssbuckets"
+                actions={[
                   <Button
-                    type="dashed"
+                    key="add-job-size-definition"
+                    type="primary"
+                    block
                     onClick={() => {
-                      add();
+                      add({
+                        color: { ...DEFAULT_TRANSLUCENT_CARD_COLOR }
+                      });
                     }}
-                    style={{ width: "100%" }}
                   >
-                    {t("bodyshop.actions.addapptcolor")}
+                    {t("bodyshop.actions.addbucket")}
                   </Button>
-                </Form.Item>
-              </div>
+                ]}
+              >
+                <div>
+                  {fields.length === 0 ? (
+                    <ConfigListEmptyState actionLabel={t("bodyshop.actions.addbucket")} />
+                  ) : (
+                    fields.map((field, index) => {
+                      const schedulingBucket =
+                        schedulingBuckets[field.name] || form.getFieldValue(["ssbuckets", field.name]) || {};
+                      const schedulingBucketSurfaceStyles = getTintedCardSurfaceStyles(schedulingBucket.color);
+
+                      return (
+                        <Form.Item noStyle key={field.key}>
+                          <InlineValidatedFormRow
+                            form={form}
+                            errorNames={[
+                              ["ssbuckets", field.name, "id"],
+                              ["ssbuckets", field.name, "label"]
+                            ]}
+                            noDivider
+                            title={
+                              <div style={SECTION_TITLE_INPUT_ROW_STYLE}>
+                                <div style={SECTION_TITLE_INPUT_GROUP_STYLE}>
+                                  <div style={SECTION_TITLE_INPUT_LABEL_STYLE}>{t("bodyshop.fields.ssbuckets.id")}</div>
+                                  <Form.Item
+                                    noStyle
+                                    key={`${index}id`}
+                                    name={[field.name, "id"]}
+                                    rules={[
+                                      {
+                                        required: true
+                                        //message: t("general.validation.required"),
+                                      }
+                                    ]}
+                                  >
+                                    <Input
+                                      size="small"
+                                      placeholder={t("bodyshop.fields.ssbuckets.id")}
+                                      style={{
+                                        ...SECTION_TITLE_INPUT_STYLE,
+                                        width: 72
+                                      }}
+                                    />
+                                  </Form.Item>
+                                </div>
+                                <div
+                                  style={{
+                                    ...SECTION_TITLE_INPUT_GROUP_STYLE,
+                                    flex: 1,
+                                    minWidth: 0
+                                  }}
+                                >
+                                  <div style={SECTION_TITLE_INPUT_LABEL_STYLE}>
+                                    {t("bodyshop.fields.ssbuckets.label")}
+                                  </div>
+                                  <Form.Item
+                                    noStyle
+                                    key={`${index}label`}
+                                    name={[field.name, "label"]}
+                                    rules={[
+                                      {
+                                        required: true
+                                        //message: t("general.validation.required"),
+                                      }
+                                    ]}
+                                  >
+                                    <Input
+                                      size="small"
+                                      placeholder={t("bodyshop.fields.ssbuckets.label")}
+                                      style={{
+                                        ...SECTION_TITLE_INPUT_STYLE,
+                                        width: "100%"
+                                      }}
+                                    />
+                                  </Form.Item>
+                                </div>
+                              </div>
+                            }
+                            extra={
+                              <Space align="center" size="small">
+                                <Button
+                                  type="text"
+                                  danger
+                                  icon={<DeleteFilled />}
+                                  onClick={() => {
+                                    remove(field.name);
+                                  }}
+                                />
+                                <Tooltip title={t("bodyshop.tooltips.reset-color")}>
+                                  <Button
+                                    type="text"
+                                    icon={<ReloadOutlined />}
+                                    onClick={() => {
+                                      form.setFieldValue(["ssbuckets", field.name, "color"]);
+
+                                      form.setFields([
+                                        {
+                                          name: ["ssbuckets", field.name, "color"],
+                                          touched: true
+                                        }
+                                      ]);
+                                    }}
+                                  />
+                                </Tooltip>
+                                <FormListMoveArrows
+                                  move={move}
+                                  index={index}
+                                  total={fields.length}
+                                  orientation="horizontal"
+                                />
+                              </Space>
+                            }
+                            {...schedulingBucketSurfaceStyles}
+                          >
+                            <div className="shop-info-scheduling__bucket-card-body">
+                              <div className="shop-info-scheduling__bucket-card-fields">
+                                <Form.Item
+                                  label={t("bodyshop.fields.ssbuckets.gte")}
+                                  key={`${index}gte`}
+                                  name={[field.name, "gte"]}
+                                  rules={[
+                                    {
+                                      required: true
+                                      //message: t("general.validation.required"),
+                                    }
+                                  ]}
+                                >
+                                  <InputNumber suffix="hrs" />
+                                </Form.Item>
+
+                                <Form.Item
+                                  label={t("bodyshop.fields.ssbuckets.lt")}
+                                  key={`${index}lt`}
+                                  name={[field.name, "lt"]}
+                                >
+                                  <InputNumber suffix="hrs" />
+                                </Form.Item>
+
+                                <Form.Item
+                                  label={t("bodyshop.fields.ssbuckets.target")}
+                                  key={`${index}target`}
+                                  name={[field.name, "target"]}
+                                  rules={[
+                                    {
+                                      required: true
+                                      //message: t("general.validation.required"),
+                                    }
+                                  ]}
+                                >
+                                  <InputNumber />
+                                </Form.Item>
+                              </div>
+                              <div className="shop-info-scheduling__bucket-card-color">
+                                <Form.Item key={`${index}color`} name={[field.name, "color"]}>
+                                  <ColorPicker styles={SCHEDULING_BUCKET_COLOR_PICKER_STYLES} />
+                                </Form.Item>
+                              </div>
+                            </div>
+                          </InlineValidatedFormRow>
+                        </Form.Item>
+                      );
+                    })
+                  )}
+                </div>
+              </LayoutFormRow>
             );
           }}
         </Form.List>
-      </LayoutFormRow>
-      {HasFeatureAccess({ featureName: "smartscheduling", bodyshop }) && (
-        <LayoutFormRow header={t("bodyshop.labels.ssbuckets")} id="ssbuckets">
-          <Form.List name={["ssbuckets"]}>
-            {(fields, { add, remove, move }) => {
-              return (
-                <div>
-                  {fields.map((field, index) => (
-                    <Form.Item key={field.key}>
-                      <LayoutFormRow noDivider>
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.id")}
-                          key={`${index}id`}
-                          name={[field.name, "id"]}
-                          rules={[
-                            {
-                              required: true
-                              //message: t("general.validation.required"),
-                            }
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.label")}
-                          key={`${index}label`}
-                          name={[field.name, "label"]}
-                          rules={[
-                            {
-                              required: true
-                              //message: t("general.validation.required"),
-                            }
-                          ]}
-                        >
-                          <Input />
-                        </Form.Item>
-
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.gte")}
-                          key={`${index}gte`}
-                          name={[field.name, "gte"]}
-                          rules={[
-                            {
-                              required: true
-                              //message: t("general.validation.required"),
-                            }
-                          ]}
-                        >
-                          <InputNumber />
-                        </Form.Item>
-
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.lt")}
-                          key={`${index}lt`}
-                          name={[field.name, "lt"]}
-                        >
-                          <InputNumber />
-                        </Form.Item>
-
-                        <Form.Item
-                          label={t("bodyshop.fields.ssbuckets.target")}
-                          key={`${index}target`}
-                          name={[field.name, "target"]}
-                          rules={[
-                            {
-                              required: true
-                              //message: t("general.validation.required"),
-                            }
-                          ]}
-                        >
-                          <InputNumber />
-                        </Form.Item>
-
-                        <Space orientation="horizontal">
-                          <Form.Item
-                            label={
-                              <Space>
-                                {t("bodyshop.fields.ssbuckets.color")}
-                                <Button
-                                  size="small"
-                                  onClick={() => {
-                                    form.setFieldValue(["ssbuckets", field.name, "color"]);
-
-                                    form.setFields([
-                                      {
-                                        name: ["ssbuckets", field.name, "color"],
-                                        touched: true
-                                      }
-                                    ]);
-                                  }}
-                                >
-                                  Reset
-                                </Button>
-                              </Space>
-                            }
-                            key={`${index}color`}
-                            name={[field.name, "color"]}
-                          >
-                            <ColorPicker />
-                          </Form.Item>
-                          <Space wrap>
-                            <DeleteFilled
-                              onClick={() => {
-                                remove(field.name);
-                              }}
-                            />
-                            <FormListMoveArrows move={move} index={index} total={fields.length} />
-                          </Space>
-                        </Space>
-                      </LayoutFormRow>
-                    </Form.Item>
-                  ))}
-                  <Form.Item>
-                    <Button
-                      type="dashed"
-                      onClick={() => {
-                        add();
-                      }}
-                      style={{ width: "100%" }}
-                    >
-                      {t("bodyshop.actions.addbucket")}
-                    </Button>
-                  </Form.Item>
-                </div>
-              );
-            }}
-          </Form.List>
-        </LayoutFormRow>
       )}
     </div>
   );

client/src/components/shop-info/shop-info.scheduling.styles.scss

@@ -0,0 +1,58 @@
+.shop-info-scheduling__bucket-card-body {
+  display: flex;
+  gap: 12px;
+  align-items: stretch;
+}
+
+.shop-info-scheduling__bucket-card-fields {
+  flex: 1 1 0;
+  min-width: 0;
+  display: grid;
+  grid-template-columns: repeat(3, minmax(92px, 1fr));
+  gap: 0 12px;
+}
+
+.shop-info-scheduling__bucket-card-fields .ant-form-item {
+  margin-bottom: 10px;
+}
+
+.shop-info-scheduling__bucket-card-color {
+  flex: 0 0 360px;
+  min-width: 360px;
+  max-width: 360px;
+  display: flex;
+  align-items: stretch;
+}
+
+.shop-info-scheduling__bucket-card-color .ant-form-item {
+  margin-bottom: 0;
+  width: 100%;
+}
+
+.shop-info-scheduling__bucket-card-color .ant-form-item-control,
+.shop-info-scheduling__bucket-card-color .ant-form-item-control-input,
+.shop-info-scheduling__bucket-card-color .ant-form-item-control-input-content {
+  height: 100%;
+}
+
+@media (max-width: 1199px) {
+  .shop-info-scheduling__bucket-card-body {
+    flex-direction: column;
+  }
+
+  .shop-info-scheduling__bucket-card-fields {
+    grid-template-columns: repeat(2, minmax(120px, 1fr));
+  }
+
+  .shop-info-scheduling__bucket-card-color {
+    flex-basis: auto;
+    min-width: 0;
+    max-width: none;
+  }
+}
+
+@media (max-width: 575px) {
+  .shop-info-scheduling__bucket-card-fields {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}

client/src/components/shop-info/shop-info.section-navigator.component.jsx

@@ -0,0 +1,213 @@
+import { Select } from "antd";
+import { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import "./shop-info.section-navigator.styles.scss";
+
+const HIGHLIGHT_CLASS = "shop-info-section-navigator__target--active";
+
+export default function ShopInfoSectionNavigator({ tabsRef, activeTabKey }) {
+  const { t } = useTranslation();
+  const targetMapRef = useRef(new Map());
+  const highlightedTargetRef = useRef(null);
+  const [options, setOptions] = useState([]);
+  const [selectedSection, setSelectedSection] = useState(undefined);
+
+  useEffect(() => {
+    const tabsContainer = tabsRef.current;
+    if (!tabsContainer) return undefined;
+
+    let animationFrameId = 0;
+
+    const refreshOptions = () => {
+      const activePane = tabsContainer.querySelector(".ant-tabs-tabpane-active");
+      if (!activePane) {
+        targetMapRef.current = new Map();
+        setOptions([]);
+        return;
+      }
+
+      const nextTargetMap = new Map();
+      const nextOptions = Array.from(activePane.querySelectorAll(".imex-form-row"))
+        .filter((card) => {
+          return shouldIncludeCardInNavigator(card, activePane);
+        })
+        .map((card, index) => {
+          const { title, depth, searchLabel } = getCardNavigatorInfo(card, activePane);
+          const value = `${activeTabKey}-shop-info-section-${index}`;
+
+          nextTargetMap.set(value, card);
+
+          return {
+            label: renderNavigatorOptionLabel(title, depth),
+            labelText: title,
+            searchLabel,
+            depth,
+            value
+          };
+        });
+
+      targetMapRef.current = nextTargetMap;
+      setOptions((currentOptions) => (areOptionsEqual(currentOptions, nextOptions) ? currentOptions : nextOptions));
+    };
+
+    const scheduleRefresh = () => {
+      cancelAnimationFrame(animationFrameId);
+      animationFrameId = requestAnimationFrame(refreshOptions);
+    };
+
+    scheduleRefresh();
+
+    const observer = new MutationObserver(scheduleRefresh);
+    observer.observe(tabsContainer, {
+      childList: true,
+      subtree: true,
+      characterData: true,
+      attributes: true,
+      attributeFilter: ["class"]
+    });
+
+    return () => {
+      cancelAnimationFrame(animationFrameId);
+      observer.disconnect();
+    };
+  }, [activeTabKey, tabsRef]);
+
+  useEffect(() => {
+    clearHighlightedTarget(highlightedTargetRef);
+    setSelectedSection(undefined);
+  }, [activeTabKey]);
+
+  const handleSectionChange = (value) => {
+    setSelectedSection(value);
+
+    clearHighlightedTarget(highlightedTargetRef);
+    if (!value) return;
+
+    const target = targetMapRef.current.get(value);
+    if (target) {
+      target.classList.add(HIGHLIGHT_CLASS);
+      highlightedTargetRef.current = target;
+      target.scrollIntoView({
+        behavior: "smooth",
+        block: "start"
+      });
+    }
+
+    window.setTimeout(() => {
+      setSelectedSection(undefined);
+    }, 0);
+  };
+
+  return (
+    <div className="shop-info-section-navigator">
+      <Select
+        allowClear
+        showSearch
+        value={selectedSection}
+        placeholder={t("bodyshop.labels.jump_to_section")}
+        options={options}
+        popupMatchSelectWidth={false}
+        disabled={options.length === 0}
+        filterOption={(input, option) => option?.searchLabel?.toLowerCase().includes(input.toLowerCase())}
+        onChange={handleSectionChange}
+      />
+    </div>
+  );
+}
+
+function getOwnCardTitleNode(card) {
+  const headNode = Array.from(card.children).find((child) => child.classList?.contains("ant-card-head"));
+  return headNode?.querySelector(".ant-card-head-title");
+}
+
+function getOwnCardTitle(card) {
+  return getOwnCardTitleNode(card)?.textContent?.trim();
+}
+
+function getAncestorCards(card, activePane) {
+  const ancestors = [];
+  let currentCard = card.parentElement?.closest(".imex-form-row");
+
+  while (currentCard && activePane.contains(currentCard)) {
+    ancestors.push(currentCard);
+    currentCard = currentCard.parentElement?.closest(".imex-form-row");
+  }
+
+  return ancestors.reverse();
+}
+
+function getCardDepth(card, activePane) {
+  return getAncestorCards(card, activePane).length;
+}
+
+function isVisibleCard(card) {
+  return card.offsetParent !== null;
+}
+
+function isNavigatorEligibleSubsection(card) {
+  return (
+    !card.classList.contains("imex-form-row--compact") &&
+    !card.classList.contains("imex-form-row--title-only") &&
+    !card.querySelector(":scope > .ant-card-actions")
+  );
+}
+
+function shouldIncludeCardInNavigator(card, activePane) {
+  const title = getOwnCardTitle(card);
+  if (!title || !isVisibleCard(card)) return false;
+
+  const depth = getCardDepth(card, activePane);
+  if (depth === 0) return true;
+  if (depth === 1) return isNavigatorEligibleSubsection(card);
+
+  return false;
+}
+
+function getCardNavigatorInfo(card, activePane) {
+  const title = getOwnCardTitle(card);
+  const ancestors = getAncestorCards(card, activePane);
+  const depth = ancestors.length;
+  const parentTitle = depth === 1 ? getOwnCardTitle(ancestors[0]) : null;
+
+  return {
+    title,
+    depth,
+    searchLabel: parentTitle ? `${parentTitle} ${title}` : title
+  };
+}
+
+function renderNavigatorOptionLabel(title, depth) {
+  return (
+    <span
+      className={[
+        "shop-info-section-navigator__option",
+        depth > 0 ? "shop-info-section-navigator__option--subsection" : null
+      ]
+        .filter(Boolean)
+        .join(" ")}
+    >
+      <span className="shop-info-section-navigator__option-label">{title}</span>
+    </span>
+  );
+}
+
+function clearHighlightedTarget(highlightedTargetRef) {
+  if (highlightedTargetRef.current) {
+    highlightedTargetRef.current.classList.remove(HIGHLIGHT_CLASS);
+    highlightedTargetRef.current = null;
+  }
+}
+
+function areOptionsEqual(currentOptions, nextOptions) {
+  if (currentOptions.length !== nextOptions.length) return false;
+
+  return currentOptions.every((option, index) => {
+    const nextOption = nextOptions[index];
+    return (
+      option.labelText === nextOption.labelText &&
+      option.searchLabel === nextOption.searchLabel &&
+      option.depth === nextOption.depth &&
+      option.value === nextOption.value
+    );
+  });
+}

client/src/components/shop-info/shop-info.section-navigator.styles.scss

@@ -0,0 +1,55 @@
+.shop-info-section-navigator {
+  max-width: 360px;
+  width: min(360px, 100%);
+
+  .ant-select {
+    width: 100%;
+  }
+}
+
+.shop-info-section-navigator__option {
+  display: inline-flex;
+  align-items: center;
+  min-height: 24px;
+}
+
+.shop-info-section-navigator__option--subsection {
+  position: relative;
+  padding-left: 18px;
+}
+
+.shop-info-section-navigator__option--subsection::before {
+  content: "";
+  position: absolute;
+  left: 6px;
+  top: 50%;
+  width: 8px;
+  height: 1px;
+  background: var(--ant-colorTextDescription);
+  transform: translateY(-50%);
+}
+
+.shop-info-section-navigator__option-label {
+  display: inline-block;
+}
+
+.imex-form-row.shop-info-section-navigator__target--active.ant-card {
+  border-color: color-mix(
+    in srgb,
+    var(--ant-colorPrimary, #1890ff) 65%,
+    var(--imex-form-surface-border)
+  );
+  background: color-mix(in srgb, var(--ant-colorPrimary, #1890ff) 7%, var(--imex-form-surface));
+  box-shadow: 0 0 0 3px color-mix(in srgb, var(--ant-colorPrimary, #1890ff) 24%, transparent);
+  transition: border-color 0.2s ease,
+  background-color 0.2s ease,
+  box-shadow 0.2s ease;
+
+  .ant-card-head {
+    background: color-mix(in srgb, var(--ant-colorPrimary, #1890ff) 12%, var(--imex-form-surface-head));
+  }
+
+  .ant-card-body {
+    background: color-mix(in srgb, var(--ant-colorPrimary, #1890ff) 7%, var(--imex-form-surface));
+  }
+}

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

@@ -3,11 +3,23 @@ import { Button, Form, Input, Select, Space } from "antd";
 import { useTranslation } from "react-i18next";
 import { TemplateList } from "../../utils/TemplateConstants";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import {
+  INLINE_TITLE_GROUP_STYLE,
+  INLINE_TITLE_HANDLE_STYLE,
+  INLINE_TITLE_INPUT_STYLE,
+  INLINE_TITLE_LABEL_STYLE,
+  INLINE_TITLE_ROW_STYLE,
+  INLINE_TITLE_SEPARATOR_STYLE,
+  InlineTitleListIcon
+} from "../layout-form-row/inline-form-row-title.utils.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function ShopInfoSpeedPrint() {
   const { t } = useTranslation();
+  const form = Form.useFormInstance();
   const allTemplates = TemplateList("job");
   const TemplateListGenerated = InstanceRenderManager({
     imex: Object.fromEntries(Object.entries(allTemplates).filter(([, { enhanced_payroll }]) => !enhanced_payroll)),
@@ -18,80 +30,131 @@ export default function ShopInfoSpeedPrint() {
     <Form.List name={["speedprint"]}>
       {(fields, { add, remove, move }) => {
         return (
-          <div>
-            {fields.map((field, index) => (
-              <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                <LayoutFormRow grow>
-                  <Form.Item
-                    label={t("bodyshop.fields.speedprint.id")}
-                    key={`${index}id`}
-                    name={[field.name, "id"]}
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <Input />
-                  </Form.Item>
-                  <Form.Item
-                    label={t("bodyshop.fields.speedprint.label")}
-                    key={`${index}label`}
-                    name={[field.name, "label"]}
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <Input />
-                  </Form.Item>
-
-                  <Form.Item
-                    name={[field.name, "templates"]}
-                    label={t("bodyshop.fields.speedprint.templates")}
-                    rules={[
-                      {
-                        required: true,
-                        //message: t("general.validation.required"),
-                        type: "array"
-                      }
-                    ]}
-                  >
-                    <Select
-                      mode="multiple"
-                      options={Object.keys(TemplateListGenerated).map((key) => ({
-                        value: TemplateListGenerated[key].key,
-                        label: TemplateListGenerated[key].title
-                      }))}
-                    />
-                  </Form.Item>
-
-                  <Space wrap>
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                    <FormListMoveArrows move={move} index={index} total={fields.length} />
-                  </Space>
-                </LayoutFormRow>
-              </Form.Item>
-            ))}
-            <Form.Item>
+          <LayoutFormRow
+            header={t("bodyshop.labels.speedprint_configurations")}
+            actions={[
               <Button
-                type="dashed"
+                key="add-speedprint"
+                type="primary"
+                block
                 onClick={() => {
                   add();
                 }}
-                style={{ width: "100%" }}
               >
                 {t("bodyshop.actions.addspeedprint")}
               </Button>
-            </Form.Item>
-          </div>
+            ]}
+          >
+            <div>
+              {fields.length === 0 ? (
+                <ConfigListEmptyState actionLabel={t("bodyshop.actions.addspeedprint")} />
+              ) : (
+                fields.map((field, index) => {
+                  return (
+                    <Form.Item noStyle key={field.key}>
+                      <InlineValidatedFormRow
+                        form={form}
+                        errorNames={[
+                          ["speedprint", field.name, "id"],
+                          ["speedprint", field.name, "label"]
+                        ]}
+                        noDivider
+                        title={
+                          <div style={INLINE_TITLE_ROW_STYLE}>
+                            <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                            <div style={INLINE_TITLE_GROUP_STYLE}>
+                              <div style={INLINE_TITLE_LABEL_STYLE}>{t("bodyshop.fields.speedprint.id")}</div>
+                              <Form.Item
+                                noStyle
+                                name={[field.name, "id"]}
+                                rules={[
+                                  {
+                                    required: true
+                                    //message: t("general.validation.required"),
+                                  }
+                                ]}
+                              >
+                                <Input
+                                  size="small"
+                                  placeholder={t("bodyshop.fields.speedprint.id")}
+                                  style={{
+                                    ...INLINE_TITLE_INPUT_STYLE,
+                                    width: "100%"
+                                  }}
+                                />
+                              </Form.Item>
+                            </div>
+                            <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                            <div style={INLINE_TITLE_GROUP_STYLE}>
+                              <div style={INLINE_TITLE_LABEL_STYLE}>{t("bodyshop.fields.speedprint.label")}</div>
+                              <Form.Item
+                                noStyle
+                                name={[field.name, "label"]}
+                                rules={[
+                                  {
+                                    required: true
+                                    //message: t("general.validation.required"),
+                                  }
+                                ]}
+                              >
+                                <Input
+                                  size="small"
+                                  placeholder={t("bodyshop.fields.speedprint.label")}
+                                  style={{
+                                    ...INLINE_TITLE_INPUT_STYLE,
+                                    width: "100%"
+                                  }}
+                                />
+                              </Form.Item>
+                            </div>
+                          </div>
+                        }
+                        wrapTitle
+                        extra={
+                          <Space align="center" size="small">
+                            <Button
+                              type="text"
+                              danger
+                              icon={<DeleteFilled />}
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                            <FormListMoveArrows
+                              move={move}
+                              index={index}
+                              total={fields.length}
+                              orientation="horizontal"
+                            />
+                          </Space>
+                        }
+                      >
+                        <Form.Item
+                          name={[field.name, "templates"]}
+                          label={t("bodyshop.fields.speedprint.templates")}
+                          rules={[
+                            {
+                              required: true,
+                              //message: t("general.validation.required"),
+                              type: "array"
+                            }
+                          ]}
+                        >
+                          <Select
+                            mode="multiple"
+                            options={Object.keys(TemplateListGenerated).map((key) => ({
+                              value: TemplateListGenerated[key].key,
+                              label: TemplateListGenerated[key].title
+                            }))}
+                          />
+                        </Form.Item>
+                      </InlineValidatedFormRow>
+                    </Form.Item>
+                  );
+                })
+              )}
+            </div>
+          </LayoutFormRow>
         );
       }}
     </Form.List>

client/src/components/shop-info/shop-info.task-presets.component.jsx

@@ -2,6 +2,8 @@ import { DeleteFilled } from "@ant-design/icons";
 import { Button, Checkbox, Col, Form, Input, InputNumber, Row, Select, Space, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import { getFormListItemTitle } from "../form-list-move-arrows/form-list-item-title.utils";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 import { connect } from "react-redux";
@@ -55,10 +57,12 @@ const getTaskPresetAllocationErrors = (presets = [], t) => {
 
 export function ShopInfoTaskPresets({ bodyshop }) {
   const { t } = useTranslation();
+  const form = Form.useFormInstance();
+  const taskPresets = Form.useWatch(["md_tasks_presets", "presets"], form) || [];
 
   return (
     <>
-      <LayoutFormRow noDivider>
+      <LayoutFormRow header={t("bodyshop.labels.task_preset_options")}>
         <Form.Item
           label={t("bodyshop.fields.md_tasks_presets.enable_tasks")}
           valuePropName="checked"
@@ -75,187 +79,216 @@ export function ShopInfoTaskPresets({ bodyshop }) {
         </Form.Item>
       </LayoutFormRow>
 
-      <LayoutFormRow header={t("bodyshop.labels.md_tasks_presets")}>
-        <Form.List
-          name={["md_tasks_presets", "presets"]}
-          rules={[
-            {
-              validator: async (_, presets) => {
-                const allocationErrors = getTaskPresetAllocationErrors(presets, t);
+      <Form.List
+        name={["md_tasks_presets", "presets"]}
+        rules={[
+          {
+            validator: async (_, presets) => {
+              const allocationErrors = getTaskPresetAllocationErrors(presets, t);
 
-                if (allocationErrors.length > 0) {
-                  throw new Error(allocationErrors.join(" "));
-                }
+              if (allocationErrors.length > 0) {
+                throw new Error(allocationErrors.join(" "));
               }
             }
-          ]}
-        >
-          {(fields, { add, remove, move }, { errors }) => {
-            return (
+          }
+        ]}
+      >
+        {(fields, { add, remove, move }, { errors }) => {
+          return (
+            <LayoutFormRow
+              header={t("bodyshop.labels.md_tasks_presets")}
+              actions={[
+                <Button
+                  key="add-task-preset"
+                  type="primary"
+                  block
+                  onClick={() => {
+                    add();
+                  }}
+                >
+                  {t("bodyshop.actions.add_task_preset")}
+                </Button>
+              ]}
+            >
               <div>
-                {fields.map((field, index) => (
-                  <Form.Item key={field.key}>
-                    <LayoutFormRow noDivider>
-                      <Form.Item
-                        label={t("bodyshop.fields.md_tasks_presets.name")}
-                        key={`${index}name`}
-                        name={[field.name, "name"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
+                {fields.length === 0 ? (
+                  <ConfigListEmptyState actionLabel={t("bodyshop.actions.add_task_preset")} />
+                ) : (
+                  fields.map((field, index) => {
+                    const taskPreset = taskPresets[field.name] || {};
+
+                    return (
+                      <Form.Item key={field.key}>
+                        <LayoutFormRow
+                          noDivider
+                          title={getFormListItemTitle(
+                            t("bodyshop.fields.md_tasks_presets.name"),
+                            index,
+                            taskPreset.name,
+                            taskPreset.memo
+                          )}
+                          extra={
+                            <Space align="center" size="small">
+                              <Button
+                                type="text"
+                                danger
+                                icon={<DeleteFilled />}
+                                onClick={() => {
+                                  remove(field.name);
+                                }}
+                              />
+                              <FormListMoveArrows
+                                move={move}
+                                index={index}
+                                total={fields.length}
+                                orientation="horizontal"
+                              />
+                            </Space>
                           }
-                        ]}
-                      >
-                        <Input />
+                        >
+                          <Form.Item
+                            label={t("bodyshop.fields.md_tasks_presets.name")}
+                            key={`${index}name`}
+                            name={[field.name, "name"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <Input />
+                          </Form.Item>
+                          <Form.Item
+                            span={12}
+                            label={t("bodyshop.fields.md_tasks_presets.hourstype")}
+                            key={`${index}hourstype`}
+                            name={[field.name, "hourstype"]}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                          >
+                            <Checkbox.Group>
+                              <Row>
+                                <Col span={4}>
+                                  <Checkbox value="LAA" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAA")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAB" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAB")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAD" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAD")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAE" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAE")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAF" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAF")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAG" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAG")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAM" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAM")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAR" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAR")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAS" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAS")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LAU" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LAU")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LA1" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LA1")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LA2" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LA2")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LA3" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LA3")}
+                                  </Checkbox>
+                                </Col>
+                                <Col span={4}>
+                                  <Checkbox value="LA4" style={{ lineHeight: "32px" }}>
+                                    {t("joblines.fields.lbr_types.LA4")}
+                                  </Checkbox>
+                                </Col>
+                              </Row>
+                            </Checkbox.Group>
+                          </Form.Item>
+                          <Form.Item
+                            label={t("bodyshop.fields.md_tasks_presets.percent")}
+                            key={`${index}percent`}
+                            rules={[
+                              {
+                                required: true
+                                //message: t("general.validation.required"),
+                              }
+                            ]}
+                            name={[field.name, "percent"]}
+                          >
+                            <InputNumber min={0} max={100} suffix="%" />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("bodyshop.fields.md_tasks_presets.memo")}
+                            key={`${index}memo`}
+                            name={[field.name, "memo"]}
+                          >
+                            <Input />
+                          </Form.Item>
+                          <Form.Item
+                            label={t("bodyshop.fields.md_tasks_presets.nextstatus")}
+                            key={`${index}nextstatus`}
+                            name={[field.name, "nextstatus"]}
+                          >
+                            <Select
+                              options={bodyshop.md_ro_statuses.production_statuses.map((o) => ({
+                                value: o,
+                                label: o
+                              }))}
+                            />
+                          </Form.Item>
+                        </LayoutFormRow>
                       </Form.Item>
-                      <Form.Item
-                        span={12}
-                        label={t("bodyshop.fields.md_tasks_presets.hourstype")}
-                        key={`${index}hourstype`}
-                        name={[field.name, "hourstype"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <Checkbox.Group>
-                          <Row>
-                            <Col span={4}>
-                              <Checkbox value="LAA" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAA")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAB" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAB")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAD" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAD")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAE" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAE")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAF" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAF")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAG" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAG")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAM" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAM")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAR" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAR")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAS" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAS")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LAU" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LAU")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LA1" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LA1")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LA2" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LA2")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LA3" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LA3")}
-                              </Checkbox>
-                            </Col>
-                            <Col span={4}>
-                              <Checkbox value="LA4" style={{ lineHeight: "32px" }}>
-                                {t("joblines.fields.lbr_types.LA4")}
-                              </Checkbox>
-                            </Col>
-                          </Row>
-                        </Checkbox.Group>
-                      </Form.Item>
-                      <Form.Item
-                        label={t("bodyshop.fields.md_tasks_presets.percent")}
-                        key={`${index}percent`}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                        name={[field.name, "percent"]}
-                      >
-                        <InputNumber min={0} max={100} />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("bodyshop.fields.md_tasks_presets.memo")}
-                        key={`${index}memo`}
-                        name={[field.name, "memo"]}
-                      >
-                        <Input />
-                      </Form.Item>
-                      <Form.Item
-                        label={t("bodyshop.fields.md_tasks_presets.nextstatus")}
-                        key={`${index}nextstatus`}
-                        name={[field.name, "nextstatus"]}
-                      >
-                        <Select
-                          options={bodyshop.md_ro_statuses.production_statuses.map((o) => ({
-                            value: o,
-                            label: o
-                          }))}
-                        />
-                      </Form.Item>
-                      <Space wrap>
-                        <DeleteFilled
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                        <FormListMoveArrows move={move} index={index} total={fields.length} />
-                      </Space>
-                    </LayoutFormRow>
-                  </Form.Item>
-                ))}
+                    );
+                  })
+                )}
                 <Form.ErrorList errors={errors} />
-                <Form.Item>
-                  <Button
-                    type="dashed"
-                    onClick={() => {
-                      add();
-                    }}
-                    style={{ width: "100%" }}
-                  >
-                    {t("bodyshop.actions.add_task_preset")}
-                  </Button>
-                </Form.Item>
               </div>
-            );
-          }}
-        </Form.List>
-      </LayoutFormRow>
+            </LayoutFormRow>
+          );
+        }}
+      </Form.List>
     </>
   );
 }

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -5,6 +5,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -17,19 +18,22 @@ export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
 // noinspection JSUnusedLocalSymbols
 export function ShopInfoIntellipay({ bodyshop, form }) {
   const { t } = useTranslation();
+  const cashDiscountEnabled = Form.useWatch(["intellipay_config", "enable_cash_discount"], form);
 
   return (
     <>
-      <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
-        {() => {
-          const { intellipay_config } = form.getFieldsValue();
+      {cashDiscountEnabled && (
+        <div style={{ marginBottom: 12 }}>
+          <Alert title={t("bodyshop.labels.intellipay_cash_discount")} />
+        </div>
+      )}
 
-          if (intellipay_config?.enable_cash_discount)
-            return <Alert title={t("bodyshop.labels.intellipay_cash_discount")} />;
-        }}
-      </Form.Item>
-
-      <LayoutFormRow noDivider>
+      <LayoutFormRow
+        header={InstanceRenderManager({
+          rome: t("bodyshop.labels.romepay"),
+          imex: t("bodyshop.labels.imexpay")
+        })}
+      >
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.enable_cash_discount")}
           valuePropName="checked"

client/src/components/shop-teams/shop-employee-teams.form.component.jsx

@@ -1,23 +1,9 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useMutation, useQuery } from "@apollo/client/react";
-import {
-  Button,
-  Card,
-  Col,
-  Form,
-  Input,
-  InputNumber,
-  Row,
-  Select,
-  Skeleton,
-  Space,
-  Switch,
-  Tag,
-  Typography
-} from "antd";
+import { Button, Card, Col, Form, Input, InputNumber, Row, Select, Skeleton, Space, Switch, Typography } from "antd";
 
 import querystring from "query-string";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
@@ -25,9 +11,22 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
+import FormsFieldChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import InlineValidatedFormRow from "../layout-form-row/inline-validated-form-row.component.jsx";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import {
+  INLINE_TITLE_GROUP_STYLE,
+  INLINE_TITLE_HANDLE_STYLE,
+  INLINE_TITLE_INPUT_STYLE,
+  INLINE_TITLE_LABEL_STYLE,
+  INLINE_TITLE_ROW_STYLE,
+  INLINE_TITLE_SEPARATOR_STYLE,
+  INLINE_TITLE_SWITCH_GROUP_STYLE,
+  InlineTitleListIcon
+} from "../layout-form-row/inline-form-row-title.utils.js";
 
 import {
   INSERT_EMPLOYEE_TEAM,
@@ -37,11 +36,10 @@ import {
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import {
-  LABOR_TYPES,
   getSplitTotal,
   hasExactSplitTotal,
+  LABOR_TYPES,
   normalizeEmployeeTeam,
-  normalizeTeamMember,
   validateEmployeeTeamMembers
 } from "./shop-employee-teams.form.utils.js";
 
@@ -55,24 +53,8 @@ const PAYOUT_METHOD_OPTIONS = [
   { labelKey: "employee_teams.options.commission_percentage", value: "commission" }
 ];
 
-const TEAM_MEMBER_PRIMARY_FIELD_COLS = {
-  employee: { xs: 24, lg: 13, xxl: 14 },
-  allocation: { xs: 24, sm: 12, lg: 4, xxl: 4 },
-  payoutMethod: { xs: 24, sm: 12, lg: 7, xxl: 6 }
-};
-
 const TEAM_MEMBER_RATE_FIELD_COLS = { xs: 24, sm: 12, md: 8, lg: 6, xxl: 4 };
 
-const getPayoutMethodTagColor = (payoutMethod) => (payoutMethod === "commission" ? "gold" : "blue");
-
-const getEmployeeDisplayName = (employees = [], employeeId) => {
-  const employee = employees.find((currentEmployee) => currentEmployee.id === employeeId);
-  if (!employee) return null;
-
-  const fullName = [employee.first_name, employee.last_name].filter(Boolean).join(" ").trim();
-  return fullName || employee.employee_number || null;
-};
-
 const formatAllocationPercentage = (percentage) => {
   if (percentage === null || percentage === undefined || percentage === "") return null;
 
@@ -82,16 +64,19 @@ const formatAllocationPercentage = (percentage) => {
   return `${numericValue.toFixed(2).replace(/\.?0+$/, "")}%`;
 };
 
-export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
+export function ShopEmployeeTeamsFormComponent({ bodyshop, form, onDirtyChange, isDirty }) {
   const { t } = useTranslation();
-  const [form] = Form.useForm();
+  const [internalForm] = Form.useForm();
+  const [internalIsDirty, setInternalIsDirty] = useState(false);
+  const teamForm = form ?? internalForm;
+  const resolvedIsDirty = typeof isDirty === "boolean" ? isDirty : internalIsDirty;
   const history = useNavigate();
   const search = querystring.parse(useLocation().search);
   const notification = useNotification();
   const [hydratedTeamId, setHydratedTeamId] = useState(search.employeeTeamId === "new" ? "new" : null);
   const isNewTeam = search.employeeTeamId === "new";
 
-  const { error, data, loading } = useQuery(QUERY_EMPLOYEE_TEAM_BY_ID, {
+  const { error, data, loading, refetch } = useQuery(QUERY_EMPLOYEE_TEAM_BY_ID, {
     variables: { id: search.employeeTeamId },
     skip: !search.employeeTeamId || isNewTeam,
     fetchPolicy: "network-only",
@@ -99,29 +84,68 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
     notifyOnNetworkStatusChange: true
   });
 
-  useEffect(() => {
-    if (!search.employeeTeamId) return;
+  const currentTeamData = data?.employee_teams_by_pk?.id === search.employeeTeamId ? data.employee_teams_by_pk : null;
+
+  const updateDirtyState = useCallback(
+    (nextDirtyState) => {
+      setInternalIsDirty(nextDirtyState);
+      onDirtyChange?.(nextDirtyState);
+    },
+    [onDirtyChange]
+  );
+
+  const clearTeamFormMeta = useCallback(() => {
+    const fieldMeta = teamForm.getFieldsError().map(({ name }) => ({
+      name,
+      touched: false,
+      validating: false,
+      errors: [],
+      warnings: []
+    }));
+
+    if (fieldMeta.length > 0) {
+      teamForm.setFields(fieldMeta);
+    }
+
+    updateDirtyState(false);
+  }, [teamForm, updateDirtyState]);
+
+  const resetTeamFormToCurrentData = useCallback(() => {
+    let hydrationFrameId;
+
+    teamForm.resetFields();
 
     if (isNewTeam) {
-      form.resetFields();
       setHydratedTeamId("new");
-      return;
+      hydrationFrameId = window.requestAnimationFrame(() => {
+        clearTeamFormMeta();
+      });
+      return () => {
+        if (hydrationFrameId) window.cancelAnimationFrame(hydrationFrameId);
+      };
     }
 
     setHydratedTeamId(null);
-  }, [form, isNewTeam, search.employeeTeamId]);
 
-  useEffect(() => {
-    if (!search.employeeTeamId || isNewTeam || loading) return;
-
-    if (data?.employee_teams_by_pk?.id === search.employeeTeamId) {
-      form.setFieldsValue(normalizeEmployeeTeam(data.employee_teams_by_pk));
-      setHydratedTeamId(search.employeeTeamId);
-    } else {
-      form.resetFields();
-      setHydratedTeamId(search.employeeTeamId);
+    if (loading) {
+      return undefined;
     }
-  }, [data, form, isNewTeam, loading, search.employeeTeamId]);
+
+    if (currentTeamData) {
+      teamForm.setFieldsValue(normalizeEmployeeTeam(currentTeamData));
+    }
+
+    hydrationFrameId = window.requestAnimationFrame(() => {
+      setHydratedTeamId(search.employeeTeamId);
+      clearTeamFormMeta();
+    });
+
+    return () => {
+      if (hydrationFrameId) window.cancelAnimationFrame(hydrationFrameId);
+    };
+  }, [clearTeamFormMeta, currentTeamData, isNewTeam, loading, search.employeeTeamId, teamForm]);
+
+  useEffect(() => resetTeamFormToCurrentData(), [resetTeamFormToCurrentData]);
 
   const [updateEmployeeTeam] = useMutation(UPDATE_EMPLOYEE_TEAM);
   const [insertEmployeeTeam] = useMutation(INSERT_EMPLOYEE_TEAM);
@@ -129,34 +153,25 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
     label: t(labelKey),
     value
   }));
-  const teamName = Form.useWatch("name", form);
-  const teamMembers = Form.useWatch(["employee_team_members"], form) || [];
+  const teamName = Form.useWatch("name", teamForm);
+  const teamMembers = Form.useWatch(["employee_team_members"], teamForm) || [];
   const isTeamHydrating = !isNewTeam && Boolean(search.employeeTeamId) && hydratedTeamId !== search.employeeTeamId;
-  const teamCardTitle = isTeamHydrating
-    ? t("employee_teams.fields.name")
-    : teamName?.trim() || t("employee_teams.fields.name");
-
-  const getTeamMemberTitle = (teamMember = {}) => {
-    const employeeName =
-      getEmployeeDisplayName(bodyshop.employees, teamMember.employeeid) || t("employee_teams.fields.employeeid");
-    const allocation = formatAllocationPercentage(teamMember.percentage);
-    const payoutMethod =
-      teamMember.payout_method === "commission"
-        ? t("employee_teams.options.commission")
-        : t("employee_teams.options.hourly");
-
-    return (
-      <div style={{ display: "flex", flexWrap: "wrap", alignItems: "center", gap: 8 }}>
-        <Typography.Text strong>{employeeName}</Typography.Text>
-        <Tag variant="filled" color="geekblue">
-          {`${t("employee_teams.fields.allocation")}: ${allocation || "--"}`}
-        </Tag>
-        <Tag variant="filled" color={getPayoutMethodTagColor(teamMember.payout_method)}>
-          {payoutMethod}
-        </Tag>
-      </div>
-    );
-  };
+  const isAllocationTotalExact = hasExactSplitTotal(teamMembers);
+  const allocationTotalValue = formatAllocationPercentage(getSplitTotal(teamMembers))?.replace("%", "") || "0";
+  const teamNameDisplay = teamName?.trim() || t("employee_teams.fields.name");
+  const teamCardTitle = isTeamHydrating ? (
+    t("employee_teams.fields.name")
+  ) : (
+    <span>
+      <span>{teamNameDisplay}</span>
+      <span> - </span>
+      <Typography.Text type={isAllocationTotalExact ? undefined : "danger"}>
+        {t("employee_teams.labels.allocation_total", {
+          total: allocationTotalValue
+        })}
+      </Typography.Text>
+    </span>
+  );
 
   const handleFinish = async ({ employee_team_members = [], ...values }) => {
     const { normalizedTeamMembers, errorKey } = validateEmployeeTeamMembers(employee_team_members);
@@ -193,6 +208,8 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
       });
 
       if (!result.errors) {
+        updateDirtyState(false);
+        void refetch();
         notification.success({
           title: t("employees.successes.save")
         });
@@ -216,6 +233,7 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
         },
         refetchQueries: ["QUERY_TEAMS"]
       }).then((response) => {
+        updateDirtyState(false);
         search.employeeTeamId = response.data.insert_employee_teams_one.id;
         history({ search: querystring.stringify(search) });
         notification.success({
@@ -230,18 +248,66 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
 
   return (
     <Card
-      title={teamCardTitle}
+      title={isTeamHydrating ? undefined : teamCardTitle}
       extra={
-        <Button type="primary" onClick={() => form.submit()} disabled={isTeamHydrating}>
-          {t("general.actions.save")}
+        <Button
+          type="primary"
+          onClick={() => teamForm.submit()}
+          disabled={isTeamHydrating || !resolvedIsDirty}
+          style={{ minWidth: 190 }}
+        >
+          {t("employee_teams.actions.save_team")}
         </Button>
       }
     >
       {isTeamHydrating ? (
         <Skeleton active title={false} paragraph={{ rows: 12 }} />
       ) : (
-        <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
-          <LayoutFormRow>
+        <Form
+          onFinish={handleFinish}
+          autoComplete={"off"}
+          layout="vertical"
+          form={teamForm}
+          onValuesChange={() => {
+            updateDirtyState(teamForm.isFieldsTouched());
+          }}
+        >
+          <FormsFieldChanged form={teamForm} onReset={resetTeamFormToCurrentData} onDirtyChange={updateDirtyState} />
+          <LayoutFormRow
+            title={
+              <div
+                style={{
+                  ...INLINE_TITLE_ROW_STYLE,
+                  justifyContent: "space-between"
+                }}
+              >
+                <div
+                  style={{
+                    whiteSpace: "nowrap",
+                    fontWeight: 500,
+                    fontSize: "var(--ant-font-size-lg)",
+                    lineHeight: 1.2,
+                    marginRight: "auto"
+                  }}
+                >
+                  {t("employee_teams.labels.team_options")}
+                </div>
+                <div
+                  style={{
+                    ...INLINE_TITLE_SWITCH_GROUP_STYLE,
+                    marginLeft: "auto"
+                  }}
+                >
+                  <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                  <div style={INLINE_TITLE_LABEL_STYLE}>{t("employee_teams.fields.active")}</div>
+                  <Form.Item noStyle name="active" valuePropName="checked">
+                    <Switch />
+                  </Form.Item>
+                </div>
+              </div>
+            }
+            wrapTitle
+          >
             <Form.Item
               name="name"
               label={t("employee_teams.fields.name")}
@@ -253,9 +319,6 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
             >
               <Input />
             </Form.Item>
-            <Form.Item label={t("employee_teams.fields.active")} name="active" valuePropName="checked">
-              <Switch />
-            </Form.Item>
             <Form.Item
               label={t("employee_teams.fields.max_load")}
               name="max_load"
@@ -265,128 +328,19 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
                 }
               ]}
             >
-              <InputNumber min={0} precision={1} />
+              <InputNumber min={0} precision={1} suffix="%" />
             </Form.Item>
           </LayoutFormRow>
           <Form.List name={["employee_team_members"]}>
             {(fields, { add, remove, move }) => {
               return (
-                <div>
-                  {fields.map((field, index) => {
-                    const teamMember = normalizeTeamMember(teamMembers[field.name]);
-
-                    return (
-                      <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                        <Form.Item label={t("employees.fields.id")} key={`${index}`} name={[field.name, "id"]} hidden>
-                          <Input type="hidden" />
-                        </Form.Item>
-                        <LayoutFormRow
-                          grow
-                          title={getTeamMemberTitle(teamMember)}
-                          extra={
-                            <Space align="center" size="small">
-                              <Button
-                                type="text"
-                                icon={<DeleteFilled />}
-                                onClick={() => {
-                                  remove(field.name);
-                                }}
-                              />
-                              <FormListMoveArrows
-                                move={move}
-                                index={index}
-                                total={fields.length}
-                                orientation="horizontal"
-                              />
-                            </Space>
-                          }
-                        >
-                          <div>
-                            <Row gutter={[16, 0]}>
-                              <Col {...TEAM_MEMBER_PRIMARY_FIELD_COLS.employee}>
-                                <Form.Item
-                                  label={t("employee_teams.fields.employeeid")}
-                                  key={`${index}`}
-                                  name={[field.name, "employeeid"]}
-                                  rules={[
-                                    {
-                                      required: true
-                                    }
-                                  ]}
-                                >
-                                  <EmployeeSearchSelectComponent options={bodyshop.employees} />
-                                </Form.Item>
-                              </Col>
-                              <Col {...TEAM_MEMBER_PRIMARY_FIELD_COLS.allocation}>
-                                <Form.Item
-                                  label={t("employee_teams.fields.allocation_percentage")}
-                                  key={`${index}`}
-                                  name={[field.name, "percentage"]}
-                                  rules={[
-                                    {
-                                      required: true
-                                    }
-                                  ]}
-                                >
-                                  <InputNumber min={0} max={100} precision={2} />
-                                </Form.Item>
-                              </Col>
-                              <Col {...TEAM_MEMBER_PRIMARY_FIELD_COLS.payoutMethod}>
-                                <Form.Item
-                                  label={t("employee_teams.fields.payout_method")}
-                                  key={`${index}-payout-method`}
-                                  name={[field.name, "payout_method"]}
-                                  initialValue="hourly"
-                                  rules={[
-                                    {
-                                      required: true
-                                    }
-                                  ]}
-                                >
-                                  <Select options={payoutMethodOptions} />
-                                </Form.Item>
-                              </Col>
-                            </Row>
-                            <Form.Item noStyle dependencies={[["employee_team_members", field.name, "payout_method"]]}>
-                              {() => {
-                                const payoutMethod =
-                                  form.getFieldValue(["employee_team_members", field.name, "payout_method"]) ||
-                                  "hourly";
-                                const fieldName = payoutMethod === "commission" ? "commission_rates" : "labor_rates";
-
-                                return (
-                                  <Row gutter={[16, 0]}>
-                                    {LABOR_TYPES.map((laborType) => (
-                                      <Col {...TEAM_MEMBER_RATE_FIELD_COLS} key={`${index}-${fieldName}-${laborType}`}>
-                                        <Form.Item
-                                          label={t(`joblines.fields.lbr_types.${laborType}`)}
-                                          name={[field.name, fieldName, laborType]}
-                                          rules={[
-                                            {
-                                              required: true
-                                            }
-                                          ]}
-                                        >
-                                          {payoutMethod === "commission" ? (
-                                            <InputNumber min={0} max={100} precision={2} />
-                                          ) : (
-                                            <CurrencyInput />
-                                          )}
-                                        </Form.Item>
-                                      </Col>
-                                    ))}
-                                  </Row>
-                                );
-                              }}
-                            </Form.Item>
-                          </div>
-                        </LayoutFormRow>
-                      </Form.Item>
-                    );
-                  })}
-                  <Form.Item>
+                <LayoutFormRow
+                  title={t("employee_teams.labels.members")}
+                  actions={[
                     <Button
-                      type="dashed"
+                      key="add-team-member"
+                      type="primary"
+                      block
                       onClick={() => {
                         add({
                           percentage: 0,
@@ -395,26 +349,166 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
                           commission_rates: {}
                         });
                       }}
-                      style={{ width: "100%" }}
                     >
                       {t("employee_teams.actions.newmember")}
                     </Button>
-                  </Form.Item>
-                  <Form.Item noStyle shouldUpdate>
-                    {() => {
-                      const teamMembers = form.getFieldValue(["employee_team_members"]) || [];
-                      const splitTotal = getSplitTotal(teamMembers);
+                  ]}
+                >
+                  <div>
+                    {fields.length === 0 ? (
+                      <ConfigListEmptyState actionLabel={t("employee_teams.actions.newmember")} />
+                    ) : (
+                      fields.map((field, index) => {
+                        return (
+                          <Form.Item noStyle key={field.key}>
+                            <Form.Item name={[field.name, "id"]} hidden>
+                              <Input type="hidden" />
+                            </Form.Item>
+                            <InlineValidatedFormRow
+                              form={teamForm}
+                              errorNames={[
+                                ["employee_team_members", field.name, "employeeid"],
+                                ["employee_team_members", field.name, "percentage"],
+                                ["employee_team_members", field.name, "payout_method"]
+                              ]}
+                              grow
+                              title={
+                                <div style={INLINE_TITLE_ROW_STYLE}>
+                                  <InlineTitleListIcon style={INLINE_TITLE_HANDLE_STYLE} />
+                                  <div style={INLINE_TITLE_GROUP_STYLE}>
+                                    <div style={INLINE_TITLE_LABEL_STYLE}>{t("employee_teams.fields.employeeid")}</div>
+                                    <Form.Item
+                                      noStyle
+                                      name={[field.name, "employeeid"]}
+                                      rules={[
+                                        {
+                                          required: true
+                                        }
+                                      ]}
+                                    >
+                                      <EmployeeSearchSelectComponent options={bodyshop.employees} />
+                                    </Form.Item>
+                                  </div>
+                                  <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                                  <div style={INLINE_TITLE_GROUP_STYLE}>
+                                    <div style={INLINE_TITLE_LABEL_STYLE}>{t("employee_teams.fields.allocation")}</div>
+                                    <Form.Item
+                                      noStyle
+                                      name={[field.name, "percentage"]}
+                                      rules={[
+                                        {
+                                          required: true
+                                        }
+                                      ]}
+                                    >
+                                      <InputNumber
+                                        min={0}
+                                        max={100}
+                                        precision={2}
+                                        size="small"
+                                        aria-label={t("employee_teams.fields.allocation")}
+                                        suffix="%"
+                                        style={{
+                                          ...INLINE_TITLE_INPUT_STYLE,
+                                          width: "100%"
+                                        }}
+                                      />
+                                    </Form.Item>
+                                  </div>
+                                  <div aria-hidden style={INLINE_TITLE_SEPARATOR_STYLE} />
+                                  <div style={INLINE_TITLE_GROUP_STYLE}>
+                                    <div style={INLINE_TITLE_LABEL_STYLE}>{t("employee_teams.fields.payout_method")}</div>
+                                    <Form.Item
+                                      noStyle
+                                      key={`${index}-payout-method`}
+                                      name={[field.name, "payout_method"]}
+                                      initialValue="hourly"
+                                      rules={[
+                                        {
+                                          required: true
+                                        }
+                                      ]}
+                                    >
+                                      <Select
+                                        aria-label={t("employee_teams.fields.payout_method")}
+                                        size="small"
+                                        options={payoutMethodOptions}
+                                        style={{ width: "100%" }}
+                                        styles={{
+                                          selector: INLINE_TITLE_INPUT_STYLE
+                                        }}
+                                      />
+                                    </Form.Item>
+                                  </div>
+                                </div>
+                              }
+                              wrapTitle
+                              extra={
+                                <Space align="center" size="small">
+                                  <Button
+                                    type="text"
+                                    danger
+                                    icon={<DeleteFilled />}
+                                    onClick={() => {
+                                      remove(field.name);
+                                    }}
+                                  />
+                                  <FormListMoveArrows
+                                    move={move}
+                                    index={index}
+                                    total={fields.length}
+                                    orientation="horizontal"
+                                  />
+                                </Space>
+                              }
+                            >
+                              <div>
+                                <Form.Item
+                                  noStyle
+                                  dependencies={[["employee_team_members", field.name, "payout_method"]]}
+                                >
+                                  {() => {
+                                    const payoutMethod =
+                                      teamForm.getFieldValue(["employee_team_members", field.name, "payout_method"]) ||
+                                      "hourly";
+                                    const fieldName = payoutMethod === "commission" ? "commission_rates" : "labor_rates";
 
-                      return (
-                        <Typography.Text type={hasExactSplitTotal(teamMembers) ? undefined : "danger"}>
-                          {t("employee_teams.labels.allocation_total", {
-                            total: splitTotal.toFixed(2)
-                          })}
-                        </Typography.Text>
-                      );
-                    }}
-                  </Form.Item>
-                </div>
+                                    return (
+                                      <Row gutter={[16, 0]}>
+                                        {LABOR_TYPES.map((laborType) => (
+                                          <Col
+                                            {...TEAM_MEMBER_RATE_FIELD_COLS}
+                                            key={`${index}-${fieldName}-${laborType}`}
+                                          >
+                                            <Form.Item
+                                              label={t(`joblines.fields.lbr_types.${laborType}`)}
+                                              name={[field.name, fieldName, laborType]}
+                                              rules={[
+                                                {
+                                                  required: true
+                                                }
+                                              ]}
+                                            >
+                                              {payoutMethod === "commission" ? (
+                                                <InputNumber min={0} max={100} precision={2} suffix="%" />
+                                              ) : (
+                                                <CurrencyInput prefix="$" />
+                                              )}
+                                            </Form.Item>
+                                          </Col>
+                                        ))}
+                                      </Row>
+                                    );
+                                  }}
+                                </Form.Item>
+                              </div>
+                            </InlineValidatedFormRow>
+                          </Form.Item>
+                        );
+                      })
+                    )}
+                  </div>
+                </LayoutFormRow>
               );
             }}
           </Form.List>

client/src/components/shop-teams/shop-employee-teams.form.component.test.jsx

@@ -42,9 +42,11 @@ vi.mock("react-i18next", () => ({
         "employee_teams.options.commission": "Commission",
         "employee_teams.options.commission_percentage": "Commission",
         "employee_teams.actions.newmember": "New Team Member",
+        "employee_teams.actions.save_team": "Save Employee Team",
         "employee_teams.errors.minimum_one_member": "Add at least one team member.",
         "employee_teams.errors.duplicate_member": "Team members must be unique.",
         "employee_teams.errors.allocation_total_exact": "Allocation must total exactly 100%.",
+        "general.labels.click_to_begin": `Click ${values.action ?? ""} to begin`,
         "general.actions.save": "Save",
         "employees.successes.save": "Saved"
       };
@@ -66,6 +68,10 @@ vi.mock("../../contexts/Notifications/notificationContext.jsx", () => ({
   useNotification: () => notification
 }));
 
+vi.mock("../form-fields-changed-alert/form-fields-changed-alert.component.jsx", () => ({
+  default: () => null
+}));
+
 vi.mock("../../firebase/firebase.utils", () => ({
   logImEXEvent: vi.fn()
 }));
@@ -101,11 +107,12 @@ vi.mock("../form-items-formatted/currency-form-item.component", () => ({
 }));
 
 vi.mock("../layout-form-row/layout-form-row.component", () => ({
-  default: ({ title, extra, children }) => (
+  default: ({ title, extra, actions, children }) => (
     <div>
       {title}
       {extra}
       {children}
+      {actions}
     </div>
   )
 }));
@@ -144,7 +151,7 @@ const addBaseTeamMember = ({ employeeId = "emp-1", percentage = 100, rate = 25 }
   fireEvent.change(screen.getByLabelText("Employee"), {
     target: { value: employeeId }
   });
-  fireEvent.change(screen.getByRole("spinbutton", { name: "Allocation %" }), {
+  fireEvent.change(screen.getByRole("spinbutton", { name: "Allocation" }), {
     target: { value: String(percentage) }
   });
   fillHourlyRates(rate);
@@ -211,7 +218,7 @@ describe("ShopEmployeeTeamsFormComponent", () => {
       rate: 27.5
     });
 
-    fireEvent.click(screen.getByRole("button", { name: "Save" }));
+    fireEvent.click(screen.getByRole("button", { name: "Save Employee Team" }));
 
     await waitFor(() => {
       expect(insertEmployeeTeamMock).toHaveBeenCalledWith({

client/src/components/shop-teams/shop-employee-teams.list.jsx

@@ -2,20 +2,47 @@ import { Button } from "antd";
 import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import { useLocation, useNavigate } from "react-router-dom";
+import ConfigListEmptyState from "../layout-form-row/config-list-empty-state.component.jsx";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 
-export default function ShopEmployeeTeamsListComponent({ loading, employee_teams }) {
+export default function ShopEmployeeTeamsListComponent({
+  loading,
+  employee_teams,
+  onRequestTeamChange,
+  selectedTeamId
+}) {
   const { t } = useTranslation();
   const history = useNavigate();
   const search = queryString.parse(useLocation().search);
 
+  const navigateToTeam = (employeeTeamId) => {
+    if (onRequestTeamChange) {
+      onRequestTeamChange(employeeTeamId);
+      return;
+    }
+
+    history({
+      search: queryString.stringify({
+        ...search,
+        employeeTeamId
+      })
+    });
+  };
+
+  const clearTeamSelection = () => {
+    const { employeeTeamId, ...nextSearch } = search;
+    void employeeTeamId;
+    history({
+      search: queryString.stringify(nextSearch)
+    });
+  };
+
   const handleOnRowClick = (record) => {
     if (record) {
-      search.employeeTeamId = record.id;
-      history({ search: queryString.stringify(search) });
+      navigateToTeam(record.id);
     } else {
-      delete search.employeeTeamId;
-      history({ search: queryString.stringify(search) });
+      clearTeamSelection();
     }
   };
   const columns = [
@@ -27,43 +54,38 @@ export default function ShopEmployeeTeamsListComponent({ loading, employee_teams
   ];
 
   return (
-    <div>
-      <ResponsiveTable
-        title={() => {
-          return (
-            <Button
-              type="primary"
-              onClick={() => {
-                search.employeeTeamId = "new";
-                history({ search: queryString.stringify(search) });
-              }}
-            >
-              {t("employee_teams.actions.new")}
-            </Button>
-          );
-        }}
-        loading={loading}
-        pagination={{ placement: "top" }}
-        columns={columns}
-        mobileColumnKeys={["name"]}
-        rowKey="id"
-        dataSource={employee_teams}
-        rowSelection={{
-          onSelect: (props) => {
-            search.employeeTeamId = props.id;
-            history({ search: queryString.stringify(search) });
-          },
-          type: "radio",
-          selectedRowKeys: [search.employeeTeamId]
-        }}
-        onRow={(record) => {
-          return {
-            onClick: () => {
-              handleOnRowClick(record);
-            }
-          };
-        }}
-      />
-    </div>
+    <LayoutFormRow
+      title={t("bodyshop.labels.employee_teams")}
+      actions={[
+        <Button key="new-team" type="primary" block onClick={() => navigateToTeam("new")}>
+          {t("employee_teams.actions.new")}
+        </Button>
+      ]}
+    >
+      {employee_teams.length === 0 ? (
+        <ConfigListEmptyState actionLabel={t("employee_teams.actions.new")} />
+      ) : (
+        <ResponsiveTable
+          loading={loading}
+          pagination={{ placement: "top" }}
+          columns={columns}
+          mobileColumnKeys={["name"]}
+          rowKey="id"
+          dataSource={employee_teams}
+          rowSelection={{
+            onSelect: (props) => navigateToTeam(props.id),
+            type: "radio",
+            selectedRowKeys: [selectedTeamId || search.employeeTeamId]
+          }}
+          onRow={(record) => {
+            return {
+              onClick: () => {
+                handleOnRowClick(record);
+              }
+            };
+          }}
+        />
+      )}
+    </LayoutFormRow>
   );
 }

client/src/components/shop-teams/shop-teams.container.jsx

@@ -1,36 +1,70 @@
+import { Form } from "antd";
 import { useQuery } from "@apollo/client/react";
+import queryString from "query-string";
 import { connect } from "react-redux";
+import { useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_TEAMS } from "../../graphql/employee_teams.queries";
+import useConfirmDirtyFormNavigation from "../../hooks/useConfirmDirtyFormNavigation.jsx";
 import AlertComponent from "../alert/alert.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import ShopEmployeeTeamsListComponent from "./shop-employee-teams.list";
 import ShopEmployeeTeamsFormComponent from "./shop-employee-teams.form.component";
-import { Col, Row } from "antd";
+import "./shop-teams.styles.scss";
 
 const mapStateToProps = createStructuredSelector({});
 
 function ShopTeamsContainer() {
+  const [form] = Form.useForm();
+  const [isTeamFormDirty, setIsTeamFormDirty] = useState(false);
+  const navigate = useNavigate();
+  const search = queryString.parse(useLocation().search);
   const { loading, error, data } = useQuery(QUERY_TEAMS, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
+  const hasSelectedTeam = Boolean(search.employeeTeamId);
+  const hasDirtyTeamForm = Boolean(search.employeeTeamId) && isTeamFormDirty;
+  const confirmCloseDirtyTeam = useConfirmDirtyFormNavigation(hasDirtyTeamForm);
+
+  const navigateToTeam = (employeeTeamId) => {
+    if (employeeTeamId === search.employeeTeamId) return;
+    if (!confirmCloseDirtyTeam()) return;
+
+    setIsTeamFormDirty(false);
+    navigate({
+      search: queryString.stringify({
+        ...search,
+        employeeTeamId
+      })
+    });
+  };
 
   if (error) return <AlertComponent title={error.message} type="error" />;
 
   return (
-    <div>
-      <RbacWrapper action="employee_teams:page">
-        <Row gutter={[16, 16]}>
-          <Col span={6}>
-            <ShopEmployeeTeamsListComponent employee_teams={data ? data.employee_teams : []} loading={loading} />
-          </Col>
-          <Col span={18}>
-            <ShopEmployeeTeamsFormComponent />
-          </Col>
-        </Row>
-      </RbacWrapper>
-    </div>
+    <RbacWrapper action="employee_teams:page">
+      <div
+        className={["shop-teams-layout", hasSelectedTeam ? "shop-teams-layout--with-detail" : null]
+          .filter(Boolean)
+          .join(" ")}
+      >
+        <div className="shop-teams-layout__list">
+          <ShopEmployeeTeamsListComponent
+            employee_teams={data ? data.employee_teams : []}
+            loading={loading}
+            onRequestTeamChange={navigateToTeam}
+            selectedTeamId={search.employeeTeamId}
+          />
+        </div>
+        {hasSelectedTeam ? (
+          <div className="shop-teams-layout__details">
+            <ShopEmployeeTeamsFormComponent form={form} onDirtyChange={setIsTeamFormDirty} isDirty={isTeamFormDirty} />
+          </div>
+        ) : null}
+      </div>
+    </RbacWrapper>
   );
 }
 

client/src/components/shop-teams/shop-teams.styles.scss

@@ -0,0 +1,16 @@
+.shop-teams-layout {
+  display: grid;
+  gap: 16px;
+  align-items: start;
+}
+
+.shop-teams-layout__list,
+.shop-teams-layout__details {
+  min-width: 0;
+}
+
+@media (min-width: 1700px) {
+  .shop-teams-layout--with-detail {
+    grid-template-columns: minmax(420px, 500px) minmax(0, 1fr);
+  }
+}

client/src/components/shop-users/shop-users.component.jsx

@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { QUERY_SHOP_ASSOCIATIONS } from "../../graphql/user.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 import ShopUsersAuthEdit from "../shop-users-auth-edit/shop-users-auth-edit.component";
@@ -66,7 +67,7 @@ export function ShopInfoUsersComponent({ bodyshop }) {
     return <AlertComponent type="error" title={JSON.stringify(error)} />;
   }
   return (
-    <div>
+    <LayoutFormRow title={t("bodyshop.labels.licensing")}>
       <ResponsiveTable
         loading={loading}
         pagination={{ placement: "top" }}
@@ -75,6 +76,6 @@ export function ShopInfoUsersComponent({ bodyshop }) {
         rowKey="id"
         dataSource={data && data.associations}
       />
-    </div>
+    </LayoutFormRow>
   );
 }