Prevent duplicate VUS from being added (oncokb#550)

Author: jfkonecn

src/main/webapp/app/pages/curation/CurationPage.tsx

@@ -168,19 +168,19 @@ export const CurationPage = (props: ICurationPageProps) => {
     }
 
     const oncogeneRef = labelsToRefs[GENE_TYPE.ONCOGENE].current!;
-    const tumorSupressorRef = labelsToRefs[GENE_TYPE.TUMOR_SUPPRESSOR].current!;
+    const tumorSuppressorRef = labelsToRefs[GENE_TYPE.TUMOR_SUPPRESSOR].current!;
     const neitherRef = labelsToRefs[GENE_TYPE.NEITHER].current!;
     const unknownRef = labelsToRefs[GENE_TYPE.INSUFFICIENT_EVIDENCE].current!;
 
     if (label === GENE_TYPE.TUMOR_SUPPRESSOR.toString() || label === GENE_TYPE.ONCOGENE.toString()) {
       unknownRef.checked && unknownRef.click();
       neitherRef.checked && neitherRef.click();
     } else if (label === GENE_TYPE.INSUFFICIENT_EVIDENCE.toString()) {
-      tumorSupressorRef.checked && tumorSupressorRef.click();
+      tumorSuppressorRef.checked && tumorSuppressorRef.click();
       oncogeneRef.checked && oncogeneRef.click();
       neitherRef.checked && neitherRef.click();
     } else if (label === GENE_TYPE.NEITHER.toString()) {
-      tumorSupressorRef.checked && tumorSupressorRef.click();
+      tumorSuppressorRef.checked && tumorSuppressorRef.click();
       oncogeneRef.checked && oncogeneRef.click();
       unknownRef.checked && unknownRef.click();
     }

src/main/webapp/app/shared/modal/AddVusModal.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import CreatableSelect from 'react-select/creatable';
-import { Mutation, MutationList, VusObjList } from '../model/firebase/firebase.model';
+import { MutationList, VusObjList } from '../model/firebase/firebase.model';
 import { parseAlterationName } from '../util/utils';
 import _ from 'lodash';
 import { notifyError } from 'app/oncokb-commons/components/util/NotificationUtils';
@@ -107,18 +107,33 @@ const AddVusModal = (props: IAddVusModalProps) => {
   };
 
   const filterAlterationsAndNotify = (variant: string) => {
-    const currentVariants = variants.map(o => o.label.toLowerCase());
+    const result: string[] = [];
     const alterations = parseAlterationName(variant);
-    const filteredAlterations = alterations.filter(alt => {
-      if (currentVariants.includes(alt.alteration.toLowerCase())) {
-        return false;
+    // should only have a single alteration
+    for (const { alteration } of alterations) {
+      const dropdownAlreadyHasVariant = variants.some(({ label }) => {
+        return label.toLowerCase() === alteration.toLowerCase();
+      });
+
+      const vusTableAlreadyHasVariant = Object.values(props.vusList ?? {}).some(({ name }) => {
+        return name.toLowerCase() === alteration.toLowerCase();
+      });
+
+      const alreadyHasVariantInMutationList = Object.values(mutationList ?? {}).some(({ name }) => {
+        return name.toLowerCase() === alteration.toLowerCase();
+      });
+
+      if (dropdownAlreadyHasVariant) {
+        notifyError(new Error(`${alteration} is already selected. The duplicate alteration(s) was not added.`));
+      } else if (vusTableAlreadyHasVariant) {
+        notifyError(new Error(`${alteration} is already in the VUS table. The duplicate alteration(s) was not added.`));
+      } else if (alreadyHasVariantInMutationList) {
+        notifyError(new Error(`${alteration} is already in the Mutation List. The duplicate alteration(s) was not added.`));
+      } else {
+        result.push(alteration);
       }
-      return true;
-    });
-    if (alterations.length !== filteredAlterations.length) {
-      notifyError(new Error('Duplicate alteration(s) removed'));
     }
-    return filteredAlterations.map(a => a.alteration);
+    return result;
   };
 
   const selectComponent = (