From c24bfbf655a35eee4442b564c48bbea687f066cf Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 5 Sep 2025 12:31:45 -0400 Subject: [PATCH] feature/IO-3255-simplified-parts-management - Checkpoint --- .../jobs-detail-header.component.jsx | 16 ++++++++-------- .../jobs-related-ros.component.jsx | 15 +++++++++++++-- .../simplified-parts-jobs-detail.component.jsx | 2 +- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx index 4c430fba0..f631bf8ab 100644 --- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx +++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx @@ -177,7 +177,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is handleCheckboxChange("estimate_sent_approval", e.target.checked)} - disabled={disabled} + disabled={disabled || isPartsEntry} > {job.estimate_sent_approval && ( @@ -192,7 +192,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is handleCheckboxChange("estimate_approved", e.target.checked)} - disabled={disabled} + disabled={disabled || isPartsEntry} > {job.estimate_approved && ( @@ -237,7 +237,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is {ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")} ) : ( @@ -248,14 +248,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is >
- {disabled ? ( + {disabled || isPartsEntry ? ( {job.ownr_ph1} ) : ( )} - {disabled ? ( + {disabled || isPartsEntry ? ( {job.ownr_ph2} ) : ( @@ -267,7 +267,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is } ${job.ownr_st || ""} ${job.ownr_zip || ""}`} - {disabled ? ( + {disabled || isPartsEntry ? ( <>{job.ownr_ea || ""} ) : job.ownr_ea ? ( {job.ownr_ea} @@ -317,7 +317,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is - {job.vehicle && job.vehicle.notes && ( + {job.vehicle?.notes && ( )} - {job.vehicle && job.vehicle.v_paint_codes && ( + {job.vehicle?.v_paint_codes && ( {Object.keys(job.vehicle.v_paint_codes) diff --git a/client/src/components/jobs-related-ros/jobs-related-ros.component.jsx b/client/src/components/jobs-related-ros/jobs-related-ros.component.jsx index 5fccd626b..e71fbcc55 100644 --- a/client/src/components/jobs-related-ros/jobs-related-ros.component.jsx +++ b/client/src/components/jobs-related-ros/jobs-related-ros.component.jsx @@ -1,8 +1,18 @@ import { Space, Tag } from "antd"; import { Link } from "react-router-dom"; +import { createStructuredSelector } from "reselect"; +import { selectIsPartsEntry } from "../../redux/application/application.selectors.js"; +import { connect } from "react-redux"; +import getPartsBasePath from "../../utils/getPartsBasePath.js"; -export default function JobsRelatedRos({ job, disabled }) { +const mapStateToProps = createStructuredSelector({ + isPartsEntry: selectIsPartsEntry +}); + +function JobsRelatedRos({ job, disabled, isPartsEntry }) { if (!(job?.vehicle && job.vehicle.jobs)) return null; + const basePath = getPartsBasePath(isPartsEntry); + return ( {job.vehicle.jobs @@ -12,7 +22,7 @@ export default function JobsRelatedRos({ job, disabled }) { {disabled ? ( <>{`${j.ro_number || "N/A"}${j.clm_no ? ` | ${j.clm_no}` : ""}${j.status ? ` | ${j.status}` : ""}`} ) : ( - {`${j.ro_number || "N/A"}${ + {`${j.ro_number || "N/A"}${ j.clm_no ? ` | ${j.clm_no}` : "" }${j.status ? ` | ${j.status}` : ""}`} )} @@ -21,3 +31,4 @@ export default function JobsRelatedRos({ job, disabled }) { ); } +export default connect(mapStateToProps)(JobsRelatedRos); diff --git a/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx b/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx index 997865209..26a14d4cb 100644 --- a/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx +++ b/client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx @@ -133,7 +133,7 @@ export function SimplifiedPartsJobDetailComponent({ setPrintCenterContext, jobRO {job.ro_number || t("general.labels.na")}} extra={menuExtra} /> - +