IO-2598 Restrict IOU from Tech Console

Feature/IO-1828 Beta Updates To Test

client/src/App/App.jsx

@@ -54,17 +54,10 @@ export function App({
 }) {
   const client = useClient();
 
-  // Handle The Beta Switch.
-  useEffect(() => {
-    handleBeta();
-  }, [])
-
-
   useEffect(() => {
     if (!navigator.onLine) {
       setOnline(false);
     }
-
     checkUserSession();
   }, [checkUserSession, setOnline]);
 
@@ -80,6 +73,7 @@ export function App({
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
+
   useEffect(() => {
     if (currentUser.authorized && bodyshop) {
       client.setAttribute("imexshopid", bodyshop.imexshopid);
@@ -114,6 +108,8 @@ export function App({
       />
     );
 
+  handleBeta();
+
   return (
     <Switch>
       <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>

client/src/components/job-create-iou/job-create-iou.component.jsx

@@ -7,21 +7,31 @@ import { connect } from "react-redux";
 import { useHistory } from "react-router";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINES_IOU } from "../../graphql/jobs-lines.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { CreateIouForJob } from "../jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   currentUser: selectCurrentUser,
+  technician: selectTechnician,
 });
+
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobCreateIOU);
 
-export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
+export function JobCreateIOU({
+  bodyshop,
+  currentUser,
+  job,
+  selectedJobLines,
+  technician,
+}) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
@@ -79,13 +89,19 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
       title={t("jobs.labels.createiouwarning")}
       onConfirm={handleCreateIou}
       disabled={
-        !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+        !selectedJobLines ||
+        selectedJobLines.length === 0 ||
+        !job.converted ||
+        technician
       }
     >
       <Button
         loading={loading}
         disabled={
-          !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+          !selectedJobLines ||
+          selectedJobLines.length === 0 ||
+          !job.converted ||
+          technician
         }
       >
         {t("jobs.actions.createiou")}

client/src/components/job-detail-cards/job-detail-cards.template.component.jsx

@@ -1,37 +1,15 @@
-import { Card } from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
+import { Card } from "antd";
 import { Link } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 
-const mapStateToProps = createStructuredSelector({
-  technician: selectTechnician,
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobDetailCardTemplate);
-
-export function JobDetailCardTemplate({
+export default function JobDetailCardTemplate({
   loading,
   title,
   extraLink,
-  technician,
   ...otherProps
 }) {
-  const { t } = useTranslation();
-
   let extra;
-  if (extraLink && !technician)
-    extra = {
-      extra: <Link to={extraLink}>{t("jobs.labels.cards.more")}</Link>,
-    };
+  if (extraLink) extra = { extra: <Link to={extraLink}>More</Link> };
   return (
     <Card
       size="small"

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -15,7 +15,6 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
@@ -161,35 +160,19 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
         <Card
           style={{ height: "100%" }}
           title={
-            disabled ? (
-              <>
-                {ownerTitle.length > 0
-                  ? ownerTitle
-                  : t("owner.labels.noownerinfo")}
-              </>
-            ) : (
-              <Link to={`/manage/owners/${job.owner.id}`}>
-                {ownerTitle.length > 0
-                  ? ownerTitle
-                  : t("owner.labels.noownerinfo")}
-              </Link>
-            )
+            <Link to={disabled ? "#" : `/manage/owners/${job.owner.id}`}>
+              {ownerTitle.length > 0
+                ? ownerTitle
+                : t("owner.labels.noownerinfo")}
+            </Link>
           }
         >
           <div>
             <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
-              {disabled ? (
-                <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
-              ) : (
-                <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
-              )}
+              <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
             </DataLabel>
             <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
-              {disabled ? (
-                <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
-              ) : (
-                <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
-              )}
+              <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
             </DataLabel>
             <DataLabel key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -197,11 +180,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
             </DataLabel>
             <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
-              {disabled ? (
-                <>{job.ownr_ea || ""}</>
-              ) : job.ownr_ea ? (
-                <a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
-              ) : null}
+              {job.ownr_ea || ""}
             </DataLabel>
             {job.owner?.tax_number && (
               <DataLabel key="5" label={t("owners.fields.tax_number")}>
@@ -216,19 +195,17 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
           style={{ height: "100%" }}
           title={
             job.vehicle ? (
-              disabled ? (
-                <>
-                  {vehicleTitle.length > 0
-                    ? vehicleTitle
-                    : t("vehicles.labels.novehinfo")}{" "}
-                </>
-              ) : (
-                <Link to={job.vehicle && `/manage/vehicles/${job.vehicle.id}`}>
-                  {vehicleTitle.length > 0
-                    ? vehicleTitle
-                    : t("vehicles.labels.novehinfo")}
-                </Link>
-              )
+              <Link
+                to={
+                  disabled
+                    ? "#"
+                    : job.vehicle && `/manage/vehicles/${job.vehicle.id}`
+                }
+              >
+                {vehicleTitle.length > 0
+                  ? vehicleTitle
+                  : t("vehicles.labels.novehinfo")}
+              </Link>
             ) : (
               <span></span>
             )
@@ -246,9 +223,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               </VehicleVinDisplay>
               {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
                 job.v_vin?.length !== 17 ? (
-                  <WarningFilled
-                    style={{ color: "tomato", marginLeft: ".3rem" }}
-                  />
+                  <WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
                 ) : null
               ) : null}
             </DataLabel>
@@ -256,7 +231,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               {job.regie_number || t("general.labels.na")}
             </DataLabel>
             <DataLabel label={t("jobs.labels.relatedros")}>
-              <JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
+              <JobsRelatedRos jobid={job.id} job={job} />
             </DataLabel>
             {job.vehicle && job.vehicle.notes && (
               <DataLabel

client/src/components/jobs-related-ros/jobs-related-ros.component.jsx

@@ -2,7 +2,7 @@ import { Space, Tag } from "antd";
 import React from "react";
 import { Link } from "react-router-dom";
 
-export default function JobsRelatedRos({ jobid, job, disabled }) {
+export default function JobsRelatedRos({ jobid, job }) {
   if (!(job && job.vehicle && job.vehicle.jobs)) return null;
   return (
     <Space wrap>
@@ -10,15 +10,9 @@ export default function JobsRelatedRos({ jobid, job, disabled }) {
         .filter((j) => j.id !== job.id)
         .map((j) => (
           <Tag key={j.id}>
-            {disabled ? (
-              <>{`${j.ro_number || "N/A"}${j.clm_no ? ` | ${j.clm_no}` : ""}${
-                j.status ? ` | ${j.status}` : ""
-              }`}</>
-            ) : (
-              <Link to={`/manage/jobs/${j?.id}`}>{`${j.ro_number || "N/A"}${
-                j.clm_no ? ` | ${j.clm_no}` : ""
-              }${j.status ? ` | ${j.status}` : ""}`}</Link>
-            )}
+            <Link to={`/manage/jobs/${j?.id}`}>{`${j.ro_number || "N/A"}${
+              j.clm_no ? ` | ${j.clm_no}` : ""
+            }${j.status ? ` | ${j.status}` : ""}`}</Link>
           </Tag>
         ))}
     </Space>

client/src/components/production-list-columns/production-list-columns.data.js

@@ -76,14 +76,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       dataIndex: "ownr",
       key: "ownr",
       ellipsis: true,
-      render: (text, record) =>
-        technician ? (
-          <OwnerNameDisplay ownerObject={record} />
-        ) : (
-          <Link to={`/manage/owners/${record.ownerid}`}>
-            <OwnerNameDisplay ownerObject={record} />
-          </Link>
-        ),
+      render: (text, record) => <OwnerNameDisplay ownerObject={record} />,
       sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       sortOrder:
         state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
@@ -100,18 +93,13 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         ),
       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_color || ""
-          } ${record.plate_no || ""}`}</Link>
-        ),
+      render: (text, record) => (
+        <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>
+      ),
     },
     {
       title: i18n.t("jobs.fields.actual_in"),

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -13,14 +13,12 @@ import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import JobAtChange from "../job-at-change/job-at-change.component";
 import JobDetailCardsDocumentsComponent from "../job-detail-cards/job-detail-cards.documents.component";
 import JobDetailCardsNotesComponent from "../job-detail-cards/job-detail-cards.notes.component";
 import JobDetailCardsPartsComponent from "../job-detail-cards/job-detail-cards.parts.component";
-import CardTemplate from "../job-detail-cards/job-detail-cards.template.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 import ScoreboardAddButton from "../job-scoreboard-add-button/job-scoreboard-add-button.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
@@ -105,13 +103,7 @@ export function ProductionListDetail({
       {error && <AlertComponent error={JSON.stringify(error)} />}
       {!loading && data && (
         <div>
-          <CardTemplate
-            title={t("jobs.labels.employeeassignments")}
-            loading={loading}
-          >
-            <JobEmployeeAssignments job={data.jobs_by_pk} refetch={refetch} />
-          </CardTemplate>
-          <div style={{ height: "8px" }} />
+          <JobEmployeeAssignments job={data.jobs_by_pk} refetch={refetch} />
           <Descriptions bordered column={1}>
             <Descriptions.Item label={t("jobs.fields.ro_number")}>
               {theJob.ro_number || ""}
@@ -119,7 +111,7 @@ export function ProductionListDetail({
             <Descriptions.Item label={t("jobs.fields.alt_transport")}>
               <Space>
                 {data.jobs_by_pk.alt_transport || ""}
-                <JobAtChange job={data.jobs_by_pk} />
+                <JobAtChange event={{ job: data.jobs_by_pk }} />
               </Space>
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.clm_no")}>
@@ -129,30 +121,15 @@ export function ProductionListDetail({
               {theJob.ins_co_nm || ""}
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.owner")}>
-              <Space>
-                <OwnerNameDisplay ownerObject={theJob} />
-                {!technician ? (
-                  <>
-                    <StartChatButton
-                      phone={data.jobs_by_pk.ownr_ph1}
-                      jobid={data.jobs_by_pk.id}
-                    />
-                    <StartChatButton
-                      phone={data.jobs_by_pk.ownr_ph2}
-                      jobid={data.jobs_by_pk.id}
-                    />
-                  </>
-                ) : (
-                  <>
-                    <PhoneNumberFormatter>
-                      {data.jobs_by_pk.ownr_ph1}
-                    </PhoneNumberFormatter>
-                    <PhoneNumberFormatter>
-                      {data.jobs_by_pk.ownr_ph2}
-                    </PhoneNumberFormatter>
-                  </>
-                )}
-              </Space>
+              <OwnerNameDisplay ownerObject={theJob} />
+              <StartChatButton
+                phone={data.jobs_by_pk.ownr_ph1}
+                jobid={data.jobs_by_pk.id}
+              />
+              <StartChatButton
+                phone={data.jobs_by_pk.ownr_ph2}
+                jobid={data.jobs_by_pk.id}
+              />
             </Descriptions.Item>
             <Descriptions.Item label={t("jobs.fields.vehicle")}>
               {`${theJob.v_model_yr || ""} ${theJob.v_color || ""} ${
@@ -169,24 +146,21 @@ export function ProductionListDetail({
               <DateFormatter>{theJob.scheduled_completion}</DateFormatter>
             </Descriptions.Item>
           </Descriptions>
-          <div style={{ height: "8px" }} />
+
           <JobDetailCardsPartsComponent
             loading={loading}
             data={data ? data.jobs_by_pk : null}
           />
-          <div style={{ height: "8px" }} />
+
           <JobDetailCardsNotesComponent
             loading={loading}
             data={data ? data.jobs_by_pk : null}
           />
           {!bodyshop.uselocalmediaserver && (
-            <>
-              <div style={{ height: "8px" }} />
-              <JobDetailCardsDocumentsComponent
-                loading={loading}
-                data={data ? data.jobs_by_pk : null}
-              />
-            </>
+            <JobDetailCardsDocumentsComponent
+              loading={loading}
+              data={data ? data.jobs_by_pk : null}
+            />
           )}
         </div>
       )}

client/src/graphql/jobs.queries.js

@@ -5,7 +5,7 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
     $offset: Int
     $limit: Int
     $order: [jobs_order_by!]
-    $statuses: [String!]!
+    $statuses: [String!]!, 
     $isConverted: Boolean
   ) {
     jobs(
@@ -120,9 +120,7 @@ export const QUERY_PARTS_QUEUE = gql`
       }
     }
     jobs(
-      where: {
-        _and: [{ status: { _in: $statuses }, converted: { _eq: true } }]
-      }
+      where: { _and: [{ status: { _in: $statuses }, converted: { _eq: true } }] }
       offset: $offset
       limit: $limit
       order_by: $order
@@ -338,7 +336,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       category
       iouparent
       ro_number
-      ownerid
       ownr_fn
       ownr_ln
       ownr_co_nm

client/src/translations/en_us/common.json

@@ -1704,7 +1704,6 @@
 					"estimator": "Estimator",
 					"filehandler": "File Handler",
 					"insurance": "Insurance Details",
-					"more": "More",
 					"notes": "Notes",
 					"parts": "Parts",
 					"totals": "Totals",

client/src/translations/es/common.json

@@ -1704,7 +1704,6 @@
 					"estimator": "Estimador",
 					"filehandler": "File Handler",
 					"insurance": "detalles del seguro",
-					"more": "Más",
 					"notes": "Notas",
 					"parts": "Partes",
 					"totals": "Totales",

client/src/translations/fr/common.json

@@ -1704,7 +1704,6 @@
 					"estimator": "Estimateur",
 					"filehandler": "Gestionnaire de fichiers",
 					"insurance": "Détails de l'assurance",
-					"more": "Plus",
 					"notes": "Remarques",
 					"parts": "les pièces",
 					"totals": "Totaux",

client/src/utils/handleBeta.js

@@ -24,12 +24,14 @@ export const handleBeta = () => {
 
     // Beta is enabled, but the current host name does start with beta.
     if (isBeta && !currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href= `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 
     // Beta is not enabled, but the current host name does start with beta.
     else if (!isBeta && currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 }
 export default handleBeta;