From 9b76f04176f5b46fa1ae50cba28fd4ea05c24f24 Mon Sep 17 00:00:00 2001
From: Piotr Rogowski <piotr.rogowski0@gmail.com>
Date: Sun, 6 Nov 2022 11:58:29 +0100
Subject: [PATCH] Fix upload issues with doubled number of log files

---
 src/pages/Upload.tsx | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/pages/Upload.tsx b/src/pages/Upload.tsx
index 6a9aa5b7..480bb232 100644
--- a/src/pages/Upload.tsx
+++ b/src/pages/Upload.tsx
@@ -135,8 +135,6 @@ const UploadPage = () => {
   const [logFiles, setLogFiles] = useState<File[]>([]);
   const [toothLogFiles, setToothLogFiles] = useState<File[]>([]);
 
-  const [logsTouched, setLogsTouched] = useState(false);
-  const [toothLogsTouched, setToothLogsTouched] = useState(false);
   const [customIniRequired, setCustomIniRequired] = useState(false);
 
   const shareSupported = 'share' in navigator;
@@ -245,7 +243,7 @@ const UploadPage = () => {
         fuel,
         ignition,
         year,
-      ].filter((field) => field !== null && `${field}`.length > 1)
+      ].filter((field) => field !== null && `${field}`.length > 1 && field !== 'null')
         .join(' ')
         .replace(/[^\w.\-\d ]/g, ''),
     };
@@ -264,15 +262,12 @@ const UploadPage = () => {
       }
     });
 
-
     if (existingTune) {
-      if (logsTouched || toothLogsTouched) {
-        // clear old multi files first since there is no other way to handle this
-        const tempFormData = new FormData();
-        tempFormData.append('logFiles', '');
-        tempFormData.append('toothLogFiles', '');
-        await updateTune(existingTune.id, tempFormData as unknown as TunesRecord);
-      }
+      // always clear old multi files first since there is no other way to handle this
+      const tempFormData = new FormData();
+      tempFormData.append('logFiles', '');
+      tempFormData.append('toothLogFiles', '');
+      await updateTune(existingTune.id, tempFormData as unknown as TunesRecord);
 
       // another update with new files
       await updateTune(existingTune.id, formData as unknown as TunesRecord);
@@ -357,7 +352,6 @@ const UploadPage = () => {
   const uploadLogs = async (options: UploadRequestOption) => {
     upload(options, async (file) => {
       setLogFiles((prev) => [...prev, file]);
-      setLogsTouched(true);
     }, async (file) => {
       const { result, message } = await validateSize(file);
       if (!result) {
@@ -391,7 +385,6 @@ const UploadPage = () => {
   const uploadToothLogs = async (options: UploadRequestOption) => {
     upload(options, async (file) => {
       setToothLogFiles((prev) => [...prev, file]);
-      setToothLogsTouched(true);
     }, async (file) => {
       const { result, message } = await validateSize(file);
       if (!result) {
@@ -439,12 +432,10 @@ const UploadPage = () => {
 
   const removeLogFile = async (file: UploadFile) => {
     setLogFiles((prev) => prev.filter((f) => removeFilenameSuffix(f.name) !== file.name));
-    setLogsTouched(true);
   };
 
   const removeToothLogFile = async (file: UploadFile) => {
     setToothLogFiles((prev) => prev.filter((f) => removeFilenameSuffix(f.name) !== file.name));
-    setToothLogsTouched(true);
   };
 
   const removeCustomIniFile = async (file: UploadFile) => {