Merged in feature/IO-3578-Fortellis-Regex-Fix (pull request #3042)

IO-3578 Fortellis Regex Fix

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -21,7 +21,6 @@ import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
 import JobEmployeeAssignmentsContainer from "./../job-employee-assignments/job-employee-assignments.container";
-import { PayrollLaborAllocationsTable } from "../labor-allocations-table/labor-allocations-table.payroll.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -50,7 +49,7 @@ export function TimeTicketModalComponent({
     splitKey: bodyshop.imexshopid
   });
 
-  const [loadLineTicketData, { loading, data: lineTicketData, refetch }] = useLazyQuery(GET_LINE_TICKET_BY_PK, {
+  const [loadLineTicketData, { loading, data: lineTicketData }] = useLazyQuery(GET_LINE_TICKET_BY_PK, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
@@ -321,34 +320,13 @@ export function TimeTicketModalComponent({
         </Form.Item>
       </LayoutFormRow>
 
-      <LaborAllocationContainer
-        jobid={watchedJobId || null}
-        loading={loading}
-        lineTicketData={lineTicketData}
-        bodyshop={bodyshop}
-        refetch={refetch}
-      />
+      <LaborAllocationContainer jobid={watchedJobId || null} loading={loading} lineTicketData={lineTicketData} />
     </div>
   );
 }
 
-export function LaborAllocationContainer({
-  jobid,
-  loading,
-  lineTicketData,
-  hideTimeTickets = false,
-  bodyshop,
-  refetch
-}) {
+export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideTimeTickets = false }) {
   const { t } = useTranslation();
-  const {
-    treatments: { Enhanced_Payroll }
-  } = useTreatmentsWithConfig({
-    attributes: {},
-    names: ["Enhanced_Payroll"],
-    splitKey: bodyshop.imexshopid
-  });
-
   if (loading) return <LoadingSkeleton />;
   if (!lineTicketData) return null;
   if (!jobid) return null;
@@ -359,23 +337,12 @@ export function LaborAllocationContainer({
         <JobEmployeeAssignmentsContainer job={lineTicketData.jobs_by_pk} />
       </Card>
 
-      {Enhanced_Payroll.treatment === "on" ? (
-        <PayrollLaborAllocationsTable
-          jobId={jobid}
-          joblines={lineTicketData.joblines}
-          timetickets={lineTicketData.timetickets}
-          adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
-          refetch={refetch}
-          bodyshop={bodyshop}
-        />
-      ) : (
-        <LaborAllocationsTable
-          jobId={jobid}
-          joblines={lineTicketData.joblines}
-          timetickets={lineTicketData.timetickets}
-          adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
-        />
-      )}
+      <LaborAllocationsTable
+        jobId={jobid}
+        joblines={lineTicketData.joblines}
+        timetickets={lineTicketData.timetickets}
+        adjustments={lineTicketData.jobs_by_pk.lbr_adjustments}
+      />
 
       {!hideTimeTickets && (
         <TimeTicketList loading={loading} timetickets={jobid ? lineTicketData.timetickets : []} techConsole />

server/fortellis/fortellis.js

@@ -14,7 +14,7 @@ const {
 const _ = require("lodash");
 const moment = require("moment-timezone");
 
-const replaceSpecialRegex = /[^a-zA-Z0-9 .,\n #]+/g;
+const replaceSpecialRegex = /[^a-zA-Z0-9 ]+/g;
 
 // Helper function to handle FortellisApiError logging
 function handleFortellisApiError(socket, error, functionName, additionalDetails = {}) {