pull latest changes

cancervariants · Sep 26, 2024 · 70b04f7 · 70b04f7
2 parents 08d98e8 + 100bb39
commit 70b04f7
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 24 deletions.
diff --git a/client/src/components/Pages/Structure/Input/GeneElementInput/GeneElementInput.tsx b/client/src/components/Pages/Structure/Input/GeneElementInput/GeneElementInput.tsx
@@ -22,11 +22,13 @@ const GeneElementInput: React.FC<GeneElementInputProps> = ({
   handleDelete,
   icon,
 }) => {
+  const [errors, setErrors] = useState<string[]>([]);
   const [gene, setGene] = useState<string>(element.gene?.label || "");
   const [geneText, setGeneText] = useState<string>("");
   const validated = gene !== "" && geneText == "";
   const [expanded, setExpanded] = useState<boolean>(!validated);
   const [pendingResponse, setPendingResponse] = useState(false);
+  const geneNotFound = "Gene not found";
 
   useEffect(() => {
     if (validated) buildGeneElement();
@@ -39,11 +41,14 @@ const GeneElementInput: React.FC<GeneElementInputProps> = ({
         geneElementResponse.warnings &&
         geneElementResponse.warnings.length > 0
       ) {
-        setGeneText("Gene not found");
+        setGeneText(geneNotFound);
+        setErrors([geneNotFound]);
+        setPendingResponse(false);
       } else if (
         geneElementResponse.element &&
         geneElementResponse.element.gene
       ) {
+        setErrors([]);
         getGeneNomenclature(geneElementResponse.element).then(
           (nomenclatureResponse: NomenclatureResponse) => {
             if (
@@ -81,6 +86,7 @@ const GeneElementInput: React.FC<GeneElementInputProps> = ({
     handleDelete,
     inputElements,
     validated,
+    errors,
     icon,
     pendingResponse,
   });

diff --git a/client/src/components/Pages/Structure/Input/LinkerElementInput/LinkerElementInput.tsx b/client/src/components/Pages/Structure/Input/LinkerElementInput/LinkerElementInput.tsx
@@ -70,6 +70,7 @@ const LinkerElementInput: React.FC<LinkerElementInputProps> = ({
     handleDelete,
     inputElements,
     validated,
+    errors: linkerError ? ["Invalid linker sequence"] : [],
     icon,
   });
 };

diff --git a/...nt/src/components/Pages/Structure/Input/RegulatoryElementInput/RegulatoryElementInput.tsx b/...nt/src/components/Pages/Structure/Input/RegulatoryElementInput/RegulatoryElementInput.tsx
@@ -65,6 +65,8 @@ const RegulatoryElementInput: React.FC<RegulatoryElementInputProps> = ({
   const validated = gene !== "" && geneText == "" && elementClass !== "default";
   const [expanded, setExpanded] = useState<boolean>(!validated);
 
+  const [errors, setErrors] = useState<string[]>([]);
+
   useEffect(() => {
     if (validated) handleAdd();
   }, [gene, geneText, elementClass]);
@@ -73,16 +75,19 @@ const RegulatoryElementInput: React.FC<RegulatoryElementInputProps> = ({
     if (elementClass === "default") return;
     getRegulatoryElement(elementClass, gene).then((reResponse) => {
       if (reResponse.warnings && reResponse.warnings.length > 0) {
-        throw new Error(reResponse.warnings[0]);
+        setErrors(reResponse.warnings);
+        return;
       }
       getRegElementNomenclature(reResponse.regulatoryElement).then(
         (nomenclatureResponse) => {
           if (
             nomenclatureResponse.warnings &&
             nomenclatureResponse.warnings.length > 0
           ) {
-            throw new Error(nomenclatureResponse.warnings[0]);
+            setErrors(nomenclatureResponse.warnings);
+            return;
           }
+          setErrors([]);
           const newRegElement: ClientRegulatoryElement = {
             ...reResponse.regulatoryElement,
             elementId: element.elementId,
@@ -104,6 +109,7 @@ const RegulatoryElementInput: React.FC<RegulatoryElementInputProps> = ({
     setElementClass("default");
     setGene("");
     setGeneText("");
+    setErrors([]);
   };
 
   const inputElements = (
@@ -127,6 +133,7 @@ const RegulatoryElementInput: React.FC<RegulatoryElementInputProps> = ({
     handleDelete: handleDeleteElement,
     inputElements,
     validated,
+    errors,
     icon,
   });
 };

diff --git a/client/src/components/Pages/Structure/Input/StructuralElementInputAccordion.tsx b/client/src/components/Pages/Structure/Input/StructuralElementInputAccordion.tsx
@@ -1,4 +1,3 @@
-import { Tooltip, makeStyles, CircularProgress } from "@material-ui/core";
 import { styled } from "@mui/material/styles";
 import IconButton, { IconButtonProps } from "@mui/material/IconButton";
 import Card from "@mui/material/Card";
@@ -8,11 +7,13 @@ import CardActions from "@mui/material/CardActions";
 import Collapse from "@mui/material/Collapse";
 import DeleteIcon from "@material-ui/icons/Delete";
 import CheckCircleIcon from "@mui/icons-material/CheckCircle";
-import ErrorIcon from "@mui/icons-material/Error";
 import EditIcon from "@material-ui/icons/Edit";
 import { red, green } from "@material-ui/core/colors";
 import "./StructuralElementInputAccordion.scss";
 import { BaseStructuralElementProps } from "./StructuralElementInputProps";
+import React from "react";
+import { Alert, CircularProgress, Tooltip } from "@mui/material";
+import { makeStyles, Typography } from "@material-ui/core";
 
 const useStyles = makeStyles(() => ({
   cardHeaderAction: {
@@ -42,6 +43,7 @@ interface StructuralElementInputAccordionProps
   setExpanded?: React.Dispatch<React.SetStateAction<boolean>>;
   inputElements?: JSX.Element;
   validated: boolean;
+  errors?: string[];
   icon: JSX.Element;
   pendingResponse?: boolean;
 }
@@ -71,6 +73,7 @@ const StructuralElementInputAccordion: React.FC<
   handleDelete,
   inputElements,
   validated,
+  errors,
   icon,
   pendingResponse,
 }) => {
@@ -121,20 +124,25 @@ const StructuralElementInputAccordion: React.FC<
           root: classes.cardActionsRoot,
         }}
       >
-        {validated ? (
+        {errors?.length === 0 && validated ? (
           <Tooltip title="Validation successful">
             <CheckCircleIcon
               className="input-correct"
               style={{ color: green[500] }}
             />
           </Tooltip>
         ) : (
-          <Tooltip title="Invalid component">
-            <ErrorIcon
-              className="input-incorrect"
-              style={{ color: red[500] }}
-            />
-          </Tooltip>
+          <>
+            {errors && errors.length ? (
+              <Alert severity="error">
+                {errors?.map((e) => {
+                  return <Typography variant="body2">{e}</Typography>;
+                })}
+              </Alert>
+            ) : (
+              <></>
+            )}
+          </>
         )}
         {inputElements ? (
           <ExpandMore

diff --git a/...nts/Pages/Structure/Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput.tsx b/...nts/Pages/Structure/Input/TemplatedSequenceElementInput/TemplatedSequenceElementInput.tsx
@@ -18,6 +18,7 @@ interface TemplatedSequenceElementInputProps
 const TemplatedSequenceElementInput: React.FC<
   TemplatedSequenceElementInputProps
 > = ({ element, handleSave, handleDelete, icon }) => {
+  const [errors, setErrors] = useState<string[]>([]);
   const [chromosome, setChromosome] = useState<string>(
     element.inputChromosome || ""
   );
@@ -72,10 +73,12 @@ const TemplatedSequenceElementInput: React.FC<
       ) {
         // TODO visible error handling
         setInputError("element validation unsuccessful");
+        setErrors(templatedSequenceResponse.warnings);
         setPendingResponse(false);
         return;
       } else if (templatedSequenceResponse.element) {
         setInputError("");
+        setErrors([]);
         getTemplatedSequenceNomenclature(
           templatedSequenceResponse.element
         ).then((nomenclatureResponse) => {
@@ -175,6 +178,7 @@ const TemplatedSequenceElementInput: React.FC<
     handleDelete,
     inputElements,
     validated,
+    errors,
     icon,
     pendingResponse,
   });

diff --git a/client/src/components/Pages/Structure/Input/TxSegmentElementInput/TxSegmentElementInput.tsx b/client/src/components/Pages/Structure/Input/TxSegmentElementInput/TxSegmentElementInput.tsx
@@ -50,6 +50,8 @@ const TxSegmentCompInput: React.FC<TxSegmentElementInputProps> = ({
         : null
     );
 
+  const [errors, setErrors] = useState<string[]>([]);
+
   // "Text" variables refer to helper or warning text to set under input fields
   // TODO: this needs refactored so badly
   const [txAc, setTxAc] = useState(element.inputTx || "");
@@ -229,6 +231,7 @@ const TxSegmentCompInput: React.FC<TxSegmentElementInputProps> = ({
             txSegmentResponse.warnings &&
             txSegmentResponse.warnings?.length > 0
           ) {
+            setErrors(txSegmentResponse.warnings);
             CheckGenomicCoordWarning(txSegmentResponse.warnings);
           } else {
             const inputParams = {
@@ -240,6 +243,7 @@ const TxSegmentCompInput: React.FC<TxSegmentElementInputProps> = ({
               inputGenomicStart: txStartingGenomic,
               inputGenomicEnd: txEndingGenomic,
             };
+            setErrors([]);
             handleTxElementResponse(txSegmentResponse, inputParams);
           }
         });
@@ -274,10 +278,13 @@ const TxSegmentCompInput: React.FC<TxSegmentElementInputProps> = ({
                 setEndingExonText("Invalid");
               }
             }
+            setPendingResponse(false);
+            setErrors(txSegmentResponse.warnings);
           } else {
             setTxAcHelperText("");
             setStartingExonText("");
             setEndingExonText("");
+            setErrors([]);
             const inputParams = {
               inputType: txInputType,
               inputTx: txAc,
@@ -674,6 +681,7 @@ const TxSegmentCompInput: React.FC<TxSegmentElementInputProps> = ({
     handleDelete,
     inputElements,
     validated,
+    errors,
     icon,
     pendingResponse,
   });

diff --git a/client/src/components/Pages/Summary/Invalid/Invalid.tsx b/client/src/components/Pages/Summary/Invalid/Invalid.tsx
@@ -101,10 +101,9 @@ export const Invalid: React.FC<Props> = ({
 
   const unknownError = (
     <>
-      <ListItemText>
-        We were unable to parse the validation failure for this fusion:
-      </ListItemText>
-      <blockquote>{validationErrors}</blockquote>
+      {validationErrors.map((error) => (
+        <blockquote>{error}</blockquote>
+      ))}
     </>
   );
 

diff --git a/client/src/components/Pages/Summary/Main/Summary.tsx b/client/src/components/Pages/Summary/Main/Summary.tsx
@@ -104,13 +104,7 @@ export const Summary: React.FC<Props> = ({ setVisibleTab }) => {
     // make request
     validateFusion(formattedFusion).then((response) => {
       if (response.warnings && response.warnings?.length > 0) {
-        if (
-          validationErrors !== null &&
-          JSON.stringify(response.warnings.sort()) !==
-            JSON.stringify(validationErrors.sort())
-        ) {
-          setValidationErrors(response.warnings);
-        }
+        setValidationErrors(response.warnings);
       } else {
         setValidationErrors([]);
         setValidatedFusion(

diff --git a/server/src/curfu/routers/validate.py b/server/src/curfu/routers/validate.py
@@ -32,7 +32,7 @@ def validate_fusion(request: Request, fusion: dict = Body()) -> ResponseDict:
     try:
         verified_fusion = fusor.fusion(**fusion)
     except FUSORParametersException as e:
-        response["warnings"] = [str(e)]
+        response["warnings"] = str(e).split("\n")
     else:
         response["fusion"] = verified_fusion
     return response