fix: image put true if already true (#378)

Co-authored-by: Antoine Dufils <[email protected]> Co-authored-by: Teddy Roncin <[email protected]> Co-authored-by: Noé Landré <[email protected]>
ungdev · Sep 13, 2024 · 31d63b3 · 31d63b3
1 parent 1022279
commit 31d63b3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/components/dashboard/ItemModal.tsx b/src/components/dashboard/ItemModal.tsx
@@ -24,7 +24,7 @@ const ItemModal = ({
   const [endDate, setEndDate] = useState(item?.availableUntil || null);
   const [quantity, setQuantity] = useState(item?.stock || null);
   const [infos, setInfos] = useState(item?.infos || null);
-  const [image, setImage] = useState<File | null>(null);
+  const [logo, setLogo] = useState<File | null>(null);
   const [display, setDisplay] = useState(item?.display || false);
 
   const [attribute, setAttribute] = useState(item?.attribute || null);
@@ -57,6 +57,11 @@ const ItemModal = ({
           <Button
             primary
             onClick={() => {
+              let image;
+              if (item?.image || logo) {
+                image = true;
+              }
+
               const body = {
                 id: id ?? '',
                 name: name ?? '',
@@ -66,14 +71,15 @@ const ItemModal = ({
                 reducedPrice: reducedPrice ?? 0,
                 availableFrom: startDate ? startDate : null,
                 availableUntil: endDate ? endDate : null,
+                image: image ?? false,
                 // we update the stock through a difference between the current stock and the quantity in order to avoid conflicts if an order is made at the same time
                 left: quantity! - item!.stock! ?? item!.stock!,
                 infos: infos ? infos : null,
                 display: display ?? false,
               } as AdminItem;
 
               dispatch(
-                updateItem(body, image, () => {
+                updateItem(body, logo, () => {
                   onClose!();
                 }),
               );
@@ -123,7 +129,7 @@ const ItemModal = ({
           onChange={(value) => setQuantity(value as unknown as number)}
         />
         <Textarea label="Description" value={infos ?? ''} onChange={setInfos} />
-        <FileInput label="Logo" value={item ? getItemImageLink(item.id) : ''} onChange={setImage} type={['png']} />
+        <FileInput label="Logo" value={item ? getItemImageLink(item.id) : ''} onChange={setLogo} type={['png']} />
         <Checkbox label="Display" value={display} onChange={setDisplay} />
       </>
     </Modal>

diff --git a/src/modules/admin.ts b/src/modules/admin.ts
@@ -276,7 +276,7 @@ export const fetchAdminItems = (): AppThunk => async (dispatch) => {
 };
 
 export const updateItem =
-  (item: AdminItem, image: File | null, callback: () => void): AppThunk =>
+  (item: AdminItem, logo: File | null, callback: () => void): AppThunk =>
   async (dispatch) => {
     try {
       const result = await API.patch(`admin/items/${item.id}`, {
@@ -290,11 +290,11 @@ export const updateItem =
         availableFrom: item.availableFrom,
         availableUntil: item.availableUntil,
         display: item.display.toString(),
-        image: !!image,
+        image: item.image,
       });
 
-      if (result && image) {
-        await uploadFile(image, getItemImageName(result.id), ITEM_FOLDER);
+      if (result && logo) {
+        await uploadFile(logo, getItemImageName(result.id), ITEM_FOLDER);
       }
 
       callback();