} />
@@ -74,8 +71,8 @@ export function JobsTotalsTableComponent({ jobRO, currentUser, job }) {
{JSON.stringify(
{
- CIECA: job.cieca_ttl && job.cieca_ttl.data,
- CIECASTL: job.cieca_stl && job.cieca_stl.data,
+ CIECA: job.cieca_ttl?.data,
+ CIECASTL: job.cieca_stl?.data,
ImEXCalc: job.job_totals
},
null,
diff --git a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
index e643f3e7f..d08ac925e 100644
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -1,6 +1,6 @@
import { Space, Table } from "antd";
import Dinero from "dinero.js";
-import React, { useMemo, useState } from "react";
+import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -142,16 +142,14 @@ export default function JobTotalsTableLabor({ job }) {
{t("jobs.labels.mapa")}
{InstanceRenderManager({
imex:
- job.materials &&
- job.materials.mapa &&
+ job.materials?.mapa &&
job.materials.mapa.cal_maxdlr &&
job.materials.mapa.cal_maxdlr > 0 &&
t("jobs.labels.threshhold", {
amount: job.materials.mapa.cal_maxdlr
}),
rome:
- job.materials &&
- job.materials.MAPA &&
+ job.materials?.MAPA &&
job.materials.MAPA.cal_maxdlr !== undefined &&
t("jobs.labels.threshhold", {
amount: job.materials.MAPA.cal_maxdlr
@@ -165,11 +163,9 @@ export default function JobTotalsTableLabor({ job }) {
{job.job_totals.rates.mapa.hours.toFixed(1)}
{InstanceRenderManager({
imex: (
- <>
-
- {Dinero(job.job_totals.rates.mapa.total).toFormat()}
-
-
+
+ {Dinero(job.job_totals.rates.mapa.total).toFormat()}
+
),
rome: (
<>
@@ -192,16 +188,14 @@ export default function JobTotalsTableLabor({ job }) {
{t("jobs.labels.mash")}
{InstanceRenderManager({
imex:
- job.materials &&
- job.materials.mash &&
+ job.materials?.mash &&
job.materials.mash.cal_maxdlr &&
job.materials.mash.cal_maxdlr > 0 &&
t("jobs.labels.threshhold", {
amount: job.materials.mash.cal_maxdlr
}),
rome:
- job.materials &&
- job.materials.MASH &&
+ job.materials?.MASH &&
job.materials.MASH.cal_maxdlr !== undefined &&
t("jobs.labels.threshhold", {
amount: job.materials.MASH.cal_maxdlr
@@ -215,11 +209,9 @@ export default function JobTotalsTableLabor({ job }) {
{job.job_totals.rates.mash.hours.toFixed(1)}
{InstanceRenderManager({
imex: (
- <>
-
- {Dinero(job.job_totals.rates.mash.total).toFormat()}
-
-
+
+ {Dinero(job.job_totals.rates.mash.total).toFormat()}
+
),
rome: (
<>
diff --git a/client/src/components/job-totals-table/job-totals.table.other.component.jsx b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
index 797451165..51f96d81b 100644
--- a/client/src/components/job-totals-table/job-totals.table.other.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
@@ -1,6 +1,6 @@
import { Table } from "antd";
import Dinero from "dinero.js";
-import React, { useMemo, useState } from "react";
+import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { alphaSort } from "../../utils/sorters";
diff --git a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
index bfe6e5bf2..9141ce848 100644
--- a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
@@ -1,6 +1,6 @@
import { Table } from "antd";
import Dinero from "dinero.js";
-import React, { useMemo, useState } from "react";
+import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { alphaSort } from "../../utils/sorters";
diff --git a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
index 41e49430d..c1bc373a8 100644
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -1,6 +1,6 @@
import { Table } from "antd";
import Dinero from "dinero.js";
-import React, { useMemo } from "react";
+import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -13,7 +13,7 @@ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop
});
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(JobTotalsTableTotals);
@@ -181,7 +181,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
total: job.job_totals.totals.custPayable.federal_tax
}
],
- rome: [],
+ rome: []
}),
{
key: t("jobs.fields.other_amount_payable"),
@@ -219,7 +219,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
}
];
// TODO: was removed by Patrick during a CI bug fix.
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
const columns = [
@@ -228,7 +227,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
dataIndex: "key",
key: "key",
width: "80%",
- onCell: (record, rowIndex) => {
+ onCell: (record) => {
return { style: { fontWeight: record.bold && "bold" } };
}
},
@@ -239,7 +238,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
align: "right",
render: (text, record) => (record.render ? record.render : Dinero(record.total).toFormat()),
width: "20%",
- onCell: (record, rowIndex) => {
+ onCell: (record) => {
return { style: { fontWeight: record.bold && "bold" } };
}
}
diff --git a/client/src/components/job-totals-table/jobs-totals.cash-discount-display.component.jsx b/client/src/components/job-totals-table/jobs-totals.cash-discount-display.component.jsx
index 53e973006..e5a89e23c 100644
--- a/client/src/components/job-totals-table/jobs-totals.cash-discount-display.component.jsx
+++ b/client/src/components/job-totals-table/jobs-totals.cash-discount-display.component.jsx
@@ -1,7 +1,7 @@
import { Spin } from "antd";
import axios from "axios";
import Dinero from "dinero.js";
-import React, { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -11,7 +11,7 @@ import { useNotification } from "../../contexts/Notifications/notificationContex
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
export default connect(mapStateToProps, mapDispatchToProps)(JobTotalsCashDiscount);
export function JobTotalsCashDiscount({ bodyshop, amountDinero }) {
diff --git a/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx b/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
index d7dd76c52..8596de48c 100644
--- a/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
+++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
@@ -1,4 +1,3 @@
-import React from "react";
import { EyeFilled, EyeOutlined, UserOutlined } from "@ant-design/icons";
import { Avatar, Button, Divider, List, Popover, Select, Tooltip, Typography } from "antd";
import { useTranslation } from "react-i18next";
@@ -31,7 +30,7 @@ export default function JobWatcherToggleComponent({
const handleRenderItem = (watcher) => {
// Check if watcher is defined and has user_email
- if (!watcher || !watcher.user_email) {
+ if (!watcher?.user_email) {
return null; // Skip rendering invalid watchers
}
@@ -44,6 +43,7 @@ export default function JobWatcherToggleComponent({
}
onClick={() => handleRemoveWatcher(watcher.user_email)}
@@ -67,7 +67,11 @@ export default function JobWatcherToggleComponent({
+