Send update upload status to new endpoint shape using sampleFileId

Signed-off-by: cosa65 <[email protected]>
biomage-org · Nov 28, 2023 · f14b0aa · f14b0aa
1 parent 0204a7e
commit f14b0aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/redux/actions/samples/createSampleFile.js b/src/redux/actions/samples/createSampleFile.js
@@ -16,10 +16,12 @@ const createSampleFile = (
 ) => async (dispatch) => {
   const updatedAt = dayjs().toISOString();
 
+  const sampleFileId = uuidv4();
+
   try {
     const url = `/v2/experiments/${experimentId}/samples/${sampleId}/sampleFiles/${type}`;
     const body = {
-      sampleFileId: uuidv4(),
+      sampleFileId,
       size: fileForApiV1.size,
     };
 
@@ -49,7 +51,9 @@ const createSampleFile = (
 
     return body.sampleFileId;
   } catch (e) {
-    dispatch(updateSampleFileUpload(experimentId, sampleId, type, UploadStatus.UPLOAD_ERROR));
+    dispatch(updateSampleFileUpload(
+      experimentId, sampleId, sampleFileId, type, UploadStatus.UPLOAD_ERROR,
+    ));
 
     throw e;
   }

diff --git a/src/redux/actions/samples/updateSampleFileUpload.js b/src/redux/actions/samples/updateSampleFileUpload.js
@@ -8,14 +8,14 @@ import UploadStatus from 'utils/upload/UploadStatus';
 import fileNameForApiV1 from 'utils/upload/fileNameForApiV1';
 
 const updateSampleFileUpload = (
-  experimentId, sampleId, type, uploadStatus, uploadProgress,
+  experimentId, sampleId, sampleFileId, type, uploadStatus, uploadProgress,
 ) => async (dispatch) => {
   const updatedAt = dayjs().toISOString();
 
   // Don't send an api update whenever the progress bar is updated, only for uploadStatus changes
   // TODO: move progress to not even be a part of redux, manage it in a different way
   if (uploadStatus !== UploadStatus.UPLOADING) {
-    const url = `/v2/experiments/${experimentId}/samples/${sampleId}/sampleFiles/${type}`;
+    const url = `/v2/experiments/${experimentId}/sampleFiles/${sampleFileId}`;
     const body = { uploadStatus };
 
     try {

diff --git a/src/utils/upload/processUpload.js b/src/utils/upload/processUpload.js
@@ -84,7 +84,7 @@ const createAndUploadSampleFile = async (file, experimentId, sampleId, dispatch,
     try {
       file.fileObject = await loadAndCompressIfNecessary(file, () => {
         dispatch(updateSampleFileUpload(
-          experimentId, sampleId, fileType, UploadStatus.COMPRESSING,
+          experimentId, sampleId, sampleFileId, fileType, UploadStatus.COMPRESSING,
         ));
       });
 
@@ -94,7 +94,9 @@ const createAndUploadSampleFile = async (file, experimentId, sampleId, dispatch,
         ? UploadStatus.FILE_READ_ABORTED
         : UploadStatus.FILE_READ_ERROR;
 
-      dispatch(updateSampleFileUpload(experimentId, sampleId, fileType, fileErrorStatus));
+      dispatch(updateSampleFileUpload(
+        experimentId, sampleId, sampleFileId, fileType, fileErrorStatus,
+      ));
       return;
     }
   }
@@ -109,7 +111,7 @@ const createAndUploadSampleFile = async (file, experimentId, sampleId, dispatch,
 
     const updateSampleFileUploadProgress = (status, percentProgress = 0) => dispatch(
       updateSampleFileUpload(
-        experimentId, sampleId, fileType, status, percentProgress,
+        experimentId, sampleId, sampleFileId, fileType, status, percentProgress,
       ),
     );
 
@@ -118,7 +120,7 @@ const createAndUploadSampleFile = async (file, experimentId, sampleId, dispatch,
     await prepareAndUploadFileToS3(file, uploadUrlParams, 'sample', updateSampleFileUploadProgress);
   } catch (e) {
     dispatch(updateSampleFileUpload(
-      experimentId, sampleId, fileType, UploadStatus.UPLOAD_ERROR,
+      experimentId, sampleId, sampleFileId, fileType, UploadStatus.UPLOAD_ERROR,
     ));
   }
 };