Merge pull request #306 from nitheesh-aot/s3-private

S3 private

Author: dinesh-aot

compliance-api/src/compliance_api/services/inspection_requirement.py

@@ -323,8 +323,6 @@ def _update_the_findigs_by_images(
                     if matching_photo:
                         # Update the image ID in the span
                         span["data-imageid"] = str(matching_photo.id)
-                        # Update image URL if needed
-                        span["data-imageurl"] = matching_photo.relative_url
                 except (ValueError, IndexError):
                     # Invalid photo number format
                     pass
@@ -341,8 +339,6 @@ def _update_the_findigs_by_images(
                     if matching_figure:
                         # Update the image ID in the span
                         span["data-imageid"] = str(matching_figure.id)
-                        # Update image URL if needed
-                        span["data-imageurl"] = matching_figure.relative_url
                 except (ValueError, IndexError):
                     # Invalid figure number format
                     pass

compliance-web/cypress/components/_components/_App/_Inspections/_Requirements/_Images/ImageCard.cy.tsx

@@ -8,6 +8,7 @@ describe("ImageCard Component", () => {
     relative_url: "test-image.jpg",
     caption: "Test Image Caption",
     sort_order: 1,
+    url: "https://test-image.jpg",
   };
 
   const renderImageCard = (props = {}) => {
@@ -28,7 +29,7 @@ describe("ImageCard Component", () => {
     renderImageCard();
 
     // Check if image is rendered with correct source
-    cy.get("img").should("have.attr", "src").and("include", "test-image.jpg");
+    cy.get("img").should("have.attr", "src").and("include", "https://test-image.jpg");
 
     // Check if caption is rendered correctly
     cy.get("a").should("contain.text", "Photo 1: Test Image Caption");

compliance-web/cypress/components/_components/_App/_Inspections/_Requirements/_Images/ImageModal.cy.tsx

@@ -26,6 +26,7 @@ describe("ImageModal Component", () => {
   const mockImageData: RequirementImage = {
     id: 1,
     relative_url: "test-url",
+    url: "https://test-image.jpg",
     caption: "Test Caption",
     taken_by: mockStaffUsers[0] as unknown as StaffUser,
     taken_by_id: mockStaffUsers[0].id,
@@ -37,7 +38,10 @@ describe("ImageModal Component", () => {
 
   const queryClient = new QueryClient();
 
-  function mountImageModal(imageData?: RequirementImage, onDelete?: () => void): React.ReactNode {
+  function mountImageModal(
+    imageData?: RequirementImage,
+    onDelete?: () => void
+  ): React.ReactNode {
     return (
       <QueryClientProvider client={queryClient}>
         <ImageModal
@@ -106,7 +110,7 @@ describe("ImageModal Component", () => {
 
     // Click delete button
     cy.get('[data-testid="delete-action-modal-button"]').click();
-    
+
     // Confirm deletion
     cy.get('[data-testid="delete-confirmation-button"]').click();
 

compliance-web/src/components/App/Inspections/Profile/Reports/ReportTabContents/IRImageSection.tsx

@@ -1,5 +1,4 @@
 import { RequirementImage } from "@/models/Image";
-import { formatS3Url } from "@/utils/appUtils";
 import { Typography } from "@mui/material";
 import { Box } from "@mui/material";
 import imageNotFound from "@/assets/images/image-not-found.svg";
@@ -19,7 +18,7 @@ const IRImageSection = ({ image }: { image: RequirementImage }) => {
         }}
       >
         <img
-          src={formatS3Url(image.relative_url ?? "")}
+          src={image.url ?? ""}
           alt={image.caption}
           style={{
             width: "100%",

compliance-web/src/components/App/Inspections/Profile/Requirements/Images/ImageCard.tsx

@@ -3,7 +3,6 @@ import { Box } from "@mui/material";
 import { RequirementImage } from "@/models/Image";
 import { arraySwap, useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
-import { formatS3Url } from "@/utils/appUtils";
 import imageNotFound from "@/assets/images/image-not-found.svg";
 import { BCDesignTokens } from "epic.theme";
 
@@ -66,7 +65,7 @@ export default function ImageCard({
         }}
       >
         <img
-          src={formatS3Url(image.relative_url ?? "")}
+          src={image.url ?? ""}
           alt={image.caption}
           width={"100%"}
           onError={(e) => {

compliance-web/src/components/App/Inspections/Profile/Requirements/Images/ImageModal.tsx

@@ -13,7 +13,6 @@ import GridLabelValuePair from "@/components/Shared/GridLabelValuePair";
 import { ImageFormData, RequirementImage } from "@/models/Image";
 import { useEffect, useMemo } from "react";
 import { useImageUpload } from "@/hooks/useImageUpload";
-import { formatS3Url } from "@/utils/appUtils";
 import dayjs from "dayjs";
 import dateUtils from "@/utils/dateUtils";
 import { ImageTypeEnum } from "@/components/App/Inspections/Profile/Requirements/RequirementUtils";
@@ -69,11 +68,15 @@ const ImageModal: React.FC<ImageModalProps> = ({
 
   const { handleSubmit, reset, getValues } = methods;
 
-  const onSuccess = (uploadedFileUrl: string) => {
+  const onSuccess = (uploadedFile: {
+    presigned_url: string;
+    relative_url: string;
+  }) => {
     const takenBy = getValues("takenBy") as StaffUser;
     const imageFormData: RequirementImage = {
       id: Date.now(),
-      relative_url: uploadedFileUrl,
+      relative_url: uploadedFile.relative_url,
+      url: uploadedFile.presigned_url,
       caption: getValues("caption"),
       taken_by: takenBy,
       taken_by_id: takenBy?.id,
@@ -139,7 +142,7 @@ const ImageModal: React.FC<ImageModalProps> = ({
                 src={
                   file
                     ? URL.createObjectURL(file)
-                    : formatS3Url(requirementImage?.relative_url ?? "")
+                    : (requirementImage?.url ?? "")
                 }
                 alt="Preview"
                 style={{ maxHeight: "100%", maxWidth: "100%" }}
@@ -181,8 +184,9 @@ const ImageModal: React.FC<ImageModalProps> = ({
                     ? dateUtils.formatDate(
                         dayjs(file.lastModified).toISOString()
                       )
-                    : dateUtils.formatDate(requirementImage?.date_taken ?? "") ||
-                      "No file selected"
+                    : dateUtils.formatDate(
+                        requirementImage?.date_taken ?? ""
+                      ) || "No file selected"
                 }
                 gridProps={{ xs: 4 }}
                 isBold

compliance-web/src/components/App/Inspections/Profile/Requirements/RequirementUtils.ts

@@ -224,7 +224,7 @@ export const formatImagesToMentionList = (images: RequirementImage[]): MentionDa
   return images.map((image) => ({
     id: image.id ?? 0,
     name: `${image.image_type ?? ""} ${image.sort_order}`,
-    imageRelativeUrl: image.relative_url ?? "",
+    imageUrl: image.url ?? "",
   }));
 };
 
@@ -359,7 +359,7 @@ export const formatRequirementImagesInFindings = (
         const imageLabel = `${image.image_type} ${image.sort_order}`;
         span.textContent = imageLabel;
         span.setAttribute("data-mention", imageLabel);
-        span.setAttribute("data-imageurl", image.relative_url ?? "");
+        span.setAttribute("data-imageurl", image.url ?? "");
       } else {
         span.parentNode?.removeChild(span);
       }

compliance-web/src/components/Shared/LexicalEditor/LexicalUtils.tsx

@@ -1,7 +1,7 @@
 export type MentionData = {
   id: number;
   name: string;
-  imageRelativeUrl?: string;
+  imageUrl?: string;
 };
 
 export const LexicalTheme = {