Merge branch 'master' of github.com:biomage-org/ui into refactor-etag

Signed-off-by: Pol Alvarez <[email protected]>
hms-dbmi-cellenics · Oct 25, 2023 · 0eec26a · 0eec26a
2 parents 0cc687f + 3a97656
commit 0eec26a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/...test__/pages/experiments/[experimentId]/plots-and-tables/normalized-matrix/index.test.jsx b/...test__/pages/experiments/[experimentId]/plots-and-tables/normalized-matrix/index.test.jsx
@@ -112,7 +112,7 @@ describe('Normalized matrix index page', () => {
 
     await waitFor(() => {
       expect(writeToFileURL).toHaveBeenCalledWith(result);
-      expect(downloadFromUrl).toHaveBeenCalledWith(writeToFileURLResult, 'NormalizedExpression.csv');
+      expect(downloadFromUrl).toHaveBeenCalledWith(writeToFileURLResult, 'NormalizedExpression.csv.gz');
     });
   });
 
@@ -159,7 +159,7 @@ describe('Normalized matrix index page', () => {
 
     await waitFor(() => {
       expect(writeToFileURL).toHaveBeenCalledWith(result);
-      expect(downloadFromUrl).toHaveBeenCalledWith(writeToFileURLResult, 'NormalizedExpression.csv');
+      expect(downloadFromUrl).toHaveBeenCalledWith(writeToFileURLResult, 'NormalizedExpression.csv.gz');
     });
   });
 

diff --git a/src/redux/actions/componentConfig/downloadNormalizedMatrix.js b/src/redux/actions/componentConfig/downloadNormalizedMatrix.js
@@ -28,7 +28,7 @@ const downloadNormalizedMatrix = (
       dispatch,
     );
 
-    downloadFromUrl(writeToFileURL(data), 'NormalizedExpression.csv');
+    downloadFromUrl(writeToFileURL(data), 'NormalizedExpression.csv.gz');
 
     dispatch({
       type: PLOT_DATA_LOADED,

diff --git a/src/utils/getTimeoutForWorkerTask.js b/src/utils/getTimeoutForWorkerTask.js
@@ -13,7 +13,8 @@ const getTimeoutForWorkerTask = (state, taskName) => {
   switch (taskName) {
     case 'GetEmbedding':
     case 'ListGenes':
-    case 'MarkerHeatmap': {
+    case 'MarkerHeatmap':
+    case 'GetNormalizedExpression': {
       // all of this calls can happen at the same time and each of them can potentially have to
       // wait for the others to finish before it starts processing (due to the SQS) so the timeout
       // needs to be large enough for the slowest task to finish
@@ -36,7 +37,6 @@ const getTimeoutForWorkerTask = (state, taskName) => {
     case 'GeneExpression':
     case 'GetMitochondrialContent':
     case 'GetDoubletScore':
-    case 'GetNormalizedExpression':
     case 'DownloadAnnotSeuratObject':
     case 'DifferentialExpression':
     case 'GetNUmis':

diff --git a/src/utils/work/unpackResult.js b/src/utils/work/unpackResult.js
@@ -2,7 +2,7 @@ import { decompress } from 'fflate';
 
 const unpackResult = async (storageResp, taskName = null) => {
   // SeuratObject can fail to download when loaded into memory
-  if (taskName === 'DownloadAnnotSeuratObject') {
+  if (taskName === 'DownloadAnnotSeuratObject' || taskName === 'GetNormalizedExpression') {
     const blob = await storageResp.blob();
     return (blob);
   }

diff --git a/src/utils/work/waitForWorkRequest.js b/src/utils/work/waitForWorkRequest.js
@@ -47,7 +47,8 @@ const getWorkerTimeout = (taskName, defaultTimeout) => {
   switch (taskName) {
     case 'GetEmbedding':
     case 'ListGenes':
-    case 'MarkerHeatmap': {
+    case 'MarkerHeatmap':
+    case 'GetNormalizedExpression': {
       return dayjs().add(1800, 's').toISOString();
     }