diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx index bfd7fe131..e8cbec5e1 100644 --- a/client/src/components/job-detail-lines/job-lines.component.jsx +++ b/client/src/components/job-detail-lines/job-lines.component.jsx @@ -462,12 +462,14 @@ export function JobLinesComponent({ )} - + {!isPartsEntry && ( + + )} {Enhanced_Payroll.treatment === "on" && ( )} diff --git a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx index 73db0c5e4..0805cbc28 100644 --- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx +++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx @@ -20,7 +20,6 @@ import { selectIsPartsEntry } from "../../redux/application/application.selector import * as Sentry from "@sentry/react"; const mapStateToProps = createStructuredSelector({ - //currentUser: selectCurrentUser bodyshop: selectBodyshop, isPartsEntry: selectIsPartsEntry }); @@ -35,6 +34,7 @@ export function SimplifiedPartsJobsListComponent({ bodyshop, refetch, loading, j const basePath = isPartsEntry ? "/parts" : "/manage"; const { t } = useTranslation(); + const columns = [ { title: t("jobs.fields.ro_number"), diff --git a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx index 916108a80..1585e8467 100644 --- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx +++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.container.jsx @@ -5,20 +5,14 @@ import { useLocation } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import AlertComponent from "../../components/alert/alert.component"; import { QUERY_SIMPLIFIED_PARTS_PAGINATED_STATUS_FILTERED } from "../../graphql/jobs.queries"; -import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions"; import { pageLimit } from "../../utils/config"; import SimplifiedPartsJobsListComponent from "./simplified-parts-jobs-list.component"; -const mapStateToProps = createStructuredSelector({ - //bodyshop: selectBodyshop, -}); +const mapStateToProps = createStructuredSelector({}); -const mapDispatchToProps = (dispatch) => ({ - setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)), - setSelectedHeader: (key) => dispatch(setSelectedHeader(key)) -}); +const mapDispatchToProps = () => ({}); -export function SimplifiedPartsJobsListContainer({ setBreadcrumbs, setSelectedHeader }) { +export function SimplifiedPartsJobsListContainer() { const searchParams = queryString.parse(useLocation().search); const { page, sortcolumn, sortorder, statusFilters } = searchParams;