IO-3340 Resolve unenforced content-type

client/src/components/documents-upload-imgproxy/documents-upload-imgproxy.utility.js

@@ -67,11 +67,14 @@ export const uploadToS3 = async (
   }
 
   //Key should be same as we provided to maintain backwards compatibility.
-  const { presignedUrl: preSignedUploadUrlToS3, key: s3Key } = signedURLResponse.data.signedUrls[0];
+  const { presignedUrl: preSignedUploadUrlToS3, key: s3Key, contentType } = signedURLResponse.data.signedUrls[0];
 
   const options = {
     onUploadProgress: (e) => {
       if (onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
+    },
+    headers: {
+      ...contentType ? { "Content-Type": fileType } : {}
     }
   };
 

client/src/components/shop-info/shop-info.container.jsx

@@ -64,7 +64,7 @@ export default function ShopInfoContainer() {
       onFinish={handleFinish}
       initialValues={
         data
-          ? data.bodyshops[0].accountingconfig.ClosingPeriod
+          ? data?.bodyshops?.[0]?.accountingconfig?.ClosingPeriod
             ? {
                 ...data.bodyshops[0],
                 accountingconfig: {

client/src/contexts/SocketIO/socketProvider.jsx

@@ -167,7 +167,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
       socketRef.current = socketInstance;
 
       const handleBodyshopMessage = (message) => {
-        if (!message || !message.type) return;
+        if (!message?.type) return;
         switch (message.type) {
           case "alert-update":
             store.dispatch(addAlerts(message.payload));
@@ -512,21 +512,20 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     };
 
     const unsubscribe = auth.onIdTokenChanged(async (user) => {
-      if (user) {
-        const token = await user.getIdToken();
-        if (socketRef.current) {
-          socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
-        } else {
-          initializeSocket(token).catch((err) =>
-            console.error(`Something went wrong Initializing Sockets: ${err?.message || ""}`)
-          );
-        }
+      if (!user) {
+        socketRef.current?.disconnect();
+        socketRef.current = null;
+        setIsConnected(false);
+        return;
+      }
+
+      const token = await user.getIdToken();
+      if (socketRef.current) {
+        socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
       } else {
-        if (socketRef.current) {
-          socketRef.current.disconnect();
-          socketRef.current = null;
-          setIsConnected(false);
-        }
+        initializeSocket(token).catch((err) =>
+          console.error("Something went wrong Initializing Sockets:", err?.message || "")
+        );
       }
     });
 

client/src/pages/parts-settings/parts-settings.page.component.jsx

@@ -34,7 +34,7 @@ export function PartsSettingsPage({ setSelectedHeader, setBreadcrumbs }) {
     setBreadcrumbs([
       {
         link: "/parts",
-        label: "Parts"
+        label: t("titles.bc.parts")
       },
       {
         link: "/parts/settings",

client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.container.jsx

@@ -63,7 +63,7 @@ function SimplifiedPartsJobsDetailContainer({ setBreadcrumbs, addRecentItem, set
             ro_number: data.jobs_by_pk?.ro_number || t("general.labels.na")
           });
     setBreadcrumbs([
-      { link: "/parts", label: "Parts" },
+      { link: "/parts", label: t("titles.bc.parts") },
       {
         link: `/parts/jobs/${jobId}`,
         label: t("titles.bc.jobs-detail", {

client/src/pages/simplified-parts-jobs/simplified-parts-jobs.page.jsx

@@ -22,7 +22,7 @@ export function SimplifiedPartsJobsPage({ setBreadcrumbs, setSelectedHeader }) {
       })
     });
     setSelectedHeader("parts-queue");
-    setBreadcrumbs([{ link: "/parts", label: "Parts" }]);
+    setBreadcrumbs([{ link: "/parts", label: t("titles.bc.parts") }]);
   }, [setBreadcrumbs, t, setSelectedHeader]);
 
   return (

client/src/pages/vehicles-detail/vehicles-detail.page.container.jsx

@@ -51,7 +51,7 @@ export function VehicleDetailContainer({ setBreadcrumbs, addRecentItem, setSelec
     setSelectedHeader("vehicles");
 
     const crumbs = [];
-    if (isPartsEntry) crumbs.push({ link: "/parts", label: "Parts" });
+    if (isPartsEntry) crumbs.push({ link: "/parts", label: t("titles.bc.parts") });
     crumbs.push({ link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") });
     crumbs.push({
       link: `${basePath}/vehicles/${vehId}`,

client/src/pages/vehicles/vehicles.page.container.jsx

@@ -33,7 +33,7 @@ export function VehiclesPageContainer({ setBreadcrumbs, setSelectedHeader, isPar
 
     if (isPartsEntry) {
       setBreadcrumbs([
-        { link: "/parts", label: "Parts" },
+        { link: "/parts", label: t("titles.bc.parts") },
         { link: `${basePath}/vehicles`, label: t("titles.bc.vehicles") }
       ]);
     } else {

client/src/translations/en_us/common.json

@@ -3523,6 +3523,8 @@
       }
     },
     "titles": {
+      "parts_settings": "Parts Management Settings | {{app}}",
+      "simplified-parts-jobs": "Parts Management | {{app}}",
       "accounting-payables": "Payables | {{app}}",
       "accounting-payments": "Payments | {{app}}",
       "accounting-receivables": "Receivables | {{app}}",
@@ -3530,7 +3532,7 @@
       "app": "",
       "bc": {
         "simplified-parts-jobs": "Jobs",
-        "parts": "Jobs",
+        "parts": "Parts",
         "parts_settings": "Settings",
         "accounting-payables": "Payables",
         "accounting-payments": "Payments",

client/src/translations/es/common.json

@@ -3523,6 +3523,9 @@
       }
     },
     "titles": {
+      "simplified-parts-jobs": "",
+      "parts": "",
+      "parts_settings": "",
       "accounting-payables": "",
       "accounting-payments": "",
       "accounting-receivables": "",

client/src/translations/fr/common.json

@@ -3523,6 +3523,9 @@
       }
     },
     "titles": {
+      "simplified-parts-jobs": "",
+      "parts": "",
+      "parts_settings": "",
       "accounting-payables": "",
       "accounting-payments": "",
       "accounting-receivables": "",

server/media/imgproxy-media.js

@@ -44,13 +44,34 @@ const generateSignedUploadUrls = async (req, res) => {
     for (const filename of filenames) {
       const key = filename;
       const client = new S3Client({ region: InstanceRegion() });
-      const command = new PutObjectCommand({
+      
+      // Check if filename indicates PDF and set content type accordingly
+      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']);
+      }
+
+      const presignedUrl = await getSignedUrl(client, command, presignedUrlOptions);
+      signedUrls.push({
+        filename,
+        presignedUrl,
+        key,
+        ...(isPdf && { contentType: "application/pdf" })
       });
-      const presignedUrl = await getSignedUrl(client, command, { expiresIn: 360 });
-      signedUrls.push({ filename, presignedUrl, key });
     }
 
     logger.log("imgproxy-upload-success", "DEBUG", req.user?.email, jobid, { signedUrls });