updated error handling flow for incorrect IRT upload

bcgov · Apr 26, 2024 · 831f8f5 · 831f8f5
1 parent 1fae97a
commit 831f8f5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/services/common/src/components/forms/RenderFileUpload.tsx b/services/common/src/components/forms/RenderFileUpload.tsx
@@ -1,14 +1,15 @@
 import React, { useEffect, useState } from "react";
-import { useSelector, connect } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import "filepond-polyfill";
 import { FilePond, registerPlugin } from "react-filepond";
-import { Form, Popover, Switch, notification } from "antd";
+import { Form, notification, Popover, Switch } from "antd";
 import { invert, uniq } from "lodash";
 import { FunnelPlotOutlined } from "@ant-design/icons";
 import "filepond/dist/filepond.min.css";
 import FilePondPluginFileValidateSize from "filepond-plugin-file-validate-size";
 import FilePondPluginFileValidateType from "filepond-plugin-file-validate-type";
 import * as tus from "tus-js-client";
+import { HttpRequest, HttpResponse } from "tus-js-client";
 import { APPLICATION_OCTET_STREAM, ENVIRONMENT, SystemFlagEnum } from "@mds/common/index";
 import { bindActionCreators } from "redux";
 import { pollDocumentUploadStatus } from "@mds/common/redux/actionCreators/documentActionCreator";
@@ -21,7 +22,6 @@ import {
   MultipartDocumentUpload,
   UploadResult,
 } from "@mds/common/utils/fileUploadHelper.interface";
-import { HttpRequest, HttpResponse } from "tus-js-client";
 import { BaseInputProps } from "./BaseInput";
 
 registerPlugin(FilePondPluginFileValidateSize, FilePondPluginFileValidateType);
@@ -211,7 +211,7 @@ export const FileUpload = (props: FileUploadProps) => {
               }
               props.importIsSuccessful(true);
             } catch (err) {
-              props.importIsSuccessful(false, err);
+              props.importIsSuccessful(false, err.response.data);
             }
 
             if (showWhirlpool) {

diff --git a/...inespace-web/src/components/Forms/projects/informationRequirementsTable/IRTFileImport.tsx b/...inespace-web/src/components/Forms/projects/informationRequirementsTable/IRTFileImport.tsx
@@ -77,21 +77,21 @@ export const IRTFileImport: FC<IRTFileImportProps> = ({
     renderTextColumn("create_user", "Imported By"),
   ];
 
-  const handleCreateInformationRequirementsTable = (
+  const handleCreateInformationRequirementsTable = async (
     projectGuid: string,
     file: IFileInfo,
     documentGuid: string
   ) => {
-    dispatch(createInformationRequirementsTable(projectGuid, file, documentGuid));
+    return dispatch(createInformationRequirementsTable(projectGuid, file, documentGuid));
   };
 
-  const handleUpdateInformationRequirementsTableByFile = (
+  const handleUpdateInformationRequirementsTableByFile = async (
     projectGuid: string,
     informationRequirementsTableGuid: string,
     file: IFileInfo,
     documentGuid: string
   ) => {
-    dispatch(
+    return dispatch(
       updateInformationRequirementsTableByFile(
         projectGuid,
         informationRequirementsTableGuid,

diff --git a/...space-web/src/components/modalContent/informationRequirementsTable/ImportIRTErrorModal.js b/...space-web/src/components/modalContent/informationRequirementsTable/ImportIRTErrorModal.js
@@ -61,8 +61,8 @@ export const ImportIRTErrorModal = (props) => {
         </h3>
         <b>{description}</b>
         <br />
-        {errorSection.map((es) => (
-          <p>
+        {errorSection.map((es, index) => (
+          <p key={index}>
             Section {es.section} Row {es.row_number}
           </p>
         ))}
@@ -109,7 +109,6 @@ export const ImportIRTErrorModal = (props) => {
   }
   return (
     <div>
-      <p>{props.errors}</p>
       <div className="ant-modal-footer">
         <Button type="primary" onClick={props.closeModal}>
           Close

diff --git a/services/minespace-web/src/components/pages/Project/InformationRequirementsTablePage.tsx b/services/minespace-web/src/components/pages/Project/InformationRequirementsTablePage.tsx
@@ -128,7 +128,7 @@ export const InformationRequirementsTablePage = () => {
     if (importFailed && importErrors) {
       openIRTImportErrorModal(importErrors);
     }
-  }, [importFailed]);
+  }, [importFailed, importErrors]);
 
   useEffect(() => {
     if (uploadedSuccessfully) {
@@ -144,7 +144,7 @@ export const InformationRequirementsTablePage = () => {
 
   const getRequirementsVersion = () => {
     return (
-      project.information_requirements_table.requirements?.[0].version ??
+      project.information_requirements_table.requirements?.[0]?.version ??
       requirements[requirements.length - 1].version
     );
   };
@@ -204,13 +204,13 @@ export const InformationRequirementsTablePage = () => {
 
   const importIsSuccessful = async (success, err) => {
     if (!success) {
-      const hasBadRequestError = err?.response?.data?.message.includes("400 Bad Request: [");
-      const formattedError = marshalImportIRTError(err?.response?.data?.message);
+      const hasBadRequestError = err?.message.includes("400 Bad Request: [");
+      const formattedError = marshalImportIRTError(err?.message);
       await handleFetchData();
 
+      setHasBadRequestError(hasBadRequestError);
       setImportFailed(true);
       setImportErrors(formattedError);
-      setHasBadRequestError(hasBadRequestError);
       return;
     }