feature/IO-3255-simplified-parts-management - Bug Fixes

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

@@ -322,7 +322,6 @@ export function JobLinesComponent({
             render: (text, record) => (
               <Space>
                 {(record.manual_line || jobIsPrivate) && !technician && (
-                  <>
                   <Button
                     disabled={jobRO}
                     onClick={() => {
@@ -334,7 +333,6 @@ export function JobLinesComponent({
                   >
                     <EditFilled />
                   </Button>
-                  </>
                 )}
                 <Button
                   title={t("tasks.buttons.create")}
@@ -350,7 +348,6 @@ export function JobLinesComponent({
                   <FaTasks />
                 </Button>
                 {(record.manual_line || jobIsPrivate) && !technician && (
-                  <>
                   <Button
                     disabled={jobRO}
                     onClick={async () => {
@@ -369,12 +366,11 @@ export function JobLinesComponent({
                       await axios.post("/job/totalsssu", {
                         id: job.id
                       });
-                        refetch && refetch();
+                      if (refetch) refetch();
                     }}
                   >
                     <DeleteFilled />
                   </Button>
-                  </>
                 )}
               </Space>
             )

client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -14,16 +14,26 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";
 
 const mapStateToProps = createStructuredSelector({
-  technician: selectTechnician
+  technician: selectTechnician,
+  isPartsEntry: selectIsPartsEntry
 });
 const mapDispatchToProps = (dispatch) => ({
   insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobLineConvertToLabor);
 
-export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail, technician, ...otherBtnProps }) {
+export function JobLineConvertToLabor({
+  children,
+  jobline,
+  job,
+  insertAuditTrail,
+  technician,
+  isPartsEntry,
+  ...otherBtnProps
+}) {
   const { t } = useTranslation();
 
   const [loading, setLoading] = useState(false);
@@ -168,7 +178,7 @@ export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail
   return (
     <>
       {children}
-      {jobline.act_price !== 0 && !technician && (
+      {!isPartsEntry && jobline.act_price !== 0 && !technician && (
         <Popover disabled={jobline.convertedtolbr} content={overlay} open={visibility} placement="bottom">
           <Tooltip title={t("joblines.actions.converttolabor")}>
             <Button