From 07a18bcd8c13559340590bdf7b48002b0ff4d220 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Mon, 1 Apr 2024 10:44:57 -0700
Subject: [PATCH] IO-2661 Rename CSR labels to Writer for Rome & PM

---
 bodyshop_translations.babel                   | 23 ++++++++++++++++++-
 client/src/components/eula/eula.component.jsx |  8 +++----
 .../feature-wrapper.component.jsx             |  2 +-
 .../job-employee-assignments.component.jsx    | 11 ++++++++-
 .../jobs-convert-button.component.jsx         |  9 +++++++-
 .../production-list-columns.data.jsx          | 23 +++++++++++--------
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 9 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index cbc7e04be..aeabb8f20 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -27170,6 +27170,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>employee_csr_writer</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>employee_prep</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/eula/eula.component.jsx b/client/src/components/eula/eula.component.jsx
index 6c6fb73b7..7399c279b 100644
--- a/client/src/components/eula/eula.component.jsx
+++ b/client/src/components/eula/eula.component.jsx
@@ -58,7 +58,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
       // Trim the values of the fields before submitting
       const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {
-        acc[key] = typeof value === "string" ? value.trim() : value;
+        acc[key] = typeof value === "string" ? value?.trim() : value;
         return acc;
       }, {});
 
@@ -140,7 +140,7 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
               {
                 required: true,
                 validator: (_, value) =>
-                  value.trim() !== "" ? Promise.resolve() : Promise.reject(new Error(t("eula.messages.first_name")))
+                  value?.trim() !== "" ? Promise.resolve() : Promise.reject(new Error(t("eula.messages.first_name")))
               }
             ]}
           >
@@ -155,7 +155,7 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
               {
                 required: true,
                 validator: (_, value) =>
-                  value.trim() !== "" ? Promise.resolve() : Promise.reject(new Error(t("eula.messages.last_name")))
+                  value?.trim() !== "" ? Promise.resolve() : Promise.reject(new Error(t("eula.messages.last_name")))
               }
             ]}
           >
@@ -172,7 +172,7 @@ const EulaFormComponent = ({ form, handleChange, onFinish, t }) => (
               {
                 required: true,
                 validator: (_, value) =>
-                  value.trim() !== "" ? Promise.resolve() : Promise.reject(new Error(t("eula.messages.business_name")))
+                  value?.trim() !== "" ? Promise.resolve() : Promise.reject(new Error(t("eula.messages.business_name")))
               }
             ]}
           >
diff --git a/client/src/components/feature-wrapper/feature-wrapper.component.jsx b/client/src/components/feature-wrapper/feature-wrapper.component.jsx
index 0b03a7d7b..4b71318b7 100644
--- a/client/src/components/feature-wrapper/feature-wrapper.component.jsx
+++ b/client/src/components/feature-wrapper/feature-wrapper.component.jsx
@@ -33,7 +33,7 @@ function FeatureWrapper({ bodyshop, featureName, noauth, children, ...restProps
 }
 
 export function HasFeatureAccess({ featureName, bodyshop }) {
-  return bodyshop?.features.allAccess || dayjs(bodyshop?.features[featureName]).isAfter(dayjs());
+  return bodyshop?.features?.allAccess || dayjs(bodyshop?.features[featureName]).isAfter(dayjs());
 }
 
 export default connect(mapStateToProps, null)(FeatureWrapper);
diff --git a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
index ea8ddb679..bfa226edb 100644
--- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -7,6 +7,7 @@ import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DataLabel from "../data-label/data-label.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -153,7 +154,15 @@ export function JobEmployeeAssignments({
             />
           )}
         </DataLabel>
-        <DataLabel label={t("jobs.fields.employee_csr")}>
+        <DataLabel
+          label={t(
+            InstanceRenderManager({
+              imex: "jobs.fields.employee_csr",
+              rome: "jobs.fields.employee_csr_writer",
+              promanager: "USE_ROME"
+            })
+          )}
+        >
           {csr ? (
             <div>
               <span>{`${csr.first_name || ""} ${csr.last_name || ""}`}</span>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index ba7bfb799..833594604 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -10,6 +10,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -147,7 +148,13 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
         {bodyshop.enforce_conversion_csr && (
           <Form.Item
             name={"employee_csr"}
-            label={t("jobs.fields.employee_csr")}
+            label={t(
+              InstanceRenderManager({
+                imex: "jobs.fields.employee_csr",
+                rome: "jobs.fields.employee_csr_writer",
+                promanager: "USE_ROME"
+              })
+            )}
             rules={[
               {
                 required: bodyshop.enforce_conversion_csr
diff --git a/client/src/components/production-list-columns/production-list-columns.data.jsx b/client/src/components/production-list-columns/production-list-columns.data.jsx
index 884c1246e..a2e30f21b 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -26,6 +26,7 @@ import ProductionListColumnStatus from "./production-list-columns.status.compone
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 import { store } from "../../redux/store";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
   const { Enhanced_Payroll } = treatments;
@@ -120,15 +121,13 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
       sortOrder: state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
       render: (text, record) =>
         technician ? (
-          <>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          } ${record.v_color || ""} ${record.plate_no || ""}`}</>
-        ) : (
-          <Link to={`/manage/vehicles/${record.vehicleid}`}>{`${
-            record.v_model_yr || ""
-          } ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${
+          <>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${record.v_model_desc || ""} ${
             record.v_color || ""
-          } ${record.plate_no || ""}`}</Link>
+          } ${record.plate_no || ""}`}</>
+        ) : (
+          <Link to={`/manage/vehicles/${record.vehicleid}`}>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          } ${record.v_color || ""} ${record.plate_no || ""}`}</Link>
         )
     },
     {
@@ -442,7 +441,13 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
       )
     },
     {
-      title: i18n.t("jobs.fields.employee_csr"),
+      title: i18n.t(
+        InstanceRenderManager({
+          imex: "jobs.fields.employee_csr",
+          rome: "jobs.fields.employee_csr_writer",
+          promanager: "USE_ROME"
+        })
+      ),
       dataIndex: "employee_csr",
       key: "employee_csr",
       sortOrder: state.sortedInfo.columnKey === "employee_csr" && state.sortedInfo.order,
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index a5930c264..804a6fc90 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1640,6 +1640,7 @@
 				"driveable": "Driveable",
 				"employee_body": "Body",
 				"employee_csr": "Customer Service Rep.",
+				"employee_csr_writer": "Writer",
 				"employee_prep": "Prep",
 				"employee_refinish": "Refinish",
 				"est_addr1": "Estimator Address",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 446507b59..06ed0e4b9 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1640,6 +1640,7 @@
 				"driveable": "",
 				"employee_body": "",
 				"employee_csr": "Representante de servicio al cliente.",
+				"employee_csr_writer": "",
 				"employee_prep": "",
 				"employee_refinish": "",
 				"est_addr1": "Dirección del tasador",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 20c614c22..120a39d8d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1640,6 +1640,7 @@
 				"driveable": "",
 				"employee_body": "",
 				"employee_csr": "représentant du service à la clientèle",
+				"employee_csr_writer": "",
 				"employee_prep": "",
 				"employee_refinish": "",
 				"est_addr1": "Adresse de l'évaluateur",