From 159765a84b75cbdb999fda5117adc68b0c8153d4 Mon Sep 17 00:00:00 2001
From: Antony Raj <539454+antonyr@users.noreply.github.com>
Date: Wed, 31 Jul 2024 01:34:23 +0800
Subject: [PATCH] Making sure to open modal automatically for cropping the
 image being uploaded (#207)

* Make sure to open modal automatically for cropping

* added functionality to show image by using its id

* Fix linting issues
---
 frontend/src/components/ListingForm.tsx       |  1 +
 frontend/src/components/files/UploadImage.tsx | 40 ++++++++++++-------
 frontend/src/pages/NewListing.tsx             |  2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/ListingForm.tsx b/frontend/src/components/ListingForm.tsx
index da657ff0..ba7762b1 100644
--- a/frontend/src/components/ListingForm.tsx
+++ b/frontend/src/components/ListingForm.tsx
@@ -104,6 +104,7 @@ const ListingForm: React.FC<ListingFormProps> = ({
                 onUploadSuccess={(image_id) =>
                   handleImageUploadSuccess(image_id, index)
                 }
+                imageId={image.id}
               />
               <label htmlFor={"caption-" + index}>Caption</label>
               <Form.Control
diff --git a/frontend/src/components/files/UploadImage.tsx b/frontend/src/components/files/UploadImage.tsx
index eb8741ea..b1ab647e 100644
--- a/frontend/src/components/files/UploadImage.tsx
+++ b/frontend/src/components/files/UploadImage.tsx
@@ -1,5 +1,6 @@
 import imageCompression from "browser-image-compression";
 import TCButton from "components/files/TCButton";
+import { BACKEND_URL } from "constants/backend";
 import { api } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useTheme } from "hooks/theme";
@@ -14,10 +15,12 @@ const MAX_FILE_MB = MAX_FILE_SIZE / 1024 / 1024;
 
 interface ImageUploadProps {
   onUploadSuccess: (url: string) => void;
+  imageId?: string | null;
 }
 
 const ImageUploadComponent: React.FC<ImageUploadProps> = ({
   onUploadSuccess,
+  imageId,
 }) => {
   const [selectedFile, setSelectedFile] = useState<File | null>(null);
   const [compressedFile, setCompressedFile] = useState<File | null>(null);
@@ -33,7 +36,15 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
   const [crop, setCrop] = useState<Crop>();
   const [completedCrop, setCompletedCrop] = useState<Crop | null>(null);
   const imgRef = useRef<HTMLImageElement | null>(null);
+  const [imageUrl, setImageUrl] = useState<string | null>();
+  useEffect(() => {
+    if (selectedFile) setImageUrl(URL.createObjectURL(selectedFile));
+  }, [selectedFile]);
 
+  useEffect(() => {
+    if (imageId)
+      setImageUrl(new URL(`/images/${imageId}/large`, BACKEND_URL).toString());
+  }, []);
   const handleFileChange = async (file: File) => {
     setUploadStatus(null);
 
@@ -65,6 +76,7 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
       setFileError("Error compressing the image");
       setSelectedFile(null);
     }
+    setShowModal(true);
   };
 
   const onDrop = (acceptedFiles: FileWithPath[]) => {
@@ -108,7 +120,7 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
 
   const handleClick = (event: React.MouseEvent) => {
     event.stopPropagation();
-    if (selectedFile) {
+    if (imageUrl) {
       setShowModal(true);
     } else {
       triggerFileInput();
@@ -190,14 +202,14 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
   };
 
   useEffect(() => {
-    if (selectedFile) setInitialSetter(true);
+    if (imageUrl) setInitialSetter(true);
   }, [showModal]);
 
   return (
     <Col md="6">
       <Modal show={showModal} onHide={onModalHide} centered>
         <Modal.Body>
-          {selectedFile ? (
+          {imageUrl ? (
             <>
               <ReactCrop
                 crop={crop}
@@ -209,7 +221,7 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
                 onComplete={handleCropComplete}
               >
                 <img
-                  src={URL.createObjectURL(selectedFile)}
+                  src={imageUrl}
                   onLoad={handleImageLoaded}
                   alt="Crop preview"
                 />
@@ -222,7 +234,11 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
                 >
                   Close
                 </TCButton>
-                <TCButton onClick={handleDone} variant="primary">
+                <TCButton
+                  style={{ marginLeft: "1em" }}
+                  onClick={handleDone}
+                  variant="primary"
+                >
                   Done
                 </TCButton>
               </div>
@@ -256,13 +272,13 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
             alignItems: "center",
             marginBottom: "10px",
             overflow: "hidden",
-            cursor: selectedFile ? "pointer" : "default",
+            cursor: imageUrl ? "pointer" : "default",
           }}
           onClick={handleClick}
         >
-          {selectedFile ? (
+          {imageUrl ? (
             <img
-              src={URL.createObjectURL(selectedFile)}
+              src={imageUrl}
               alt="Selected"
               style={{ maxWidth: "100%", maxHeight: "100%" }}
             />
@@ -291,7 +307,7 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
                 event.stopPropagation();
                 setShowModal(true);
               }}
-              disabled={selectedFile ? false : true}
+              disabled={imageUrl ? false : true}
               variant={theme === "dark" ? "outline-light" : "outline-dark"}
             >
               Edit
@@ -307,11 +323,7 @@ const ImageUploadComponent: React.FC<ImageUploadProps> = ({
         </div>
         {fileError && <Alert variant="danger">{fileError}</Alert>}
       </div>
-      <TCButton
-        onClick={handleUpload}
-        disabled={!selectedFile}
-        className="my-3"
-      >
+      <TCButton onClick={handleUpload} disabled={!imageUrl} className="my-3">
         Upload
       </TCButton>
       {uploadStatus && (
diff --git a/frontend/src/pages/NewListing.tsx b/frontend/src/pages/NewListing.tsx
index 52ca67d4..6f79734f 100644
--- a/frontend/src/pages/NewListing.tsx
+++ b/frontend/src/pages/NewListing.tsx
@@ -30,7 +30,7 @@ const NewListing: React.FC = () => {
         artifact_ids: artifacts.map((artifact) => artifact.id),
         child_ids,
       });
-      setMessage(`Listing added successfully.`);
+      setMessage("Listing added successfully.");
       navigate("/listings/me/1");
     } catch (error) {
       setMessage("Error adding Listing ");