fix: csv page now closes on success

bcgov · Sep 9, 2024 · 0ee218e · 0ee218e
1 parent 527ec77
commit 0ee218e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/api/src/utils/logger.test.ts b/api/src/utils/logger.test.ts
@@ -11,7 +11,7 @@ describe('logger', () => {
     });
   });
 
-  describe.only('setLogLevel', () => {
+  describe('setLogLevel', () => {
     let currentLogLevel: string | undefined;
 
     beforeEach(() => {

diff --git a/app/src/components/file-upload/FileUploadItem.tsx b/app/src/components/file-upload/FileUploadItem.tsx
@@ -278,13 +278,15 @@ const FileUploadItem = (props: IFileUploadItemProps) => {
   return (
     <FileUploadItemContent
       file={file}
+      status={status}
       progress={progress}
       error={error}
       errorDetails={errorDetails}
+      enableErrorDetails={props.enableErrorDetails}
       onCancel={() => setInitiateCancel(true)}
-      SubtextComponent={() => <Subtext file={file} status={status} progress={progress} error={error} />}
-      ActionButtonComponent={() => <MemoizedActionButton status={status} onCancel={() => setInitiateCancel(true)} />}
-      ProgressBarComponent={() => <MemoizedProgressBar status={status} progress={progress} />}
+      SubtextComponent={Subtext}
+      ActionButtonComponent={MemoizedActionButton as any}
+      ProgressBarComponent={MemoizedProgressBar as any}
     />
   );
 };

diff --git a/app/src/components/file-upload/FileUploadItemContent.tsx b/app/src/components/file-upload/FileUploadItemContent.tsx
@@ -12,6 +12,13 @@ import FileUploadItemProgressBar from './FileUploadItemProgressBar';
 import FileUploadItemSubtext from './FileUploadItemSubtext';
 
 type FileUploadItemContentProps = Omit<IFileUploadItemProps, 'uploadHandler' | 'onSuccess' | 'fileHandler'> & {
+  /**
+   * The file upload status.
+   *
+   * @type {UploadFileStatus}
+   * @memberof FileUploadItemContentProps
+   */
+  status: UploadFileStatus;
   /**
    * The progress of the file upload.
    *
@@ -35,8 +42,6 @@ type FileUploadItemContentProps = Omit<IFileUploadItemProps, 'uploadHandler' | '
  * @returns {*}
  */
 export const FileUploadItemContent = (props: FileUploadItemContentProps) => {
-  const status = props.status ?? UploadFileStatus.PENDING;
-
   /**
    * Sensible defaults for the subtext, action button, and progress bar components.
    *
@@ -48,7 +53,7 @@ export const FileUploadItemContent = (props: FileUploadItemContentProps) => {
   return (
     <ListItem
       key={props.file.name}
-      secondaryAction={<ActionButton status={status} onCancel={props.onCancel} />}
+      secondaryAction={<ActionButton status={props.status} onCancel={props.onCancel} />}
       sx={{
         flexWrap: 'wrap',
         borderStyle: 'solid',
@@ -77,7 +82,7 @@ export const FileUploadItemContent = (props: FileUploadItemContentProps) => {
       </ListItemIcon>
       <ListItemText
         primary={props.file.name}
-        secondary={<Subtext file={props.file} status={status} progress={props.progress} error={props.error} />}
+        secondary={<Subtext file={props.file} status={props.status} progress={props.progress} error={props.error} />}
         sx={{
           '& .MuiListItemText-primary': {
             fontWeight: 700
@@ -93,7 +98,7 @@ export const FileUploadItemContent = (props: FileUploadItemContentProps) => {
             mb: 1
           }
         }}>
-        <ProgressBar status={status} progress={props.progress} />
+        <ProgressBar status={props.status} progress={props.progress} />
       </Box>
       {props.enableErrorDetails && (
         <Box sx={{ mt: 1, ml: 5, width: '100%' }}>

diff --git a/app/src/features/surveys/animals/profile/captures/import-captures/CreateCSVCapturesPage.tsx b/app/src/features/surveys/animals/profile/captures/import-captures/CreateCSVCapturesPage.tsx
@@ -14,7 +14,7 @@ import { FileUploadSingleItem } from 'components/file-upload/FileUploadSingleIte
 import PageHeader from 'components/layout/PageHeader';
 import { useBiohubApi } from 'hooks/useBioHubApi';
 import { useProjectContext, useSurveyContext } from 'hooks/useContext';
-import { useUnsavedChangesDialog } from 'hooks/useUnsavedChangesDialog';
+import { SKIP_CONFIRMATION_DIALOG, useUnsavedChangesDialog } from 'hooks/useUnsavedChangesDialog';
 import { useCallback, useMemo, useState } from 'react';
 import { Prompt, useHistory } from 'react-router';
 import { Link as RouterLink } from 'react-router-dom';
@@ -136,14 +136,18 @@ export const CreateCSVCapturesPage = () => {
     // If the Captures CSV upload failed, don't attempt to upload Measurements or Markings
     if (captureUploadStatus !== UploadFileStatus.FAILED) {
       // Measurements / Markings can be uploaded in parallel
-      await Promise.all([
+      const [measurementUploadStatus, markingUploadStatus] = await Promise.all([
         handleFileUpload('measurements', (file, onProgress) =>
           biohubApi.survey.importMeasurementsFromCsv(file, projectId, surveyId, cancelToken, onProgress)
         ),
         handleFileUpload('markings', (file, onProgress) =>
           biohubApi.survey.importMarkingsFromCsv(file, projectId, surveyId, cancelToken, onProgress)
         )
       ]);
+
+      if (measurementUploadStatus !== UploadFileStatus.FAILED || markingUploadStatus !== UploadFileStatus.FAILED) {
+        history.push(`/admin/projects/${projectId}/surveys/${surveyId}/animals`, SKIP_CONFIRMATION_DIALOG);
+      }
     }
   };