Fix alt cat not deleted and add tooltip to alt cat badge

oncokb · Sep 12, 2024 · f60ba40 · f60ba40
1 parent 0fbffb5
commit f60ba40
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/...n/webapp/app/pages/curation/collapsible/mutation-collapsible/MutationCollapsibleTitle.tsx b/...n/webapp/app/pages/curation/collapsible/mutation-collapsible/MutationCollapsibleTitle.tsx
@@ -27,7 +27,14 @@ const MutationCollapsibleTitle = ({ name, mutationAlterations, alterationCategor
       <div className={classNames(shouldGroupBadges ? styles.flagWrapper : undefined)}>
         {alterationCategories.flags.map(flag => {
           const matchedFlagEntity = flagEntities.find(flagEntity => isFlagEqualToIFlag(flag, flagEntity));
-          return <DefaultBadge key={matchedFlagEntity?.flag || flag.flag} color={'primary'} text={matchedFlagEntity?.name || flag.flag} />;
+          return (
+            <DefaultBadge
+              key={matchedFlagEntity?.flag || flag.flag}
+              color={'primary'}
+              text={matchedFlagEntity?.name || flag.flag}
+              tooltipOverlay={matchedFlagEntity?.description ? matchedFlagEntity.description : undefined}
+            />
+          );
         })}
         {tooltipOverlay ? <InfoIcon className="me-1" overlay={tooltipOverlay} /> : undefined}
       </div>

diff --git a/src/main/webapp/app/shared/modal/AddMutationModal.tsx b/src/main/webapp/app/shared/modal/AddMutationModal.tsx
@@ -1044,6 +1044,8 @@ function AddMutationModal({
     if (field === 'comment') {
       setStringMutationComment(value as string);
     } else if (field === 'flags') {
+      /* eslint-disable no-console */
+      console.log('value is ', value);
       const flagOptions = value as DropdownOption[];
       setSelectedStringMutationFlags(flagOptions.map(option => option.value));
     }
@@ -1199,7 +1201,7 @@ function AddMutationModal({
 
   async function handleAlterationCategoriesConfirm() {
     let newAlterationCategories: AlterationCategories | null = new AlterationCategories();
-    if (stringMutationComment === '' && selectedStringMutationFlags.length === 0) {
+    if (selectedStringMutationFlags.length === 0) {
       newAlterationCategories = null;
     } else {
       newAlterationCategories.comment = stringMutationComment;
@@ -1240,9 +1242,7 @@ function AddMutationModal({
         newMutation.name = newAlterations.map(alteration => alteration.name).join(', ');
         newMutation.alterations = newAlterations;
         const newAlterationCategories = await handleAlterationCategoriesConfirm();
-        if (newAlterationCategories) {
-          newMutation.alteration_categories = newAlterationCategories;
-        }
+        newMutation.alteration_categories = newAlterationCategories;
 
         setErrorMessagesEnabled(false);
         setIsConfirmPending(true);

diff --git a/src/main/webapp/app/shared/model/firebase/firebase.model.ts b/src/main/webapp/app/shared/model/firebase/firebase.model.ts
@@ -4,7 +4,6 @@ import { AlterationTypeEnum, Gene as OncoKBGene } from 'app/shared/api/generated
 import { generateUuid } from 'app/shared/util/utils';
 import _ from 'lodash';
 import { ICancerType } from '../cancer-type.model';
-import { IFlag } from '../flag.model';
 
 export type MetaCollection = {
   [hugoSymbol: string]: Meta;
@@ -215,7 +214,7 @@ export class Mutation {
   mutation_effect: MutationEffect = new MutationEffect();
   mutation_effect_uuid: string = generateUuid();
   mutation_effect_comments?: Comment[] = []; // used for somatic
-  alteration_categories?: AlterationCategories;
+  alteration_categories?: AlterationCategories | null;
   name: string = '';
   name_comments?: Comment[] = [];
   name_review?: Review;