RO Closer bug fixes.

client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx

@@ -1,24 +1,25 @@
-import React, { useCallback, useState } from 'react';
-import { LockOutlined } from '@ant-design/icons';
-import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { connect } from 'react-redux';
-import { createStructuredSelector } from 'reselect';
-import { selectJobReadOnly } from '../../redux/application/application.selectors';
-import { selectBodyshop } from '../../redux/user/user.selectors';
-import JobCloseRoGuardLabor from './job-close-ro-gaurd.labor';
-import JobCloseRoGuardAr from './job-close-ro-guard.ar';
-import JobCloseRoGuardBills from './job-close-ro-guard.bills';
-import JobCloseRoGuardPpd from './job-close-ro-guard.ppd';
-import JobCloseRoGuardProfit from './job-close-ro-guard.profit';
-import './job-close-ro-guard.styles.scss';
-import JobCloseRoGuardSublet from './job-close-ro-guard.sublet';
-import JobCloseRoGuardTtLifecycle from './job-close-ro-guard.tt-lifecycle';
+import React, { useCallback, useState } from "react";
+import { LockOutlined } from "@ant-design/icons";
+import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } from "antd";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobCloseRoGuardLabor from "./job-close-ro-gaurd.labor";
+import JobCloseRoGuardAr from "./job-close-ro-guard.ar";
+import JobCloseRoGuardBills from "./job-close-ro-guard.bills";
+import JobCloseRoGuardPpd from "./job-close-ro-guard.ppd";
+import JobCloseRoGuardProfit from "./job-close-ro-guard.profit";
+import "./job-close-ro-guard.styles.scss";
+import JobCloseRoGuardSublet from "./job-close-ro-guard.sublet";
+import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly,
+  jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -47,7 +48,7 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
           title={
             <Space size="small">
               <Badge count={warnings.length} />
-              {t('jobs.labels.roguardwarnings')}
+              {t("jobs.labels.roguardwarnings")}
             </Space>
           }
         >
@@ -55,8 +56,8 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
             {warnings.map((w, index) => (
               <li key={index}>
                 {bodyshop.md_ro_guard[`enforce_${w.key}`] && (
-                  <Tooltip title={t('jobs.labels.ro_guard.enforced')}>
-                    <LockOutlined style={{ color: 'tomato', marginRight: '8px' }} />
+                  <Tooltip title={t("jobs.labels.ro_guard.enforced")}>
+                    <LockOutlined style={{ color: "tomato", marginRight: "8px" }} />
                   </Tooltip>
                 )}
                 {w.warning}
@@ -67,11 +68,13 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
       )}
 
       <Collapse>
-        <Collapse.Panel forceRender key="roguard" header={t('jobs.labels.roguard')}>
+        <Collapse.Panel forceRender key="roguard" header={t("jobs.labels.roguard")}>
           <Row gutter={[32, 32]}>
-            <JobCloseRoGuardBills job={job} form={form} warningCallback={warningCallback} />
+            <Col span={24}>
+              <JobCloseRoGuardBills job={job} form={form} warningCallback={warningCallback} />
+            </Col>
             <Col className="ro-guard-col-multiple" md={24} lg={6}>
-              <Row gutter={[32, 32]} style={{ height: '100%' }}>
+              <Row gutter={[32, 32]} style={{ height: "100%" }}>
                 <Col span={24}>
                   <JobCloseRoGuardProfit
                     job={job}
@@ -85,7 +88,7 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
             </Col>
             <Col className="ro-guard-col-50" md={24} lg={8}>
               <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} />
-              <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
+              {InstanceRenderManager({ rome: <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} /> })}
             </Col>
             <Col className="ro-guard-col" md={24} lg={10}>
               <JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} />
@@ -93,128 +96,127 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
           </Row>
           <Form.Item
             name="masterbypass"
-            label={t('jobs.labels.masterbypass')}
+            label={t("jobs.labels.masterbypass")}
             rules={[
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_bills &&
-                    warnings.find((w) => w.key === 'bills')
+                    warnings.find((w) => w.key === "bills")
                   ) {
-                    return Promise.reject(t('jobs.labels.ro_guard.enforce_bills'));
+                    return Promise.reject(
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_bills")
+                      })
+                    );
                   }
                   return Promise.resolve();
-                },
+                }
               }),
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_cm &&
-                    warnings.find((w) => w.key === 'cm')
+                    warnings.find((w) => w.key === "cm")
                   ) {
                     return Promise.reject(
-                      t('translation.jobs.labels.ro_guard.enforce_validation', {
-                        message: t('jobs.labels.ro_guard.enforce_cm'),
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_cm")
                       })
                     );
                   }
                   return Promise.resolve();
-                },
+                }
               }),
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_profit &&
-                    warnings.find((w) => w.key === 'profit')
+                    warnings.find((w) => w.key === "profit")
                   ) {
                     return Promise.reject(
-                      t('translation.jobs.labels.ro_guard.enforce_validation', {
-                        message: t('jobs.labels.ro_guard.enforce_profit'),
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_profit")
                       })
                     );
                   }
                   return Promise.resolve();
-                },
+                }
               }),
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_ar &&
-                    warnings.find((w) => w.key === 'ar')
+                    warnings.find((w) => w.key === "ar")
                   ) {
                     return Promise.reject(
-                      t('translation.jobs.labels.ro_guard.enforce_validation', {
-                        message: t('jobs.labels.ro_guard.enforce_ar'),
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_ar")
                       })
                     );
                   }
                   return Promise.resolve();
-                },
+                }
               }),
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_sublet &&
-                    warnings.find((w) => w.key === 'sublet')
+                    warnings.find((w) => w.key === "sublet")
                   ) {
                     return Promise.reject(
-                      t('translation.jobs.labels.ro_guard.enforce_validation', {
-                        message: t('jobs.labels.ro_guard.enforce_sublet'),
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_sublet")
                       })
                     );
                   }
                   return Promise.resolve();
-                },
+                }
               }),
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_ppd &&
-                    warnings.find((w) => w.key === 'ppd')
+                    warnings.find((w) => w.key === "ppd")
                   ) {
                     return Promise.reject(
-                      t('translation.jobs.labels.ro_guard.enforce_validation', {
-                        message: t('jobs.labels.ro_guard.enforce_ppd'),
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_ppd")
                       })
                     );
                   }
                   return Promise.resolve();
-                },
+                }
               }),
               ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (
                     !PasswordCheck({ bodyshop, value }) &&
                     bodyshop.md_ro_guard.enforce_labor &&
-                    warnings.find((w) => w.key === 'labor')
+                    warnings.find((w) => w.key === "labor")
                   ) {
                     return Promise.reject(
-                      t('translation.jobs.labels.ro_guard.enforce_validation', {
-                        message: t('jobs.labels.ro_guard.enforce_labor'),
+                      t("jobs.labels.ro_guard.enforce_validation", {
+                        message: t("jobs.labels.ro_guard.enforce_labor")
                       })
                     );
                   }
                   return Promise.resolve();
-                },
-              }),
+                }
+              })
             ]}
           >
-            <Input
-              prefix={<LockOutlined />}
-              type="password"
-              placeholder="Password"
-              disabled={jobRO}
-            />
+            <Input prefix={<LockOutlined />} type="password" placeholder="Password" disabled={jobRO} />
           </Form.Item>
         </Collapse.Panel>
 
-        <Collapse.Panel header={t('jobs.labels.performance')}>
+        <Collapse.Panel header={t("jobs.labels.performance")}>
           <Row gutter={[32, 32]}>
             <Col className="ro-guard-col" span={24}>
               <JobCloseRoGuardTtLifecycle job={job} />