IO-3464 Document Edit

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -19,35 +19,30 @@ const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone))
 });
 
-export function ChatOpenButton({ bodyshop, searchingForConversation, phone, type, jobid, openChatByPhone }) {
+export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
   const { t } = useTranslation();
   const { socket } = useSocket();
   const notification = useNotification();
 
   if (!phone) return <></>;
 
-  if (!bodyshop.messagingservicesid) {
-    return <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>;
-  }
+  if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
 
   return (
     <a
       href="# "
       onClick={(e) => {
-        e.preventDefault();
         e.stopPropagation();
-
-        if (searchingForConversation) return; // Prevent finding the same thing twice.
-
         const p = parsePhoneNumber(phone, "CA");
+        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
         } else {
           notification["error"]({ message: t("messaging.error.invalidphone") });
         }
       }}
     >
-      <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>
+      <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>
     </a>
   );
 }

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -133,9 +133,6 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       ownr_ln: contract.job.owner.ownr_ln,
       ownr_co_nm: contract.job.owner.ownr_co_nm,
       ownr_ph1: contract.job.owner.ownr_ph1,
-      ownr_ph2: contract.job.owner.ownr_ph2,
-      ownr_ph1_ty: contract.job.owner.ownr_ph1_ty,
-      ownr_ph2_ty: contract.job.owner.ownr_ph2_ty,
       ownr_ea: contract.job.owner.ownr_ea,
       v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
       v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,

client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx

@@ -256,9 +256,9 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
 
-          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -397,8 +397,6 @@ export const DashboardScheduledDeliveryTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       production_vars
       ro_number
       scheduled_delivery

client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx

@@ -48,8 +48,6 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
         ownr_ln: item.job.ownr_ln,
         ownr_ph1: item.job.ownr_ph1,
         ownr_ph2: item.job.ownr_ph2,
-        ownr_ph1_ty: item.job.ownr_ph1_ty,
-        ownr_ph2_ty: item.job.ownr_ph2_ty,
         production_vars: item.job.production_vars,
         ro_number: item.job.ro_number,
         suspended: item.job.suspended,
@@ -266,8 +264,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -402,8 +400,6 @@ export const DashboardScheduledInTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       production_vars
       ro_number
       suspended

client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx

@@ -256,9 +256,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
 
-          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -397,8 +397,6 @@ export const DashboardScheduledOutTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       production_vars
       ro_number
       scheduled_completion

client/src/components/document-editor/document-editor-local.component.jsx

@@ -0,0 +1,166 @@
+import axios from "axios";
+import { Result } from "antd";
+import * as markerjs2 from "markerjs2";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { handleUpload } from "../documents-local-upload/documents-local-upload.utility";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = () => ({});
+
+export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
+  const imgRef = useRef(null);
+  const [loading, setLoading] = useState(false);
+  const [uploaded, setuploaded] = useState(false);
+  const [loadedImageUrl, setLoadedImageUrl] = useState(null);
+  const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageLoading, setImageLoading] = useState(true);
+  const markerArea = useRef(null);
+  const { t } = useTranslation();
+  const notification = useNotification();
+  const [uploading, setUploading] = useState(false);
+
+  const triggerUpload = useCallback(
+    async (dataUrl) => {
+      if (uploading) return;
+      setUploading(true);
+      const blob = await b64toBlob(dataUrl);
+      const nameWithoutExt = filename.split(".").slice(0, -1).join(".").trim();
+      const parts = nameWithoutExt.split("-");
+      const baseParts = [];
+      for (let i = 0; i < parts.length; i++) {
+        if (/^\d+$/.test(parts[i])) {
+          break;
+        }
+        baseParts.push(parts[i]);
+      }
+      const adjustedBase = baseParts.length > 0 ? baseParts.join("-") : "edited";
+      const adjustedFilename = `${adjustedBase}.jpg`;
+      const file = new File([blob], adjustedFilename, { type: "image/jpeg" });
+
+      handleUpload({
+        ev: {
+          file: file,
+          filename: adjustedFilename,
+          onSuccess: () => {
+            setUploading(false);
+            setLoading(false);
+            setuploaded(true);
+          },
+          onError: () => {
+            setUploading(false);
+            setLoading(false);
+          }
+        },
+        context: {
+          jobid: jobid,
+          callback: () => {} // Optional callback
+        },
+        notification
+      });
+    },
+    [filename, jobid, notification, uploading]
+  );
+
+  useEffect(() => {
+    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
+      // create a marker.js MarkerArea
+      markerArea.current = new markerjs2.MarkerArea(imgRef.current);
+
+      // attach an event handler to assign annotated image back to our image element
+      markerArea.current.addEventListener("close", () => {
+        // NO OP
+      });
+
+      markerArea.current.addEventListener("render", (event) => {
+        const dataUrl = event.dataUrl;
+        imgRef.current.src = dataUrl;
+        markerArea.current.close();
+        triggerUpload(dataUrl);
+      });
+      // launch marker.js
+
+      markerArea.current.renderAtNaturalSize = true;
+      markerArea.current.renderImageType = "image/jpeg";
+      markerArea.current.renderImageQuality = 1;
+      //markerArea.current.settings.displayMode = "inline";
+      markerArea.current.show();
+    }
+  }, [triggerUpload, imageLoaded]);
+
+  useEffect(() => {
+    if (!imageUrl) return;
+    const controller = new AbortController();
+
+    const loadImage = async () => {
+      setImageLoaded(false);
+      setImageLoading(true);
+      try {
+        const response = await axios.get(imageUrl, { responseType: "blob", signal: controller.signal });
+        const blobUrl = URL.createObjectURL(response.data);
+        setLoadedImageUrl((prevUrl) => {
+          if (prevUrl) URL.revokeObjectURL(prevUrl);
+          return blobUrl;
+        });
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") {
+          // request was aborted — safe to ignore
+          return;
+        }
+        console.error("Failed to fetch image blob", error);
+      } finally {
+        if (!controller.signal.aborted) {
+          setImageLoading(false);
+        }
+      }
+    };
+    loadImage();
+    return () => {
+      controller.abort();
+    };
+  }, [imageUrl]);
+
+  useEffect(() => {
+    return () => {
+      if (loadedImageUrl) {
+        URL.revokeObjectURL(loadedImageUrl);
+      }
+    };
+  }, [loadedImageUrl]);
+
+  async function b64toBlob(url) {
+    const res = await fetch(url);
+    return await res.blob();
+  }
+
+  return (
+    <div>
+      {!loading && !uploaded && loadedImageUrl && (
+        <img
+          ref={imgRef}
+          src={loadedImageUrl}
+          alt="sample"
+          onLoad={() => setImageLoaded(true)}
+          onError={(error) => {
+            console.error("Failed to load image", error);
+          }}
+          style={{ maxWidth: "90vw", maxHeight: "90vh" }}
+        />
+      )}
+      {(loading || imageLoading || !imageLoaded) && !uploaded && (
+        <LoadingSpinner message={t("documents.labels.uploading")} />
+      )}
+      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(DocumentEditorLocalComponent);

client/src/components/document-editor/document-editor.component.jsx

@@ -1,4 +1,5 @@
 //import "tui-image-editor/dist/tui-image-editor.css";
+import axios from "axios";
 import { Result } from "antd";
 import * as markerjs2 from "markerjs2";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -6,8 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { handleUpload } from "../documents-upload/documents-upload.utility";
-import { GenerateSrcUrl } from "../jobs-documents-gallery/job-documents.utility";
+import { handleUpload } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility.js";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
@@ -23,6 +23,9 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   const imgRef = useRef(null);
   const [loading, setLoading] = useState(false);
   const [uploaded, setuploaded] = useState(false);
+  const [imageUrl, setImageUrl] = useState(null);
+  const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageLoading, setImageLoading] = useState(true);
   const markerArea = useRef(null);
   const { t } = useTranslation();
   const notification = useNotification();
@@ -55,7 +58,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   );
 
   useEffect(() => {
-    if (imgRef.current !== null) {
+    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
       // create a marker.js MarkerArea
       markerArea.current = new markerjs2.MarkerArea(imgRef.current);
 
@@ -78,7 +81,52 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
       //markerArea.current.settings.displayMode = "inline";
       markerArea.current.show();
     }
-  }, [triggerUpload]);
+  }, [triggerUpload, imageLoaded]);
+
+  useEffect(() => {
+    if (!document?.id) return;
+    const controller = new AbortController();
+
+    const loadImage = async () => {
+      setImageLoaded(false);
+      setImageLoading(true);
+      try {
+        const response = await axios.post(
+          "/media/imgproxy/original",
+          { documentId: document.id },
+          {
+            responseType: "blob",
+            signal: controller.signal
+          }
+        );
+        const blobUrl = URL.createObjectURL(response.data);
+        setImageUrl((prevUrl) => {
+          if (prevUrl) URL.revokeObjectURL(prevUrl);
+          return blobUrl;
+        });
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") {
+          // request was aborted — safe to ignore
+          return;
+        }
+        console.error("Failed to fetch original image blob", error);
+      } finally {
+        setImageLoading(false);
+      }
+    };
+    loadImage();
+    return () => {
+      controller.abort();
+    };
+  }, [document]);
+
+  useEffect(() => {
+    return () => {
+      if (imageUrl) {
+        URL.revokeObjectURL(imageUrl);
+      }
+    };
+  }, [imageUrl]);
 
   async function b64toBlob(url) {
     const res = await fetch(url);
@@ -87,16 +135,21 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
 
   return (
     <div>
-      {!loading && !uploaded && (
+      {!loading && !uploaded && imageUrl && (
         <img
           ref={imgRef}
-          src={GenerateSrcUrl(document)}
+          src={imageUrl}
           alt="sample"
-          crossOrigin="anonymous"
+          onLoad={() => setImageLoaded(true)}
+          onError={(error) => {
+            console.error("Failed to load original image", error);
+          }}
           style={{ maxWidth: "90vw", maxHeight: "90vh" }}
         />
       )}
-      {loading && <LoadingSpinner message={t("documents.labels.uploading")} />}
+      {(loading || imageLoading || !imageLoaded) && !uploaded && (
+        <LoadingSpinner message={t("documents.labels.uploading")} />
+      )}
       {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
     </div>
   );

client/src/components/document-editor/document-editor.container.jsx

@@ -11,6 +11,7 @@ import { setBodyshop } from "../../redux/user/user.actions";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import DocumentEditor from "./document-editor.component";
+import { DocumentEditorLocalComponent } from "./document-editor-local.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBodyshop: (bs) => dispatch(setBodyshop(bs))
@@ -21,7 +22,7 @@ export default connect(null, mapDispatchToProps)(DocumentEditorContainer);
 export function DocumentEditorContainer({ setBodyshop }) {
   //Get the image details for the image to be saved.
   //Get the document id from the search string.
-  const { documentId } = queryString.parse(useLocation().search);
+  const { documentId, imageUrl, filename, jobid } = queryString.parse(useLocation().search);
   const { t } = useTranslation();
   const {
     loading: loadingShop,
@@ -32,24 +33,45 @@ export function DocumentEditorContainer({ setBodyshop }) {
     nextFetchPolicy: "network-only"
   });
 
-  useEffect(() => {
-    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
-  }, [dataShop, setBodyshop]);
+  const isLocalMedia = !!dataShop?.bodyshops?.[0]?.uselocalmediaserver;
 
-  const { loading, error, data } = useQuery(GET_DOCUMENT_BY_PK, {
+  const {
+    loading: loadingDoc,
+    error: errorDoc,
+    data: dataDoc
+  } = useQuery(GET_DOCUMENT_BY_PK, {
     variables: { documentId },
-    skip: !documentId,
+    skip: !documentId || isLocalMedia,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
 
-  if (loading || loadingShop) return <LoadingSpinner />;
-  if (error || errorShop) return <AlertComponent message={error.message || errorShop.message} type="error" />;
+  useEffect(() => {
+    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
+  }, [dataShop, setBodyshop]);
 
-  if (!data || !data.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
+  if (loadingShop) return <LoadingSpinner />;
+  if (errorShop) return <AlertComponent message={errorShop.message} type="error" />;
+
+  if (isLocalMedia) {
+    if (imageUrl && filename && jobid) {
+      return (
+        <div>
+          <DocumentEditorLocalComponent imageUrl={imageUrl} filename={filename} jobid={jobid} />
+        </div>
+      );
+    } else {
+      return <Result status="404" title={t("general.errors.notfound")} />;
+    }
+  }
+
+  if (loadingDoc) return <LoadingSpinner />;
+  if (errorDoc) return <AlertComponent message={errorDoc.message} type="error" />;
+
+  if (!dataDoc || !dataDoc.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
   return (
     <div>
-      <DocumentEditor document={data ? data.documents_by_pk : null} />
+      <DocumentEditor document={dataDoc ? dataDoc.documents_by_pk : null} />
     </div>
   );
 }

client/src/components/global-search/global-search-os.component.jsx

@@ -73,8 +73,8 @@ export default function GlobalSearchOs() {
                       <span>
                         <OwnerNameDisplay ownerObject={owner} />
                       </span>
-                      <PhoneNumberFormatter type={owner?.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      <PhoneNumberFormatter type={owner?.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
                     </Space>
                   </Link>
                 )

client/src/components/global-search/global-search.component.jsx

@@ -63,8 +63,8 @@ export default function GlobalSearch() {
                     <span>
                       <OwnerNameDisplay ownerObject={owner} />
                     </span>
-                    <PhoneNumberFormatter type={owner.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter type={owner.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
                   </Space>
                 </Link>
               )

client/src/components/job-at-change/schedule-event.component.jsx

@@ -220,10 +220,10 @@ export function ScheduleEventComponent({
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ea")}>{(event.job && event.job.ownr_ea) || ""}</DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <ChatOpenButton phone={event?.job?.ownr_ph1} type={event?.job?.ownr_ph1_ty} jobid={event.job.id} />
+            <ChatOpenButton phone={event.job && event.job.ownr_ph1} jobid={event.job.id} />
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph2")}>
-            <ChatOpenButton phone={event?.job?.ownr_ph2} type={event?.job?.ownr_ph2_ty} jobid={event.job.id} />
+            <ChatOpenButton phone={event.job && event.job.ownr_ph2} jobid={event.job.id} />
           </DataLabel>
           <DataLabel hideIfNull label={t("jobs.fields.loss_of_use")}>
             {(event.job && event.job.loss_of_use) || ""}

client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx

@@ -1,4 +1,4 @@
-import { Form, Input, Select } from "antd";
+import { Form, Input } from "antd";
 import { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -7,11 +7,6 @@ import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-forma
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 export default function JobsCreateOwnerInfoNewComponent() {
-  const PHONE_TYPE_OPTIONS = [
-    { label: t("owners.labels.home"), value: "Home" },
-    { label: t("owners.labels.work"), value: "Work" },
-    { label: t("owners.labels.cell"), value: "Cell" }
-  ];
   const [state] = useContext(JobCreateContext);
 
   const { t } = useTranslation();
@@ -110,56 +105,26 @@ export default function JobsCreateOwnerInfoNewComponent() {
           ]}
           name={["owner", "data", "ownr_ea"]}
         >
-          <FormItemEmail disabled={!state.owner.new} />
+          <FormItemEmail
+            //email={form.getFieldValue("ownr_ea")}
+            disabled={!state.owner.new}
+          />
         </Form.Item>
-
-        {/* Phone 1 + Type */}
-        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
-          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
-            <Form.Item
-              name={["owner", "data", "ownr_ph1"]}
-              noStyle
-              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
-            >
-              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
-            </Form.Item>
-
-            <Form.Item name={["owner", "data", "ownr_ph1_ty"]} noStyle>
-              <Select
-                disabled={!state.owner.new}
-                allowClear
-                placeholder="Type"
-                options={PHONE_TYPE_OPTIONS}
-                style={{ width: 110 }}
-              />
-            </Form.Item>
-          </div>
+        <Form.Item
+          label={t("owners.fields.ownr_ph1")}
+          name={["owner", "data", "ownr_ph1"]}
+          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
+        >
+          <FormItemPhone disabled={!state.owner.new} />
         </Form.Item>
-
-        {/* Phone 2 + Type */}
-        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
-          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
-            <Form.Item
-              name={["owner", "data", "ownr_ph2"]}
-              noStyle
-              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
-            >
-              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
-            </Form.Item>
-
-            <Form.Item name={["owner", "data", "ownr_ph2_ty"]} noStyle>
-              <Select
-                disabled={!state.owner.new}
-                allowClear
-                placeholder="Type"
-                options={PHONE_TYPE_OPTIONS}
-                style={{ width: 110 }}
-              />
-            </Form.Item>
-          </div>
+        <Form.Item
+          label={t("owners.fields.ownr_ph2")}
+          name={["owner", "data", "ownr_ph2"]}
+          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
+        >
+          <FormItemPhone disabled={!state.owner.new} />
         </Form.Item>
       </LayoutFormRow>
-
       <LayoutFormRow grow>
         <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
           <Input disabled={!state.owner.new} />

client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx

@@ -61,7 +61,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
       title: t("owners.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>,
       sorter: (a, b) => alphaSort(a.ownr_ph1, b.ownr_ph1),
       sortOrder: tableState.sortedInfo.columnKey === "ownr_ph1" && tableState.sortedInfo.order
     },
@@ -69,7 +69,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
       title: t("owners.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>,
       sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
       sortOrder: tableState.sortedInfo.columnKey === "ownr_ph2" && tableState.sortedInfo.order
     }

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

@@ -609,7 +609,7 @@ export function JobsDetailHeaderActions({
             <FormDateTimePickerComponent
               onBlur={() => {
                 const start = form.getFieldValue("start");
-                form.setFieldsValue({ end: start?.add(30, "minutes") });
+                form.setFieldsValue({ end: start.add(30, "minutes") });
               }}
             />
           </Form.Item>

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

@@ -251,16 +251,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
             <div>
               <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
                 {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
                 ) : (
-                  <ChatOpenButton type={job.ownr_ph1_ty} 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 || isPartsEntry ? (
-                  <PhoneNumberFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
                 ) : (
-                  <ChatOpenButton type={job.ownr_ph2_ty} phone={job.ownr_ph2} jobid={job.id} />
+                  <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
                 )}
               </DataLabel>
               <DataLabel key="3" label={t("owners.fields.address")}>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -1,4 +1,4 @@
-import { FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
 import { Alert, Button, Card, Col, Row, Space } from "antd";
 import { useEffect, useState } from "react";
 import { Gallery } from "react-grid-gallery";
@@ -185,6 +185,21 @@ export function JobsDocumentsLocalGallery({
         </Col>
         {modalState.open && (
           <Lightbox
+            toolbarButtons={[
+              <EditFilled
+                key="edit"
+                onClick={() => {
+                  const newWindow = window.open(
+                    `${window.location.protocol}//${window.location.host}/edit?imageUrl=${
+                      jobMedia.images[modalState.index].fullsize
+                    }&filename=${jobMedia.images[modalState.index].filename}&jobid=${job.id}`,
+                    "_blank",
+                    "noopener,noreferrer"
+                  );
+                  if (newWindow) newWindow.opener = null;
+                }}
+              />
+            ]}
             mainSrc={jobMedia.images[modalState.index].fullsize}
             nextSrc={jobMedia.images[(modalState.index + 1) % jobMedia.images.length].fullsize}
             prevSrc={jobMedia.images[(modalState.index + jobMedia.images.length - 1) % jobMedia.images.length].fullsize}

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -64,11 +64,7 @@ export default function JobsFindModalComponent({
       width: "12%",
       ellipsis: true,
       render: (text, record) => {
-        return record.ownr_ph1 ? (
-          <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
-        ) : (
-          t("general.labels.unknown")
-        );
+        return record.ownr_ph1 ? <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter> : t("general.labels.unknown");
       }
     },
     {
@@ -78,11 +74,7 @@ export default function JobsFindModalComponent({
       width: "12%",
       ellipsis: true,
       render: (text, record) => {
-        return record.ownr_ph2 ? (
-          <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
-        ) : (
-          t("general.labels.unknown")
-        );
+        return record.ownr_ph2 ? <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter> : t("general.labels.unknown");
       }
     },
     {
@@ -253,11 +245,7 @@ export default function JobsFindModalComponent({
         >
           {t("jobs.labels.override_header")}
         </Checkbox>
-        <Checkbox
-          checked={partsQueueToggle}
-          onChange={(e) => setPartsQueueToggle(e.target.checked)}
-          id="parts_queue_toggle"
-        >
+        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)} id="parts_queue_toggle">
           {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
         </Checkbox>
         <Checkbox

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -72,14 +72,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => <StartChatButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => <StartChatButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
     },
     {
       title: t("jobs.fields.status"),

client/src/components/jobs-list/jobs-list.component.jsx

@@ -139,7 +139,7 @@ export function JobsList({ bodyshop }) {
       key: "ownr_ph1",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
@@ -147,7 +147,7 @@ export function JobsList({ bodyshop }) {
       key: "ownr_ph2",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
     },
 
     {

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -140,7 +140,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "ownr_ph1",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
@@ -148,7 +148,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "ownr_ph2",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
     },
     {
       title: t("jobs.fields.status"),

client/src/components/owner-detail-form/owner-detail-form.component.jsx

@@ -1,4 +1,4 @@
-import { Form, Input, Select, Tooltip } from "antd";
+import { Form, Input, Tooltip } from "antd";
 import { CloseCircleFilled } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -10,12 +10,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
   const { t } = useTranslation();
   const { getFieldValue } = form;
 
-  const PHONE_TYPE_OPTIONS = [
-    { label: t("owners.labels.home"), value: "Home" },
-    { label: t("owners.labels.work"), value: "Work" },
-    { label: t("owners.labels.cell"), value: "Cell" }
-  ];
-
   return (
     <div>
       <FormFieldsChanged form={form} />
@@ -36,7 +30,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input disabled />
         </Form.Item>
       </LayoutFormRow>
-
       <LayoutFormRow header={t("owners.forms.address")}>
         <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
           <Input />
@@ -57,7 +50,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input />
         </Form.Item>
       </LayoutFormRow>
-
       <LayoutFormRow header={t("owners.forms.contact")}>
         <Form.Item
           label={t("owners.fields.ownr_ea")}
@@ -71,8 +63,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
         >
           <FormItemEmail email={getFieldValue("ownr_ea")} />
         </Form.Item>
-
-        {/* Phone 1 + Type + Opt-out icon */}
         <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
           <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
             <Form.Item
@@ -82,11 +72,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             >
               <Input style={{ flex: 1, minWidth: "150px" }} />
             </Form.Item>
-
-            <Form.Item name="ownr_ph1_ty" noStyle>
-              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
-            </Form.Item>
-
             {isPhone1OptedOut && (
               <Tooltip title={t("consent.text_body")}>
                 <CloseCircleFilled
@@ -103,8 +88,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             )}
           </div>
         </Form.Item>
-
-        {/* Phone 2 + Type + Opt-out icon */}
         <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
           <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
             <Form.Item
@@ -114,11 +97,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             >
               <Input style={{ flex: 1, minWidth: "150px" }} />
             </Form.Item>
-
-            <Form.Item name="ownr_ph2_ty" noStyle>
-              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
-            </Form.Item>
-
             {isPhone2OptedOut && (
               <Tooltip title={t("consent.text_body")}>
                 <CloseCircleFilled
@@ -135,7 +113,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             )}
           </div>
         </Form.Item>
-
         <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
           <Input />
         </Form.Item>
@@ -143,7 +120,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input />
         </Form.Item>
       </LayoutFormRow>
-
       <Form.Item label={t("owners.fields.note")} name="note">
         <Input.TextArea rows={4} />
       </Form.Item>

client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx

@@ -25,10 +25,8 @@ export default function OwnerDetailUpdateJobsComponent({ owner, selectedJobs, di
           ownr_ea: owner["ownr_ea"],
           ownr_fn: owner["ownr_fn"],
           ownr_ph1: owner["ownr_ph1"],
-          ownr_ph1_ty: owner["ownr_ph1_ty"],
           ownr_ln: owner["ownr_ln"],
           ownr_ph2: owner["ownr_ph2"],
-          ownr_ph2_ty: owner["ownr_ph2_ty"],
           ownr_st: owner["ownr_st"],
           ownr_title: owner["ownr_title"],
           ownr_zip: owner["ownr_zip"]

client/src/components/owner-find-modal/owner-find-modal.component.jsx

@@ -47,13 +47,13 @@ export default function OwnerFindModalComponent({
       title: t("owners.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: t("owners.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: t("owners.fields.note"),

client/src/components/owner-tag-popover/owner-tag-popover.component.jsx

@@ -15,10 +15,10 @@ export default function OwnerTagPopoverComponent({ job }) {
               <OwnerNameDisplay ownerObject={job} />
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -36,10 +36,13 @@ export default function OwnerTagPopoverComponent({ job }) {
               <OwnerNameDisplay ownerObject={job.owner} />
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter type={job.owner.ownr_ph1_ty}>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
+            </Descriptions.Item>
+            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter type={job.owner.ownr_ph2_ty}>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${

client/src/components/owners-list/owners-list.component.jsx

@@ -39,7 +39,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       render: (text, record) => {
-        return <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>;
+        return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
       }
     },
     {
@@ -47,7 +47,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       render: (text, record) => {
-        return <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>;
+        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
       }
     },
     {

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

@@ -255,14 +255,14 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.specialcoveragepolicy"),

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -144,7 +144,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
       <Spin spinning={loading}>
         {record[type] ? (
           <div>
-            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
+            <span>{`${theEmployee.first_name || ""} ${theEmployee.last_name || ""}`}</span>
             <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
           </div>
         ) : (

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

@@ -154,25 +154,13 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                 <OwnerNameDisplay ownerObject={theJob} />
                 {!technician ? (
                   <>
-                    <StartChatButton
-                      type={data.jobs_by_pk.ownr_ph1_ty}
-                      phone={data.jobs_by_pk.ownr_ph1}
-                      jobid={data.jobs_by_pk.id}
-                    />
-                    <StartChatButton
-                      type={data.jobs_by_pk.ownr_ph2_ty}
-                      phone={data.jobs_by_pk.ownr_ph2}
-                      jobid={data.jobs_by_pk.id}
-                    />
+                    <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 type={data.jobs_by_pk.ownr_ph1_ty}>
-                      {data.jobs_by_pk.ownr_ph1}
-                    </PhoneNumberFormatter>
-                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph2_ty}>
-                      {data.jobs_by_pk.ownr_ph2}
-                    </PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph2}</PhoneNumberFormatter>
                   </>
                 )}
               </Space>

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -143,7 +143,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
 
   //TODO: Find a way to filter out / blur on demand.
   return (
-    <div className="report-center-modal">
+    <div>
       <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
         <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
         <Form.Item name="defaultSorters" hidden />
@@ -163,14 +163,13 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
               {Object.keys(grouped)
                 //.filter((key) => !groupExcludeKeyFilter.includes(key))
                 .map((key) => (
-                  <Col xs={24} sm={12} md={Object.keys(grouped).length === 1 ? 24 : 8} key={key}>
+                  <Col md={8} sm={12} key={key}>
                     <Card.Grid
                       style={{
                         width: "100%",
                         height: "100%",
                         maxHeight: "33vh",
-                        overflowY: "scroll",
-                        minWidth: "200px"
+                        overflowY: "scroll"
                       }}
                     >
                       <Typography.Title level={4}>{t(`reportcenter.labels.groups.${key}`)}</Typography.Title>
@@ -178,7 +177,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                         <BlurWrapperComponent
                           featureName={groupExcludeKeyFilter.find((g) => g.key === key).featureName}
                         >
-                          <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
+                          <ul style={{ listStyleType: "none", columns: "2 auto" }}>
                             {grouped[key].map((item) => (
                               <li key={item.key}>
                                 <Radio key={item.key} value={item.key}>
@@ -189,7 +188,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                           </ul>
                         </BlurWrapperComponent>
                       ) : (
-                        <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
+                        <ul style={{ listStyleType: "none", columns: "2 auto" }}>
                           {grouped[key].map((item) =>
                             item.featureNameRestricted ? (
                               <li key={item.key}>

client/src/components/report-center-modal/report-center-modal.styles.scss

@@ -11,38 +11,3 @@
     }
   }
 }
-
-// Report center modal fixes for column layout
-.report-center-modal {
-  .ant-form-item .ant-radio-group {
-    width: 100%;
-    
-    .ant-card-grid {
-      padding: 16px;
-      box-sizing: border-box;
-      
-      ul {
-        width: 100%;
-        
-        li {
-          margin-bottom: 8px;
-          break-inside: avoid;
-          page-break-inside: avoid;
-          
-          .ant-radio-wrapper {
-            display: flex;
-            align-items: flex-start;
-            width: 100%;
-            
-            span:not(.ant-radio) {
-              word-break: break-word;
-              overflow-wrap: break-word;
-              hyphens: auto;
-              flex: 1;
-            }
-          }
-        }
-      }
-    }
-  }
-}

client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx

@@ -16,7 +16,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
       <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
       {employeeOptions.length > 0 ? (
         <Form.Item
-          normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
           name="notification_followers"
           rules={[
             {
@@ -43,6 +42,11 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
             options={employeeOptions}
             placeholder={t("bodyshop.fields.notifications.placeholder")}
             showEmail={true}
+            onChange={(value) => {
+              // Filter out null or invalid values before passing to Form
+              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
+              return cleanedValue;
+            }}
           />
         </Form.Item>
       ) : (

client/src/firebase/firebase.utils.js

@@ -5,7 +5,7 @@ import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
 //import * as amplitude from '@amplitude/analytics-browser';
-// import posthog from 'posthog-js'
+import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -74,6 +74,7 @@ onMessage(messaging, (payload) => {
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   try {
+
     const state = stateProp || store.getState();
 
     const eventParams = {
@@ -98,7 +99,8 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     // );
     logEvent(analytics, eventName, eventParams);
     //amplitude.track(eventName, eventParams);
-    //posthog.capture(eventName, eventParams);
+    posthog.capture(eventName, eventParams);
+
   } finally {
     //If it fails, just keep going.
   }

client/src/graphql/appointments.queries.js

@@ -40,8 +40,6 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         ownr_fn
         ownr_ph1
         ownr_ph2
-        ownr_ph1_ty
-        ownr_ph2_ty
         ownr_ea
         clm_total
         id

client/src/graphql/jobs.queries.js

@@ -19,9 +19,7 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
-      ownr_ph1_ty
       ownr_ph2
-      ownr_ph2_ty
       ownr_ea
       ownerid
       comment
@@ -71,8 +69,6 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       ownr_ea
       ownerid
       comment
@@ -126,8 +122,6 @@ export const QUERY_PARTS_QUEUE = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       ownr_ea
       plate_no
       plate_st
@@ -185,8 +179,6 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
@@ -257,8 +249,6 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
@@ -625,8 +615,6 @@ export const GET_JOB_BY_PK = gql`
         ownr_ln
         ownr_ph1
         ownr_ph2
-        ownr_ph1_ty
-        ownr_ph2_ty
         ownr_st
         ownr_zip
         tax_number
@@ -643,8 +631,6 @@ export const GET_JOB_BY_PK = gql`
       ownr_ln
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       ownr_st
       ownr_zip
       parts_tax_rates
@@ -728,7 +714,7 @@ export const GET_JOB_BY_PK = gql`
       v_model_yr
       v_model_desc
       v_vin
-      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
         created_at
         created_by
         critical
@@ -844,8 +830,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       comment
       ownr_ea
       ca_gst_registrant
@@ -1016,6 +1000,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         key
         type
       }
+
     }
   }
 `;
@@ -1245,8 +1230,6 @@ export const GET_JOB_INFO_FOR_STRIPE = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       ownr_ea
     }
   }
@@ -1460,10 +1443,8 @@ export const QUERY_JOB_FOR_DUPE = gql`
       ownr_ln
       ownr_ph1
       ownr_ph1x
-      ownr_ph1_ty
       ownr_ph2
       ownr_ph2x
-      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -1709,10 +1690,8 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       ownr_ln
       ownr_ph1
       ownr_ph1x
-      ownr_ph1_ty
       ownr_ph2
       ownr_ph2x
-      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -1850,8 +1829,6 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       plate_no
       plate_st
       v_vin
@@ -1892,8 +1869,6 @@ export const QUERY_SIMPLIFIED_PARTS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       plate_no
       plate_st
       v_vin
@@ -2142,8 +2117,6 @@ export const GET_JOB_FOR_CC_CONTRACT = gql`
       ownr_zip
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
     }
   }
 `;
@@ -2442,7 +2415,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
         start
         status
       }
-      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
         created_at
         created_by
         critical
@@ -2530,8 +2503,6 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
       ownr_ln
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       owner {
         id
         preferred_contact
@@ -2629,8 +2600,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars

client/src/graphql/owners.queries.js

@@ -8,8 +8,6 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
       ownr_addr1
       ownr_addr2
       ownr_city
@@ -59,10 +57,8 @@ export const QUERY_OWNER_BY_ID = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
-      ownr_ph1_ty
       ownr_ln
       ownr_ph2
-      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -116,10 +112,8 @@ export const QUERY_ALL_OWNERS = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
-      ownr_ph1_ty
       ownr_ln
       ownr_ph2
-      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -142,10 +136,8 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
-      ownr_ph1_ty
       ownr_ln
       ownr_ph2
-      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -172,10 +164,8 @@ export const QUERY_OWNER_FOR_JOB_CREATION = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
-      ownr_ph1_ty
       ownr_ln
       ownr_ph2
-      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip

client/src/graphql/parts-orders.queries.js

@@ -177,12 +177,10 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         ownr_fax
         ownr_faxx
         ownr_ph1
-        ownr_ph1_ty
         ownr_fn
         ownr_ln
         ownr_ph1x
         ownr_ph2
-        ownr_ph2_ty
         ownr_ph2x
         ownr_st
         ownr_title

client/src/graphql/search.queries.js

@@ -22,8 +22,6 @@ export const GLOBAL_SEARCH_QUERY = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
     }
     search_vehicles(args: { search: $search }, limit: 25) {
       id

client/src/translations/en_us/common.json

@@ -2590,10 +2590,7 @@
         "fromclaim": "Current Claim",
         "fromowner": "Historical Owner Record",
         "relatedjobs": "Related Jobs",
-        "updateowner": "Update Owner",
-        "work": "Work",
-        "home": "Home",
-        "cell": "Cell"
+        "updateowner": "Update Owner"
       },
       "successes": {
         "delete": "Owner deleted successfully.",

client/src/translations/es/common.json

@@ -2590,10 +2590,7 @@
         "fromclaim": "",
         "fromowner": "",
         "relatedjobs": "",
-        "updateowner": "",
-        "work": "",
-        "home": "",
-        "cell": ""
+        "updateowner": ""
       },
       "successes": {
         "delete": "",

client/src/translations/fr/common.json

@@ -2590,10 +2590,7 @@
         "fromclaim": "",
         "fromowner": "",
         "relatedjobs": "",
-        "updateowner": "",
-        "work": "",
-        "home": "",
-        "cell": ""
+        "updateowner": ""
       },
       "successes": {
         "delete": "",

client/src/utils/PhoneFormatter.jsx

@@ -1,23 +1,7 @@
-import { Typography } from "antd";
+//import NumberFormat from "react-number-format";
 import parsePhoneNumber from "libphonenumber-js";
 
-const { Text } = Typography;
-
-export default function PhoneNumberFormatter({ children, type }) {
-  const p = parsePhoneNumber(children || "", "CA");
-  if (!p) return null;
-
-  const phone = p.formatNational();
-
-  return (
-    <span>
-      <Text>{phone}</Text>
-      {type ? (
-        <>
-          {" "}
-          <Text type="secondary">({type})</Text>
-        </>
-      ) : null}
-    </span>
-  );
+export default function PhoneNumberFormatter(props) {
+  const p = parsePhoneNumber(props.children || "", "CA");
+  return p ? <span>{p.formatNational()}</span> : null;
 }

client/src/utils/sentry.js

@@ -31,8 +31,7 @@ if (!import.meta.env.DEV) {
       "Module specifier, 'fs' does not start",
       "Module specifier, 'zlib' does not start with",
       "Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
-      "Failed to update a ServiceWorker for scope",
-      "Network Error"
+      "Failed to update a ServiceWorker for scope"
     ],
     integrations: [
       // See docs for support of different versions of variation of react router

client/vite.config.js

@@ -24,13 +24,11 @@ const lightningCssTargets = browserslistToTargets(
   })
 );
 
-const pstFormatter = new Intl.DateTimeFormat("en-CA", {
-  timeZone: "America/Los_Angeles",
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit"
-});
-const currentDatePST = pstFormatter.format(new Date());
+const currentDatePST = new Date()
+  .toLocaleDateString("en-US", { timeZone: "America/Los_Angeles", year: "numeric", month: "2-digit", day: "2-digit" })
+  .split("/")
+  .reverse()
+  .join("-");
 
 const getFormattedTimestamp = () =>
   new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");

hasura/metadata/tables.yaml

@@ -1156,11 +1156,7 @@
         enable_manual: false
         update:
           columns:
-            - imexshopid
-            - timezone
             - shopname
-            - notification_followers
-            - state
             - md_order_statuses
       retry_conf:
         interval_sec: 10
@@ -3684,7 +3680,6 @@
           - completed_tasks
           - converted
           - created_at
-          - created_user_email
           - cust_pr
           - date_estimated
           - date_exported
@@ -3703,7 +3698,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -3799,10 +3793,8 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
-          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
-          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -3964,7 +3956,6 @@
           - completed_tasks
           - converted
           - created_at
-          - created_user_email
           - cust_pr
           - date_estimated
           - date_exported
@@ -3984,7 +3975,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4081,10 +4071,8 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
-          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
-          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -4257,7 +4245,6 @@
           - completed_tasks
           - converted
           - created_at
-          - created_user_email
           - cust_pr
           - date_estimated
           - date_exported
@@ -4277,7 +4264,6 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
-          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4374,10 +4360,8 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
-          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
-          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -4650,7 +4634,7 @@
       request_transform:
         body:
           action: transform
-          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}},\r\n        \"created_user_email\": {{$body.event.data.new?.created_user_email}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
+          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -5177,9 +5161,7 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
-          - ownr_ph1_ty
           - ownr_ph2
-          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
@@ -5204,9 +5186,7 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
-          - ownr_ph1_ty
           - ownr_ph2
-          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
@@ -5242,9 +5222,7 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
-          - ownr_ph1_ty
           - ownr_ph2
-          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip

hasura/migrations/1764704225560_alter_table_public_jobs_add_column_dms_id/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."jobs" add column "dms_id" text
---  null;

hasura/migrations/1764704225560_alter_table_public_jobs_add_column_dms_id/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."jobs" add column "dms_id" text
- null;

hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."owners" add column "ownr_ph1_ty" text
---  null;

hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."owners" add column "ownr_ph1_ty" text
- null;

hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."owners" add column "ownr_ph2_ty" text
---  null;

hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."owners" add column "ownr_ph2_ty" text
- null;

hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."jobs" add column "ownr_ph1_ty" text
---  null;

hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."jobs" add column "ownr_ph1_ty" text
- null;

hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."jobs" add column "ownr_ph2_ty" text
---  null;

hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."jobs" add column "ownr_ph2_ty" text
- null;

server/graphql-client/queries.js

@@ -2926,15 +2926,6 @@ exports.GET_BODYSHOP_BY_ID = `
   }
 `;
 
-exports.GET_BODYSHOP_WATCHERS_BY_ID = `
-  query GET_BODYSHOP_BY_ID($id: uuid!) {
-    bodyshops_by_pk(id: $id) {
-      id
-      notification_followers
-    }
-  }
-`;
-
 exports.GET_DOCUMENTS_BY_JOB = `
   query GET_DOCUMENTS_BY_JOB($jobId: uuid!) {
     jobs_by_pk(id: $jobId) {

server/integrations/partsManagement/endpoints/partsManagementProvisioning.js

@@ -77,8 +77,9 @@ const generateResetLink = async (email) => {
  */
 const ensureExternalIdUnique = async (externalId) => {
   const resp = await client.request(CHECK_EXTERNAL_SHOP_ID, { key: externalId });
-
-  return !!resp.bodyshops.length;
+  if (resp.bodyshops.length) {
+    throw { status: 400, message: `external_shop_id '${externalId}' is already in use.` };
+  }
 };
 
 /**
@@ -224,25 +225,10 @@ const patchPartsManagementProvisioning = async (req, res) => {
  */
 const partsManagementProvisioning = async (req, res) => {
   const { logger } = req;
-
-  // Trim and normalize email early
-  const body = {
-    ...req.body,
-    userEmail: req.body.userEmail?.trim().toLowerCase()
-  };
-
-  const trim = (value) => (typeof value === "string" ? value.trim() : value);
-  const trimIfString = (value) =>
-    value !== null && value !== undefined && typeof value === "string" ? value.trim() : value;
+  const body = { ...req.body, userEmail: req.body.userEmail?.toLowerCase() };
 
   try {
-    // Ensure email is present and trimmed before checking registration
-    if (!body.userEmail) {
-      throw { status: 400, message: "userEmail is required" };
-    }
-
     await ensureEmailNotRegistered(body.userEmail);
-
     requireFields(body, [
       "external_shop_id",
       "shopname",
@@ -255,69 +241,27 @@ const partsManagementProvisioning = async (req, res) => {
       "phone",
       "userEmail"
     ]);
+    await ensureExternalIdUnique(body.external_shop_id);
 
-    // Trim all top-level string fields
-    const trimmedBody = {
-      ...body,
-      external_shop_id: trim(body.external_shop_id),
-      shopname: trim(body.shopname),
-      address1: trim(body.address1),
-      address2: trimIfString(body.address2),
-      city: trim(body.city),
-      state: trim(body.state),
-      zip_post: trim(body.zip_post),
-      country: trim(body.country),
-      email: trim(body.email),
-      phone: trim(body.phone),
-      timezone: trimIfString(body.timezone),
-      logoUrl: trimIfString(body.logoUrl),
-      userPassword: body.userPassword, // passwords should NOT be trimmed (preserves intentional spaces if any, though rare)
-      vendors: Array.isArray(body.vendors)
-        ? body.vendors.map((v) => ({
-            name: trim(v.name),
-            street1: trimIfString(v.street1),
-            street2: trimIfString(v.street2),
-            city: trimIfString(v.city),
-            state: trimIfString(v.state),
-            zip: trimIfString(v.zip),
-            country: trimIfString(v.country),
-            email: trimIfString(v.email),
-            cost_center: trimIfString(v.cost_center),
-            phone: trimIfString(v.phone),
-            dmsid: trimIfString(v.dmsid),
-            discount: v.discount ?? 0,
-            due_date: v.due_date ?? null,
-            favorite: v.favorite ?? [],
-            active: v.active ?? true
-          }))
-        : []
-    };
-
-    const duplicateCheck = await ensureExternalIdUnique(trimmedBody.external_shop_id);
-
-    if (duplicateCheck) {
-      throw { status: 400, message: `external_shop_id '${trimmedBody.external_shop_id}' is already in use.` };
-    }
-
-    logger.log("admin-create-shop-user", "debug", trimmedBody.userEmail, null, {
+    logger.log("admin-create-shop-user", "debug", body.userEmail, null, {
       request: req.body,
       ioadmin: true
     });
 
     const shopInput = {
-      shopname: trimmedBody.shopname,
-      address1: trimmedBody.address1,
-      address2: trimmedBody.address2,
-      city: trimmedBody.city,
-      state: trimmedBody.state,
-      zip_post: trimmedBody.zip_post,
-      country: trimmedBody.country,
-      email: trimmedBody.email,
-      external_shop_id: trimmedBody.external_shop_id,
-      timezone: trimmedBody.timezone || DefaultNewShop.timezone,
-      phone: trimmedBody.phone,
+      shopname: body.shopname,
+      address1: body.address1,
+      address2: body.address2 || null,
+      city: body.city,
+      state: body.state,
+      zip_post: body.zip_post,
+      country: body.country,
+      email: body.email,
+      external_shop_id: body.external_shop_id,
+      timezone: body.timezone || DefaultNewShop.timezone,
+      phone: body.phone,
       logo_img_path: {
-        src: trimmedBody.logoUrl || null, // allow empty logo
+        src: body.logoUrl,
         width: "",
         height: "",
         headerMargin: DefaultNewShop.logo_img_path.headerMargin
@@ -342,37 +286,35 @@ const partsManagementProvisioning = async (req, res) => {
       appt_alt_transport: DefaultNewShop.appt_alt_transport,
       md_jobline_presets: DefaultNewShop.md_jobline_presets,
       vendors: {
-        data: trimmedBody.vendors.map((v) => ({
+        data: body.vendors.map((v) => ({
           name: v.name,
-          street1: v.street1,
-          street2: v.street2,
-          city: v.city,
-          state: v.state,
-          zip: v.zip,
-          country: v.country,
-          email: v.email,
-          discount: v.discount,
-          due_date: v.due_date,
-          cost_center: v.cost_center,
-          favorite: v.favorite,
-          phone: v.phone,
-          active: v.active,
-          dmsid: v.dmsid
+          street1: v.street1 || null,
+          street2: v.street2 || null,
+          city: v.city || null,
+          state: v.state || null,
+          zip: v.zip || null,
+          country: v.country || null,
+          email: v.email || null,
+          discount: v.discount ?? 0,
+          due_date: v.due_date ?? null,
+          cost_center: v.cost_center || null,
+          favorite: v.favorite ?? [],
+          phone: v.phone || null,
+          active: v.active ?? true,
+          dmsid: v.dmsid || null
         }))
       }
     };
 
     const newShopId = await insertBodyshop(shopInput);
-    const userRecord = await createFirebaseUser(trimmedBody.userEmail, trimmedBody.userPassword);
+    const userRecord = await createFirebaseUser(body.userEmail, body.userPassword);
     let resetLink = null;
-    if (!trimmedBody.userPassword) {
-      resetLink = await generateResetLink(trimmedBody.userEmail);
-    }
+    if (!body.userPassword) resetLink = await generateResetLink(body.userEmail);
 
-    const createdUser = await insertUserAssociation(userRecord.uid, trimmedBody.userEmail, newShopId);
+    const createdUser = await insertUserAssociation(userRecord.uid, body.userEmail, newShopId);
 
     return res.status(200).json({
-      shop: { id: newShopId, shopname: trimmedBody.shopname },
+      shop: { id: newShopId, shopname: body.shopname },
       user: {
         id: createdUser.id,
         email: createdUser.email,
@@ -380,7 +322,7 @@ const partsManagementProvisioning = async (req, res) => {
       }
     });
   } catch (err) {
-    logger.log("admin-create-shop-user-error", "error", body.userEmail || "unknown", null, {
+    logger.log("admin-create-shop-user-error", "error", body.userEmail, null, {
       message: err.message,
       detail: err.detail || err
     });

server/media/imgproxy-media.js

@@ -44,25 +44,25 @@ const generateSignedUploadUrls = async (req, res) => {
     for (const filename of filenames) {
       const key = filename;
       const client = new S3Client({ region: InstanceRegion() });
-      
+
       // Check if filename indicates PDF and set content type accordingly
-      const isPdf = filename.toLowerCase().endsWith('.pdf');
+      const isPdf = filename.toLowerCase().endsWith(".pdf");
       const commandParams = {
         Bucket: imgproxyDestinationBucket,
         Key: key,
         StorageClass: "INTELLIGENT_TIERING"
       };
-      
+
       if (isPdf) {
         commandParams.ContentType = "application/pdf";
       }
-      
+
       const command = new PutObjectCommand(commandParams);
 
       // For PDFs, we need to add conditions to the presigned URL to enforce content type
       const presignedUrlOptions = { expiresIn: 360 };
       if (isPdf) {
-        presignedUrlOptions.signableHeaders = new Set(['content-type']);
+        presignedUrlOptions.signableHeaders = new Set(["content-type"]);
       }
 
       const presignedUrl = await getSignedUrl(client, command, presignedUrlOptions);
@@ -265,6 +265,82 @@ const downloadFiles = async (req, res) => {
   }
 };
 
+/**
+ * Stream original image content by document ID
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const getOriginalImageByDocumentId = async (req, res) => {
+  const {
+    body: { documentId },
+    user,
+    userGraphQLClient
+  } = req;
+
+  if (!documentId) {
+    return res.status(400).json({ message: "documentId is required" });
+  }
+
+  try {
+    logger.log("imgproxy-original-image", "DEBUG", user?.email, null, { documentId });
+
+    const { documents } = await userGraphQLClient.request(GET_DOCUMENTS_BY_IDS, { documentIds: [documentId] });
+
+    if (!documents || documents.length === 0) {
+      return res.status(404).json({ message: "Document not found" });
+    }
+
+    const [document] = documents;
+    const { type } = document;
+
+    if (!type || !type.startsWith("image")) {
+      return res.status(400).json({ message: "Document is not an image" });
+    }
+
+    const s3client = new S3Client({ region: InstanceRegion() });
+    const key = keyStandardize(document);
+
+    let s3Response;
+    try {
+      s3Response = await s3client.send(
+        new GetObjectCommand({
+          Bucket: imgproxyDestinationBucket,
+          Key: key
+        })
+      );
+    } catch (err) {
+      logger.log("imgproxy-original-image-s3-error", "ERROR", user?.email, null, {
+        key,
+        message: err.message,
+        stack: err.stack
+      });
+      return res.status(400).json({ message: "Unable to retrieve image" });
+    }
+
+    res.setHeader("Content-Type", type || "image/jpeg");
+
+    s3Response.Body.on("error", (err) => {
+      logger.log("imgproxy-original-image-s3stream-error", "ERROR", user?.email, null, {
+        key,
+        message: err.message,
+        stack: err.stack
+      });
+      res.destroy(err);
+    });
+
+    s3Response.Body.pipe(res);
+  } catch (error) {
+    logger.log("imgproxy-original-image-error", "ERROR", req.user?.email, null, {
+      documentId,
+      message: error.message,
+      stack: error.stack
+    });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
+  }
+};
+
 /**
  * Delete Files
  * @param req
@@ -425,6 +501,7 @@ const keyStandardize = (doc) => {
 module.exports = {
   generateSignedUploadUrls,
   getThumbnailUrls,
+  getOriginalImageByDocumentId,
   downloadFiles,
   deleteFiles,
   moveFiles

server/notifications/autoAddWatchers.js

@@ -4,14 +4,11 @@
  * This module handles automatically adding watchers to new jobs based on the notifications_autoadd
  * boolean field in the associations table and the notification_followers JSON field in the bodyshops table.
  * It ensures users are not added twice and logs the process.
- *
- * NOTE: Bodyshop notification_followers is fetched directly from the DB (Hasura) to avoid stale Redis cache.
  */
 
 const { client: gqlClient } = require("../graphql-client/graphql-client");
 const { isEmpty } = require("lodash");
 const {
-  GET_BODYSHOP_WATCHERS_BY_ID,
   GET_JOB_WATCHERS_MINIMAL,
   GET_NOTIFICATION_WATCHERS,
   INSERT_JOB_WATCHERS
@@ -29,7 +26,10 @@ const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "fa
  */
 const autoAddWatchers = async (req) => {
   const { event, trigger } = req.body;
-  const { logger } = req;
+  const {
+    logger,
+    sessionUtils: { getBodyshopFromRedis }
+  } = req;
 
   // Validate that this is an INSERT event, bail
   if (trigger?.name !== "notifications_jobs_autoadd" || event.op !== "INSERT" || event.data.old) {
@@ -48,20 +48,20 @@ const autoAddWatchers = async (req) => {
   const hasuraUserId = event?.session_variables?.["x-hasura-user-id"];
 
   try {
-    // Fetch bodyshop data directly from DB (avoid Redis staleness)
-    const bodyshopResponse = await gqlClient.request(GET_BODYSHOP_WATCHERS_BY_ID, { id: shopId });
-    const bodyshopData = bodyshopResponse?.bodyshops_by_pk;
+    // Fetch bodyshop data from Redis
+    const bodyshopData = await getBodyshopFromRedis(shopId);
+    let notificationFollowers = bodyshopData?.notification_followers;
 
-    const notificationFollowersRaw = bodyshopData?.notification_followers;
-    const notificationFollowers = Array.isArray(notificationFollowersRaw)
-      ? [...new Set(notificationFollowersRaw.filter((id) => id))] // de-dupe + remove falsy
-      : [];
+    // Bail if notification_followers is missing or not an array
+    if (!notificationFollowers || !Array.isArray(notificationFollowers)) {
+      return;
+    }
 
     // Execute queries in parallel
     const [notificationData, existingWatchersData] = await Promise.all([
       gqlClient.request(GET_NOTIFICATION_WATCHERS, {
         shopId,
-        employeeIds: notificationFollowers
+        employeeIds: notificationFollowers.filter((id) => id)
       }),
       gqlClient.request(GET_JOB_WATCHERS_MINIMAL, { jobid: jobId })
     ]);
@@ -73,7 +73,7 @@ const autoAddWatchers = async (req) => {
         associationId: assoc.id
       })) || [];
 
-    // Get users from notification_followers (employee IDs -> employee emails)
+    // Get users from notification_followers
     const followerEmails =
       notificationData?.employees
         ?.filter((e) => e.user_email)
@@ -84,7 +84,7 @@ const autoAddWatchers = async (req) => {
 
     // Combine and deduplicate emails (use email as the unique key)
     const usersToAdd = [...autoAddUsers, ...followerEmails].reduce((acc, user) => {
-      if (user?.email && !acc.some((u) => u.email === user.email)) {
+      if (!acc.some((u) => u.email === user.email)) {
         acc.push(user);
       }
       return acc;
@@ -123,7 +123,6 @@ const autoAddWatchers = async (req) => {
       message: error?.message,
       stack: error?.stack,
       jobId,
-      shopId,
       roNumber
     });
     throw error; // Re-throw to ensure the error is logged in the handler

server/routes/mediaRoutes.js

@@ -4,6 +4,7 @@ const { createSignedUploadURL, downloadFiles, renameKeys, deleteFiles } = requir
 const {
   generateSignedUploadUrls: createSignedUploadURLImgproxy,
   getThumbnailUrls: getThumbnailUrlsImgproxy,
+  getOriginalImageByDocumentId: getOriginalImageByDocumentIdImgproxy,
   downloadFiles: downloadFilesImgproxy,
   moveFiles: moveFilesImgproxy,
   deleteFiles: deleteFilesImgproxy
@@ -24,5 +25,6 @@ router.post("/imgproxy/thumbnails", getThumbnailUrlsImgproxy);
 router.post("/imgproxy/download", downloadFilesImgproxy);
 router.post("/imgproxy/rename", moveFilesImgproxy);
 router.post("/imgproxy/delete", deleteFilesImgproxy);
+router.post("/imgproxy/original", getOriginalImageByDocumentIdImgproxy);
 
 module.exports = router;