diff --git a/client/package-lock.json b/client/package-lock.json index d9fb60bec..cd1ad58a2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@amplitude/analytics-browser": "^2.33.1", "@ant-design/pro-layout": "^7.22.6", - "@apollo/client": "^3.13.9", + "@apollo/client": "^4.0.12", "@emotion/is-prop-valid": "^1.4.0", "@fingerprintjs/fingerprintjs": "^4.6.1", "@firebase/analytics": "^0.10.19", @@ -27,7 +27,7 @@ "@splitsoftware/splitio-react": "^2.6.1", "@tanem/react-nprogress": "^5.0.56", "antd": "^6.1.4", - "apollo-link-logger": "^2.0.1", + "apollo-link-logger": "^3.0.0", "apollo-link-sentry": "^4.4.0", "autosize": "^6.0.1", "axios": "^1.13.2", @@ -51,7 +51,7 @@ "normalize-url": "^8.1.1", "object-hash": "^3.0.0", "phone": "^3.1.69", - "posthog-js": "^1.316.1", + "posthog-js": "^1.318.2", "prop-types": "^15.8.1", "query-string": "^9.3.1", "raf-schd": "^4.0.3", @@ -84,7 +84,7 @@ "reselect": "^5.1.1", "sass": "^1.97.2", "socket.io-client": "^4.8.3", - "styled-components": "^6.2.0", + "styled-components": "^6.3.5", "subscriptions-transport-ws": "^0.11.0", "use-memo-one": "^1.1.3", "vite-plugin-ejs": "^1.7.0", @@ -553,30 +553,30 @@ } }, "node_modules/@apollo/client": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@apollo/client/-/client-3.14.0.tgz", - "integrity": "sha512-0YQKKRIxiMlIou+SekQqdCo0ZTHxOcES+K8vKB53cIDpwABNR0P0yRzPgsbgcj3zRJniD93S/ontsnZsCLZrxQ==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@apollo/client/-/client-4.0.12.tgz", + "integrity": "sha512-CyDR+2A18TFH08rKvH3DaV63eRE0E4pj34gT8UZIQVP64bRRXnQiYuKTf/c6oJNY8+4FrCrcPwWEldnVbh02bA==", "license": "MIT", + "workspaces": [ + "dist", + "codegen", + "scripts/codemods/ac3-to-ac4" + ], "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "@wry/caches": "^1.0.0", "@wry/equality": "^0.5.6", "@wry/trie": "^0.5.0", "graphql-tag": "^2.12.6", - "hoist-non-react-statics": "^3.3.2", "optimism": "^0.18.0", - "prop-types": "^15.7.2", - "rehackt": "^0.1.0", - "symbol-observable": "^4.0.0", - "ts-invariant": "^0.10.3", - "tslib": "^2.3.0", - "zen-observable-ts": "^1.2.5" + "tslib": "^2.3.0" }, "peerDependencies": { - "graphql": "^15.0.0 || ^16.0.0", + "graphql": "^16.0.0", "graphql-ws": "^5.5.5 || ^6.0.3", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc", + "react": "^17.0.0 || ^18.0.0 || >=19.0.0-rc", + "react-dom": "^17.0.0 || ^18.0.0 || >=19.0.0-rc", + "rxjs": "^7.3.0", "subscriptions-transport-ws": "^0.9.0 || ^0.11.0" }, "peerDependenciesMeta": { @@ -4225,9 +4225,9 @@ } }, "node_modules/@posthog/types": { - "version": "1.316.1", - "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.316.1.tgz", - "integrity": "sha512-rh8GSOnmnwd0fUIBYzQcXt4WYXMg9QPkY0tE46K0eneWYVyqNYXFXzcdf2U37g+ZYNiBq9ubLeCD7h0C0MDJgw==", + "version": "1.318.2", + "resolved": "https://registry.npmjs.org/@posthog/types/-/types-1.318.2.tgz", + "integrity": "sha512-/4m1DStpyaZStTJJ4b7RyftnFoSM/IWmVBTiWvdm2e2I8A8W3D4+YY7YkTpPtTinRZEhDQEZFjhlHdDgNCiNuA==", "license": "MIT" }, "node_modules/@protobufjs/aspromise": { @@ -6805,7 +6805,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@types/unist": { @@ -7266,16 +7266,16 @@ } }, "node_modules/apollo-link-logger": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/apollo-link-logger/-/apollo-link-logger-2.0.1.tgz", - "integrity": "sha512-4KkdwCqWtlOc0vx0W/5o+UfotyZtcJZicraKNyo2KTaCmAGSJ8vDnNRyDlv6o5XtSgdv4NA36cSe6dt49OkGWA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/apollo-link-logger/-/apollo-link-logger-3.0.0.tgz", + "integrity": "sha512-7j557AndpQXqmOg6MLERh9eCGrKdQSoIzHPSU+9Umw8EnkwU+CphCXb4p22Zx6yRnYxVV7fOrqbB+4lsfloATQ==", "license": "MIT", "engines": { "node": ">= 10", "npm": "> 3" }, "peerDependencies": { - "@apollo/client": "^3.0.0" + "@apollo/client": "^4.0.0" } }, "node_modules/apollo-link-sentry": { @@ -9156,6 +9156,15 @@ "url": "https://bevry.me/fund" } }, + "node_modules/dompurify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz", + "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==", + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } + }, "node_modules/dot-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", @@ -14189,16 +14198,18 @@ "license": "MIT" }, "node_modules/posthog-js": { - "version": "1.316.1", - "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.316.1.tgz", - "integrity": "sha512-4B0PHnMZwjV9aoQRQ5OqrPa40aCVlqRx1aZMCZCbZ4Z7c91bpOJDpENGGyxFvjUoNN+f8MP8LHZBdn5DPQyWTg==", + "version": "1.318.2", + "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.318.2.tgz", + "integrity": "sha512-M5C/3HYlyNaqmCIwgGkmJLcGt5MREwsllwGLAOO3nMYhrWSjEuJnEzenplHxa/4UgwvhR4121ErzRHgK67qq1A==", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@posthog/core": "1.9.1", - "@posthog/types": "1.316.1", + "@posthog/types": "1.318.2", "core-js": "^3.38.1", + "dompurify": "^3.3.1", "fflate": "^0.4.8", "preact": "^10.19.3", + "query-selector-shadow-dom": "^1.0.1", "web-vitals": "^4.2.4" } }, @@ -14411,6 +14422,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/query-selector-shadow-dom": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/query-selector-shadow-dom/-/query-selector-shadow-dom-1.0.1.tgz", + "integrity": "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw==", + "license": "MIT" + }, "node_modules/query-string": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.3.1.tgz", @@ -15249,24 +15266,6 @@ "regjsparser": "bin/parser" } }, - "node_modules/rehackt": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/rehackt/-/rehackt-0.1.0.tgz", - "integrity": "sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "*" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "react": { - "optional": true - } - } - }, "node_modules/remark-parse": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz", @@ -16543,20 +16542,20 @@ } }, "node_modules/styled-components": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.2.0.tgz", - "integrity": "sha512-ryFCkETE++8jlrBmC+BoGPUN96ld1/Yp0s7t5bcXDobrs4XoXroY1tN+JbFi09hV6a5h3MzbcVi8/BGDP0eCgQ==", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.3.5.tgz", + "integrity": "sha512-f8jAunVw/r41o17+JlWVlMTsyBKyghCdQ84YCKPxgKSMOZJbK3CKPxeIhotz6hlXvHb0w62zG4yyOdGY0kaB3g==", "license": "MIT", "dependencies": { - "@emotion/is-prop-valid": "1.2.2", - "@emotion/unitless": "0.8.1", + "@emotion/is-prop-valid": "1.4.0", + "@emotion/unitless": "0.10.0", "@types/stylis": "4.2.7", "css-to-react-native": "3.2.0", "csstype": "3.2.3", "postcss": "8.4.49", "shallowequal": "1.1.0", "stylis": "4.3.6", - "tslib": "2.6.2" + "tslib": "2.8.1" }, "engines": { "node": ">= 16" @@ -16570,33 +16569,12 @@ "react-dom": ">= 16.8.0" } }, - "node_modules/styled-components/node_modules/@emotion/is-prop-valid": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", - "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", - "license": "MIT", - "dependencies": { - "@emotion/memoize": "^0.8.1" - } - }, - "node_modules/styled-components/node_modules/@emotion/memoize": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", - "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==", - "license": "MIT" - }, "node_modules/styled-components/node_modules/@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz", + "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==", "license": "MIT" }, - "node_modules/styled-components/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "license": "0BSD" - }, "node_modules/stylis": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz", @@ -16695,15 +16673,6 @@ "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, - "node_modules/symbol-observable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz", - "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -17038,18 +17007,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/ts-invariant": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.10.3.tgz", - "integrity": "sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==", - "license": "MIT", - "dependencies": { - "tslib": "^2.1.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", diff --git a/client/package.json b/client/package.json index 9ec598cdd..50a0c94c4 100644 --- a/client/package.json +++ b/client/package.json @@ -10,7 +10,7 @@ "dependencies": { "@amplitude/analytics-browser": "^2.33.1", "@ant-design/pro-layout": "^7.22.6", - "@apollo/client": "^3.13.9", + "@apollo/client": "^4.0.12", "@emotion/is-prop-valid": "^1.4.0", "@fingerprintjs/fingerprintjs": "^4.6.1", "@firebase/analytics": "^0.10.19", @@ -26,7 +26,7 @@ "@splitsoftware/splitio-react": "^2.6.1", "@tanem/react-nprogress": "^5.0.56", "antd": "^6.1.4", - "apollo-link-logger": "^2.0.1", + "apollo-link-logger": "^3.0.0", "apollo-link-sentry": "^4.4.0", "autosize": "^6.0.1", "axios": "^1.13.2", @@ -50,7 +50,7 @@ "normalize-url": "^8.1.1", "object-hash": "^3.0.0", "phone": "^3.1.69", - "posthog-js": "^1.316.1", + "posthog-js": "^1.318.2", "prop-types": "^15.8.1", "query-string": "^9.3.1", "raf-schd": "^4.0.3", @@ -83,7 +83,7 @@ "reselect": "^5.1.1", "sass": "^1.97.2", "socket.io-client": "^4.8.3", - "styled-components": "^6.2.0", + "styled-components": "^6.3.5", "subscriptions-transport-ws": "^0.11.0", "use-memo-one": "^1.1.3", "vite-plugin-ejs": "^1.7.0", diff --git a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx index b7853bd44..a2ab52d30 100644 --- a/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx +++ b/client/src/components/accounting-payables-table/accounting-payables-table.component.jsx @@ -176,7 +176,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref - {t("general.labels.media")} + {t("general.labels.media")} {bodyshop.uselocalmediaserver ? ( - {t("bills.labels.bill_lines")} + {t("bills.labels.bill_lines")} {Extended_Bill_Posting.treatment === "on" ? ( )} - + {t("documents.labels.upload")}
`${record.InvoiceNumber}${record.Account}`} dataSource={allocationsSummary} diff --git a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx index c985b7bd5..7aed761ba 100644 --- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx +++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx @@ -116,7 +116,7 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title, on )}
{t("jobs.actions.dms.createnewcustomer")} )} - pagination={{ position: "top" }} + pagination={{ placement: "top" }} columns={columns} rowKey={rowKey} dataSource={customerList} diff --git a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx index 6d9c05074..2cb396711 100644 --- a/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx +++ b/client/src/components/dms-customer-selector/fortellis-customer-selector.jsx @@ -90,7 +90,7 @@ export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) { )} - pagination={{ position: "top" }} + pagination={{ placement: "top" }} columns={columns} rowKey={(r) => r.customerId} dataSource={customerList} diff --git a/client/src/components/dms-customer-selector/pbs-customer-selector.jsx b/client/src/components/dms-customer-selector/pbs-customer-selector.jsx index e2717327c..43fd28b02 100644 --- a/client/src/components/dms-customer-selector/pbs-customer-selector.jsx +++ b/client/src/components/dms-customer-selector/pbs-customer-selector.jsx @@ -78,7 +78,7 @@ export default function PBSCustomerSelector({ bodyshop, socket }) { )} - pagination={{ position: "top" }} + pagination={{ placement: "top" }} columns={columns} rowKey={(r) => r.ContactId} dataSource={customerList} diff --git a/client/src/components/dms-customer-selector/rr-customer-selector.jsx b/client/src/components/dms-customer-selector/rr-customer-selector.jsx index 13d30f4c1..451e06244 100644 --- a/client/src/components/dms-customer-selector/rr-customer-selector.jsx +++ b/client/src/components/dms-customer-selector/rr-customer-selector.jsx @@ -251,7 +251,7 @@ export default function RRCustomerSelector({ )} )} - pagination={{ position: "top" }} + pagination={{ placement: "top" }} columns={columns} rowKey={(r) => r.custNo} dataSource={customerList} diff --git a/client/src/components/dms-log-events/dms-log-events.component.jsx b/client/src/components/dms-log-events/dms-log-events.component.jsx index baf4794cc..25f8c27ff 100644 --- a/client/src/components/dms-log-events/dms-log-events.component.jsx +++ b/client/src/components/dms-log-events/dms-log-events.component.jsx @@ -74,13 +74,13 @@ export function DmsLogEvents({ {/* Row 1: summary + inline "Details" toggle */} {level} - + {dayjs(timestamp).format("MM/DD/YYYY HH:mm:ss")} - + {message} {hasMeta && ( <> - + - }> + }> {job.ro_number || t("general.labels.na")} {`${job.status || ""}`} @@ -59,7 +59,7 @@ export default function GlobalSearch() { value: OwnerNameDisplayFunction(owner), label: ( - } wrap> + } wrap> @@ -79,7 +79,7 @@ export default function GlobalSearch() { value: `${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`, label: ( - }> + }> {`${vehicle.v_model_yr || ""} ${vehicle.v_make_desc || ""} ${vehicle.v_model_desc || ""}`} @@ -101,7 +101,7 @@ export default function GlobalSearch() { value: `${payment.job.ro_number} ${payment.payer} ${payment.amount}`, label: ( - }> + }> {payment.paymentnum} {payment.job.ro_number} {payment.memo || ""} @@ -121,7 +121,7 @@ export default function GlobalSearch() { value: `${bill.invoice_number} - ${bill.vendor.name}`, label: ( - }> + }> {bill.invoice_number} {bill.vendor.name} {bill.date} @@ -139,7 +139,7 @@ export default function GlobalSearch() { value: `${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`, label: ( - }> + }> {`${pb.firstname || ""} ${pb.lastname || ""} ${pb.company || ""}`} {pb.phone1} {pb.email} diff --git a/client/src/components/inventory-list/inventory-list.component.jsx b/client/src/components/inventory-list/inventory-list.component.jsx index d5a3191cf..53d6301ae 100644 --- a/client/src/components/inventory-list/inventory-list.component.jsx +++ b/client/src/components/inventory-list/inventory-list.component.jsx @@ -183,12 +183,7 @@ export function JobsList({ refetch, loading, jobs, total, setInventoryUpsertCont >
@@ -208,8 +211,10 @@ export function JobBillsTotalComponent({ @@ -242,8 +247,10 @@ export function JobBillsTotalComponent({ @@ -290,8 +297,10 @@ export function JobBillsTotalComponent({ = 0 @@ -313,8 +322,10 @@ export function JobBillsTotalComponent({ = 0 diff --git a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx index 3857ee71b..03746a709 100644 --- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx +++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx @@ -84,7 +84,7 @@ export default function JobCostingPartsTable({ data, summaryData }) { x: "50%" //y: "40rem" }} onChange={handleTableChange} - pagination={{ position: "top", defaultPageSize: pageLimit }} + pagination={{ placement: "top", defaultPageSize: pageLimit }} columns={columns} rowKey="id" dataSource={filteredData} diff --git a/client/src/components/job-detail-cards/job-detail-cards.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.component.jsx index ac94a7486..a32a5db3d 100644 --- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx +++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx @@ -154,7 +154,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTra } > - + diff --git a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx index 27e12917f..15cc00a99 100644 --- a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx +++ b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx @@ -147,7 +147,7 @@ export function JobsAvailableScan({ partnerVersion, refetch }) { >
) })} - + {t("jobs.forms.laborrates")} @@ -217,7 +217,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) { imex: , rome: ( <> - Tax Profile + Tax Profile diff --git a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component.jsx b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component.jsx index badee7414..898cf2197 100644 --- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component.jsx +++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component.jsx @@ -1,4 +1,4 @@ -import { useEffect, useState, useCallback } from "react"; +import { useCallback, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import LocalMediaGrid from "../jobs-documents-local-gallery/local-media-grid.component"; import LoadingSpinner from "../loading-spinner/loading-spinner.component"; diff --git a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx index 88bfe0dab..8f8dff516 100644 --- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx +++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx @@ -1,4 +1,4 @@ -import { useEffect, useMemo, useState, useCallback } from "react"; +import { useCallback, useEffect, useMemo, useState } from "react"; import LocalMediaGrid from "./local-media-grid.component"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; diff --git a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx index f4e6e25ee..7448f850b 100644 --- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx +++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx @@ -60,7 +60,7 @@ export function JobsDocumentsLocalGalleryReassign({ bodyshop, jobid, allMedia, g ]} name={"jobid"} > - + diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx index cf1679734..0048ecdb2 100644 --- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx +++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx @@ -190,7 +190,7 @@ export default function JobsFindModalComponent({ /> )} - pagination={{ position: "bottom" }} + pagination={{ placement: "bottom" }} columns={columns} rowKey="id" loading={jobsListLoading} diff --git a/client/src/components/layout-form-row/layout-form-row.component.jsx b/client/src/components/layout-form-row/layout-form-row.component.jsx index 52a99cd39..16e338d5e 100644 --- a/client/src/components/layout-form-row/layout-form-row.component.jsx +++ b/client/src/components/layout-form-row/layout-form-row.component.jsx @@ -4,7 +4,7 @@ import "./layout-form-row.styles.scss"; export default function LayoutFormRow({ header, children, grow = false, noDivider = false, ...restProps }) { const DividerHeader = () => !noDivider && ( - + {header} ); diff --git a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx index a4b0941ae..d6fe24aaa 100644 --- a/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx +++ b/client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx @@ -110,7 +110,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner, isPartsEntry }) { } >
- {t("parts_orders.labels.inthisorder")} + {t("parts_orders.labels.inthisorder")} {(fields, { remove, move }) => { return ( diff --git a/client/src/components/parts-queue-card/parts-queue-card.component.jsx b/client/src/components/parts-queue-card/parts-queue-card.component.jsx index 78c463523..85b351017 100644 --- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx +++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx @@ -58,7 +58,7 @@ export default function PartsQueueDetailCard() { } > - + ) : null} diff --git a/client/src/components/parts-queue-list/parts-queue.list.component.jsx b/client/src/components/parts-queue-list/parts-queue.list.component.jsx index ff47d00fb..e64a718f5 100644 --- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx +++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx @@ -289,7 +289,7 @@ export function PartsQueueListComponent({ bodyshop }) {
+
} placement="right" - width={"50%"} + width="50%" onClose={handleClose} open={selected} > @@ -199,7 +199,11 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te {!bodyshop.uselocalmediaserver && ( <>
- + )}
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx index 7e5759c3b..30b06a658 100644 --- a/client/src/components/report-center-modal/report-center-modal.component.jsx +++ b/client/src/components/report-center-modal/report-center-modal.component.jsx @@ -178,7 +178,14 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) { g.key === key).featureName} > -
    4 ? "2 auto" : "1", padding: 0, margin: 0 }}> +
      4 ? "2 auto" : "1", + padding: 0, + margin: 0 + }} + > {grouped[key].map((item) => (
    • @@ -189,7 +196,14 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
    ) : ( -
      4 ? "2 auto" : "1", padding: 0, margin: 0 }}> +
        4 ? "2 auto" : "1", + padding: 0, + margin: 0 + }} + > {grouped[key].map((item) => item.featureNameRestricted ? (
      • diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx index 18c5a3cec..ac089d986 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx @@ -224,7 +224,7 @@ export function ScheduleJobModalContainer({ email: (job && job.ownr_ea) || "", // smartDates: [], start: context.scheduled_in, - scheduled_completion: context.scheduled_completion , + scheduled_completion: context.scheduled_completion, color: context.color, alt_transport: context.alt_transport, note: context.note diff --git a/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx b/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx index a1f8d9720..55bb0b623 100644 --- a/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx +++ b/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx @@ -30,12 +30,12 @@ export function ScoreboardDayStats({ bodyshop, date, entries }) { return ( bodyHrs ? "red" : "green" }} + styles={{ content: { color: dailyBodyTarget > bodyHrs ? "red" : "green" } }} label="Body" value={bodyHrs.toFixed(1)} /> paintHrs ? "red" : "green" }} + styles={{ content: { color: dailyPaintTarget > paintHrs ? "red" : "green" } }} label="Refinish" value={paintHrs.toFixed(1)} /> diff --git a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx index d90a35b24..90e698f7b 100644 --- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx +++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx @@ -149,7 +149,7 @@ export default function ScoreboardJobsList() { onClick={(e) => e.stopPropagation()} onChange={(tableArgs) => setState((state) => ({ ...state, ...tableArgs }))} pagination={{ - position: "top", + placement: "top", pageSize: state.pageSize || pageLimit, current: state.current || 1, total: data ? data.scoreboard_aggregate.aggregate.count : 0 diff --git a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx index ee6f7279d..b5c6124ff 100644 --- a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx +++ b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx @@ -1,4 +1,4 @@ -import { Card, Col, Form, Row, Space, Statistic, Switch, Typography } from "antd"; +import { Card, Col, Row, Space, Statistic, Switch, Typography } from "antd"; import dayjs from "../../utils/day"; import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -41,9 +41,10 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { + + {t("general.labels.tvmode")} setIsLarge(!isLarge)} defaultChecked={isLarge} /> - + } > @@ -60,15 +61,17 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
= - bodyshop.scoreboard_target.dailyBodyTarget + - bodyshop.scoreboard_target.dailyPaintTarget - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.seperatedThisWeek[day].total) >= + bodyshop.scoreboard_target.dailyBodyTarget + + bodyshop.scoreboard_target.dailyPaintTarget + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -78,14 +81,16 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={data.seperatedThisWeek[day].lab} - valueStyle={{ - color: - parseFloat(data.seperatedThisWeek[day].lab) >= - bodyshop.scoreboard_target.dailyBodyTarget - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.seperatedThisWeek[day].lab) >= + bodyshop.scoreboard_target.dailyBodyTarget + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -93,14 +98,16 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={data.seperatedThisWeek[day].lar} - valueStyle={{ - color: - parseFloat(data.seperatedThisWeek[day].lar) >= - bodyshop.scoreboard_target.dailyPaintTarget - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.seperatedThisWeek[day].lar) >= + bodyshop.scoreboard_target.dailyPaintTarget + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -122,25 +129,27 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { = - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyBodyTarget, - dayjs().startOf("week"), - dayjs().endOf("week"), - bodyshop - ) + + styles={{ + content: { + color: + parseFloat(data.totalThisWeek) >= Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyPaintTarget, + bodyshop.scoreboard_target.dailyBodyTarget, dayjs().startOf("week"), dayjs().endOf("week"), bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + ) + + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyPaintTarget, + dayjs().startOf("week"), + dayjs().endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -150,19 +159,21 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={data.totalThisWeekLAB} - valueStyle={{ - color: - parseFloat(data.totalThisWeekLAB) >= - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyBodyTarget, - dayjs().startOf("week"), - dayjs().endOf("week"), - bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalThisWeekLAB) >= + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyBodyTarget, + dayjs().startOf("week"), + dayjs().endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -170,19 +181,21 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={data.totalThisWeekLAR} - valueStyle={{ - color: - parseFloat(data.totalThisWeekLAR) >= - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyPaintTarget, - dayjs().startOf("week"), - dayjs().endOf("week"), - bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalThisWeekLAR) >= + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyPaintTarget, + dayjs().startOf("week"), + dayjs().endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -196,25 +209,27 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { = - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyBodyTarget, - dayjs().subtract(1, "week").startOf("week"), - dayjs().subtract(1, "week").endOf("week"), - bodyshop - ) + + styles={{ + content: { + color: + parseFloat(data.totalLastWeek) >= Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyPaintTarget, + bodyshop.scoreboard_target.dailyBodyTarget, dayjs().subtract(1, "week").startOf("week"), dayjs().subtract(1, "week").endOf("week"), bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + ) + + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyPaintTarget, + dayjs().subtract(1, "week").startOf("week"), + dayjs().subtract(1, "week").endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -224,19 +239,21 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={data.totalLastWeekLAB} - valueStyle={{ - color: - parseFloat(data.totalLastWeekLAB) >= - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyBodyTarget, - dayjs().subtract(1, "week").startOf("week"), - dayjs().subtract(1, "week").endOf("week"), - bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalLastWeekLAB) >= + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyBodyTarget, + dayjs().subtract(1, "week").startOf("week"), + dayjs().subtract(1, "week").endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -244,19 +261,21 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={data.totalLastWeekLAR} - valueStyle={{ - color: - parseFloat(data.totalLastWeekLAR) >= - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyPaintTarget, - dayjs().subtract(1, "week").startOf("week"), - dayjs().subtract(1, "week").endOf("week"), - bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalLastWeekLAR) >= + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyPaintTarget, + dayjs().subtract(1, "week").startOf("week"), + dayjs().subtract(1, "week").endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -270,25 +289,27 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { = - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyBodyTarget, - dayjs().subtract(2, "week").startOf("week"), - dayjs().subtract(2, "week").endOf("week"), - bodyshop - ) + + styles={{ + content: { + color: + parseFloat(data.totalPriorWeek) >= Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyPaintTarget, + bodyshop.scoreboard_target.dailyBodyTarget, dayjs().subtract(2, "week").startOf("week"), dayjs().subtract(2, "week").endOf("week"), bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + ) + + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyPaintTarget, + dayjs().subtract(2, "week").startOf("week"), + dayjs().subtract(2, "week").endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -298,19 +319,21 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={data.totalPriorWeekLAB} - valueStyle={{ - color: - parseFloat(data.totalPriorWeekLAB) >= - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyBodyTarget, - dayjs().subtract(2, "week").startOf("week"), - dayjs().subtract(2, "week").endOf("week"), - bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalPriorWeekLAB) >= + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyBodyTarget, + dayjs().subtract(2, "week").startOf("week"), + dayjs().subtract(2, "week").endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -318,19 +341,21 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={data.totalPriorWeekLAR} - valueStyle={{ - color: - parseFloat(data.totalPriorWeekLAR) >= - Util.WeeklyTargetHrsInPeriod( - bodyshop.scoreboard_target.dailyPaintTarget, - dayjs().subtract(2, "week").startOf("week"), - dayjs().subtract(2, "week").endOf("week"), - bodyshop - ) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalPriorWeekLAR) >= + Util.WeeklyTargetHrsInPeriod( + bodyshop.scoreboard_target.dailyPaintTarget, + dayjs().subtract(2, "week").startOf("week"), + dayjs().subtract(2, "week").endOf("week"), + bodyshop + ) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -347,15 +372,17 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { = - Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) + - Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalThisMonth) >= + Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) + + Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -365,14 +392,16 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={data.totalThisMonthLAB} - valueStyle={{ - color: - parseFloat(data.totalThisMonthLAB) >= - Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalThisMonthLAB) >= + Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -380,14 +409,16 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={data.totalThisMonthLAR} - valueStyle={{ - color: - parseFloat(data.totalThisMonthLAR) >= - Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalThisMonthLAR) >= + Util.MonthlyTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -401,15 +432,17 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { = - Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) + - Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalLastMonth) >= + Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) + + Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -419,14 +452,16 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={data.totalLastMonthLAB} - valueStyle={{ - color: - parseFloat(data.totalLastMonthLAB) >= - Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalLastMonthLAB) >= + Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyBodyTarget, bodyshop) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -434,14 +469,16 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={data.totalLastMonthLAR} - valueStyle={{ - color: - parseFloat(data.totalLastMonthLAR) >= - Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) - ? "green" - : "red", - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + color: + parseFloat(data.totalLastMonthLAR) >= + Util.LastMonthTargetHrs(bodyshop.scoreboard_target.dailyPaintTarget, bodyshop) + ? "green" + : "red", + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -455,9 +492,11 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { @@ -467,9 +506,11 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.body")}} value={`${data.totalEffieciencyOverPeriodLAB || 0}%`} - valueStyle={{ - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -477,9 +518,11 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.refinish")}} value={`${data.totalEffieciencyOverPeriodLAR || 0}%`} - valueStyle={{ - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> @@ -492,9 +535,11 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { @@ -504,9 +549,11 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) { {t("scoreboard.labels.totalhrs")}} value={jobData.tthrs} - valueStyle={{ - fontSize: statisticSize, - fontWeight: statisticWeight + styles={{ + content: { + fontSize: statisticSize, + fontWeight: statisticWeight + } }} /> diff --git a/client/src/components/shop-employees/shop-employees-list.component.jsx b/client/src/components/shop-employees/shop-employees-list.component.jsx index f666b899e..acbea5fd0 100644 --- a/client/src/components/shop-employees/shop-employees-list.component.jsx +++ b/client/src/components/shop-employees/shop-employees-list.component.jsx @@ -104,7 +104,7 @@ export default function ShopEmployeesListComponent({ loading, employees }) { ); }} loading={loading} - pagination={{ position: "top" }} + pagination={{ placement: "top" }} columns={columns} rowKey="id" dataSource={employees} diff --git a/client/src/components/shop-info/shop-info.scheduling.component.jsx b/client/src/components/shop-info/shop-info.scheduling.component.jsx index 8b09e99e5..f5d6026df 100644 --- a/client/src/components/shop-info/shop-info.scheduling.component.jsx +++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx @@ -100,7 +100,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
- +
{ setIsConnected(false); } }; - }, [ - bodyshop, - notification, - userAssociationId, - markNotificationRead, - markAllNotificationsRead, - navigate, - currentUser, - Realtime_Notifications_UI, - t - ]); + }, [bodyshop?.id, userAssociationId, Realtime_Notifications_UI?.treatment]); return ( - + diff --git a/client/src/pages/export-logs/export-logs.page.component.jsx b/client/src/pages/export-logs/export-logs.page.component.jsx index fb19c1812..7c86bd922 100644 --- a/client/src/pages/export-logs/export-logs.page.component.jsx +++ b/client/src/pages/export-logs/export-logs.page.component.jsx @@ -190,7 +190,7 @@ export function ExportLogsPageComponent() {
- + - + diff --git a/client/src/pages/phonebook/phonebook.page.component.jsx b/client/src/pages/phonebook/phonebook.page.component.jsx index 023d3ad5e..606696e67 100644 --- a/client/src/pages/phonebook/phonebook.page.component.jsx +++ b/client/src/pages/phonebook/phonebook.page.component.jsx @@ -176,7 +176,7 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
{job.ro_number || t("general.labels.na")}} extra={menuExtra} /> - + - +