only set needs review if non name uuids

bprize15 · bprize15 · commit de0db32deba2 · 2025-05-20T16:48:14.000-04:00
diff --git a/src/main/webapp/app/config/constants/constants.ts b/src/main/webapp/app/config/constants/constants.ts
@@ -458,3 +458,5 @@ export const SOMATIC_GERMLINE_SETTING_KEY = 'oncokbCuration-somaticGermlineSetti
 export const DUPLICATE_THERAPY_ERROR_MESSAGE = 'Each therapy must be unique';
 export const EMPTY_THERAPY_ERROR_MESSAGE = 'You must include at least one drug for each therapy';
 export const THERAPY_ALREADY_EXISTS_ERROR_MESSAGE = 'Therapy already exists';
+
+export const NEW_NAME_UUID_VALUE = 'name';
diff --git a/src/main/webapp/app/pages/curation/geneticTypeTabs/GeneticTypeTabs.tsx b/src/main/webapp/app/pages/curation/geneticTypeTabs/GeneticTypeTabs.tsx
@@ -6,7 +6,7 @@ import { observer } from 'mobx-react';
 import { IRootStore } from 'app/stores';
 import { IGene } from 'app/shared/model/gene.model';
 import DefaultBadge from 'app/shared/badge/DefaultBadge';
-import { geneMetaReviewHasUuids, getFirebaseMetaGenePath } from 'app/shared/util/firebase/firebase-utils';
+import { geneMetaReviewHasNonNameUuids, getFirebaseMetaGenePath } from 'app/shared/util/firebase/firebase-utils';
 import { GERMLINE_PATH, SOMATIC_GERMLINE_SETTING_KEY, SOMATIC_PATH } from 'app/config/constants/constants';
 import { onValue, ref, Unsubscribe } from 'firebase/database';
 import { MetaReview } from 'app/shared/model/firebase/firebase.model';
@@ -74,8 +74,8 @@ const GeneticTypeTabs = ({ geneEntity, geneticType, firebaseDb, location, histor
     const sharedStyle: React.CSSProperties = { fontSize: '0.8rem' };
 
     const needsReview = {
-      [GENETIC_TYPE.SOMATIC]: geneMetaReviewHasUuids(somaticMetaReview),
-      [GENETIC_TYPE.GERMLINE]: geneMetaReviewHasUuids(germlineMetaReview),
+      [GENETIC_TYPE.SOMATIC]: geneMetaReviewHasNonNameUuids(somaticMetaReview),
+      [GENETIC_TYPE.GERMLINE]: geneMetaReviewHasNonNameUuids(germlineMetaReview),
     };
     if (needsReview[type]) {
       badges.push(
diff --git a/src/main/webapp/app/pages/curation/header/GeneticTypeTabHeader.tsx b/src/main/webapp/app/pages/curation/header/GeneticTypeTabHeader.tsx
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react';
 import React, { useEffect, useState } from 'react';
 import { onValue, ref } from 'firebase/database';
 import { Meta } from 'app/shared/model/firebase/firebase.model';
-import { geneMetaReviewHasUuids, getFirebaseMetaGenePath } from 'app/shared/util/firebase/firebase-utils';
+import { geneMetaReviewHasNonNameUuids, getFirebaseMetaGenePath } from 'app/shared/util/firebase/firebase-utils';
 import { PAGE_ROUTE } from 'app/config/constants/constants';
 import { Button } from 'reactstrap';
 import { notifyError } from 'app/oncokb-commons/components/util/NotificationUtils';
@@ -60,7 +60,7 @@ const GeneticTypeTabHeader = ({
 
   const getReviewButton = () => {
     let button: JSX.Element;
-    if (geneMetaReviewHasUuids(meta?.review)) {
+    if (geneMetaReviewHasNonNameUuids(meta?.review)) {
       if (isReviewing || isReviewFinished) {
         button = (
           <Button color="primary" onClick={handleReviewButtonClick} data-testid={GENE_HEADER_REVIEW_COMPLETE_BUTTON_ID}>
diff --git a/src/main/webapp/app/service/firebase/firebase-gene-review-service.spec.ts b/src/main/webapp/app/service/firebase/firebase-gene-review-service.spec.ts
@@ -51,9 +51,9 @@ describe('Firebase Gene Review Service', () => {
     jest.useFakeTimers().setSystemTime(DEFAULT_DATE);
 
     // Use original implementation for certain methods
-    mockMetaService.getUpdateObject.mockImplementation((add, hugoSymbol, isGermline, uuid) => {
+    mockMetaService.getUpdateObject.mockImplementation((hugoSymbol, isGermline, uuidUpdateObjects) => {
       const originalMetaService = new FirebaseMetaService(mockFirebaseRepository, mockAuthStore);
-      return originalMetaService.getUpdateObject(add, hugoSymbol, isGermline, uuid);
+      return originalMetaService.getUpdateObject(hugoSymbol, isGermline, uuidUpdateObjects);
     });
 
     mockHistoryService.getUpdateObject.mockImplementation((history, hugoSymbol, isGermline) => {
diff --git a/src/main/webapp/app/service/firebase/firebase-gene-review-service.ts b/src/main/webapp/app/service/firebase/firebase-gene-review-service.ts
@@ -98,7 +98,7 @@ export class FirebaseGeneReviewService {
     const { hugoSymbol } = parseFirebaseGenePath(firebasePath) ?? {};
 
     let updateObject = this.getGeneUpdateObject(updateValue, updatedReview!, firebasePath, uuid!);
-    const metaUpdateObject = this.firebaseMetaService.getUpdateObject(!isChangeReverted, hugoSymbol!, isGermline, [uuid!]);
+    const metaUpdateObject = this.firebaseMetaService.getUpdateObject(hugoSymbol!, isGermline, { [uuid!]: !isChangeReverted });
     updateObject = { ...updateObject, ...metaUpdateObject };
 
     if (!shouldSave) {
@@ -265,7 +265,7 @@ export class FirebaseGeneReviewService {
       } else {
         throw new SentryError('Unexpect accept in review mode', { hugoSymbol, reviewLevel, isGermline, isAcceptAll });
       }
-      const metaUpdateObject = this.firebaseMetaService.getUpdateObject(false, hugoSymbol, isGermline, [uuid]);
+      const metaUpdateObject = this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [uuid]: null });
       updateObject = { ...updateObject, ...metaUpdateObject };
     }
 
@@ -327,7 +327,7 @@ export class FirebaseGeneReviewService {
         throw new SentryError('Unexpected reject in review mode', { hugoSymbol, reviewLevels, isGermline });
       }
 
-      const metaUpdateObject = this.firebaseMetaService.getUpdateObject(false, hugoSymbol, isGermline, [uuid]);
+      const metaUpdateObject = this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [uuid]: null });
       updateObject = { ...updateObject, ...metaUpdateObject };
 
       try {
@@ -344,7 +344,7 @@ export class FirebaseGeneReviewService {
     let updateObject = await this.getCreateUpdateObject(hugoSymbol, reviewLevel, isGermline, action);
     updateObject = {
       ...updateObject,
-      ...this.firebaseMetaService.getUpdateObject(false, hugoSymbol, isGermline, [reviewLevel.reviewInfo.uuid]),
+      ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [reviewLevel.reviewInfo.uuid]: null }),
     };
     try {
       await this.firebaseRepository.update('/', updateObject);
diff --git a/src/main/webapp/app/service/firebase/firebase-gene-service.ts b/src/main/webapp/app/service/firebase/firebase-gene-service.ts
@@ -33,7 +33,7 @@ import { getErrorMessage } from 'app/oncokb-commons/components/alert/ErrorAlertU
 import { FirebaseDataStore } from 'app/stores/firebase/firebase-data.store';
 import { getTumorNameUuid, getUpdatedReview } from 'app/shared/util/firebase/firebase-review-utils';
 import { SentryError } from 'app/config/sentry-error';
-import { GERMLINE_PATH, GET_ALL_DRUGS_PAGE_SIZE } from 'app/config/constants/constants';
+import { GERMLINE_PATH, GET_ALL_DRUGS_PAGE_SIZE, NEW_NAME_UUID_VALUE } from 'app/config/constants/constants';
 import _ from 'lodash';
 import { getDriveAnnotations } from 'app/shared/util/core-drive-annotation-submission/core-drive-annotation-submission';
 import { DriveAnnotationApi } from 'app/shared/api/manual/drive-annotation-api';
@@ -254,13 +254,13 @@ export class FirebaseGeneService {
         updateObject = { ...updateObject, ...deleteArrayReturnVal.updateObject };
       }
       for (const id of [...nestedUuids, uuid]) {
-        updateObject = { ...updateObject, ...this.firebaseMetaService.getUpdateObject(false, hugoSymbol, isGermline, [id]) };
+        updateObject = { ...updateObject, ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [id]: null }) };
       }
     } else {
       updateObject = {
         ...updateObject,
         [`${getFirebaseGenePath(isGermline, hugoSymbol)}/${pathFromGene}_review`]: review,
-        ...this.firebaseMetaService.getUpdateObject(true, hugoSymbol, isGermline, [uuid]),
+        ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [uuid]: true }),
       };
     }
 
@@ -312,7 +312,7 @@ export class FirebaseGeneService {
       throw new SentryError('Could not resolve hugoSymbol', { tumorPath });
     }
 
-    let updateObject = { ...this.firebaseMetaService.getUpdateObject(true, hugoSymbol, isGermline, [tumorNameUuid]) };
+    let updateObject = { ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [tumorNameUuid]: NEW_NAME_UUID_VALUE }) };
     const pushResult = await this.firebaseRepository.push(tumorPath, newTumor, false);
     if (pushResult !== undefined) {
       updateObject = { ...updateObject, ...pushResult.pushUpdateObject };
@@ -397,7 +397,7 @@ export class FirebaseGeneService {
 
     if (hugoSymbol !== undefined) {
       let updateObject = {
-        ...this.firebaseMetaService.getUpdateObject(true, hugoSymbol, isGermline, [newTreatment.name_uuid]),
+        ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [newTreatment.name_uuid]: NEW_NAME_UUID_VALUE }),
       };
       const pushResult = await this.firebaseRepository.push(treatmentPath, newTreatment, false);
       if (pushResult !== undefined) {
@@ -457,12 +457,12 @@ export class FirebaseGeneService {
 
     if (hugoSymbol !== undefined) {
       let updateObject = {
-        ...this.firebaseMetaService.getUpdateObject(true, hugoSymbol, isGermline, [newMutation.name_uuid]),
+        ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [newMutation.name_uuid]: NEW_NAME_UUID_VALUE }),
       };
       if (mutationEffectDescription) {
         updateObject = {
           ...updateObject,
-          ...this.firebaseMetaService.getUpdateObject(true, hugoSymbol, isGermline, [newMutation.mutation_effect.description_uuid]),
+          ...this.firebaseMetaService.getUpdateObject(hugoSymbol, isGermline, { [newMutation.mutation_effect.description_uuid]: true }),
         };
       }
 
@@ -511,7 +511,7 @@ export class FirebaseGeneService {
       updateObject[rctPath] = newRelevantCancerTypes;
       updateObject[`${rctPath}_review`] = new Review(this.authStore.fullName, undefined, undefined, undefined, true);
       updateObject[`${rctPath}_uuid`] = uuid;
-      const metaUpdateObject = this.firebaseMetaService.getUpdateObject(true, hugoSymbol!, isGermline, [uuid]);
+      const metaUpdateObject = this.firebaseMetaService.getUpdateObject(hugoSymbol!, isGermline, { [uuid]: true });
       updateObject = { ...updateObject, ...metaUpdateObject };
     } else {
       const rctUpdateObject = await this.firebaseGeneReviewService.updateReviewableContent(
@@ -546,7 +546,7 @@ export class FirebaseGeneService {
   ) => {
     const genePath = parseFirebaseGenePath(genomicIndicatorsPath);
     const newGenomicIndicator = new GenomicIndicator();
-    const uuidsToReview: string[] = [];
+    const uuidsToReview: { [key: string]: string | boolean | null } = {};
     const mutationList = this.firebaseMutationListStore.data;
     const pathogenicVariants = Object.values(mutationList ?? {}).find(mut => mut.name === PATHOGENIC_VARIANTS);
     let pathogenicVariantsNameUuid = pathogenicVariants?.name_uuid;
@@ -568,13 +568,13 @@ export class FirebaseGeneService {
     if (toReview) {
       newGenomicIndicator.name_review = _.cloneDeep(newReview);
       newGenomicIndicator.name_review.added = true;
-      uuidsToReview.push(newGenomicIndicator.name_uuid);
+      uuidsToReview[newGenomicIndicator.name_uuid] = NEW_NAME_UUID_VALUE;
     }
     if (description) {
       newGenomicIndicator.description = description;
       if (toReview) {
         newGenomicIndicator.description_review = newReview;
-        uuidsToReview.push(newGenomicIndicator.description_uuid);
+        uuidsToReview[newGenomicIndicator.description_uuid] = true;
       }
     }
 
@@ -584,7 +584,7 @@ export class FirebaseGeneService {
         newGenomicIndicator.allele_state[asKey] = alleleState;
         if (toReview) {
           newGenomicIndicator.allele_state[`${asKey}_review`] = newReview;
-          uuidsToReview.push(newGenomicIndicator.allele_state[`${asKey}_uuid`]);
+          uuidsToReview[newGenomicIndicator.allele_state[`${asKey}_uuid`]] = true;
         }
       });
     }
@@ -602,7 +602,7 @@ export class FirebaseGeneService {
     }
 
     if (toReview) {
-      updateObject = { ...updateObject, ...this.firebaseMetaService.getUpdateObject(true, hugoSymbol, true, uuidsToReview) };
+      updateObject = { ...updateObject, ...this.firebaseMetaService.getUpdateObject(hugoSymbol, true, uuidsToReview) };
     }
 
     await this.firebaseRepository.update('/', updateObject);
diff --git a/src/main/webapp/app/service/firebase/firebase-meta-service.ts b/src/main/webapp/app/service/firebase/firebase-meta-service.ts
@@ -108,16 +108,15 @@ export class FirebaseMetaService {
     await this.firebaseRepository.delete(getFirebaseMetaGenePath(isGermline, hugoSymbol));
   };
 
-  getUpdateObject = (add: boolean, hugoSymbol: string, isGermline: boolean, uuids: string[]) => {
+  getUpdateObject = (hugoSymbol: string, isGermline: boolean, uuidUpdateObjects: { [key: string]: string | boolean | null }) => {
     const metaGenePath = getFirebaseMetaGenePath(isGermline, hugoSymbol);
-    const uuidUpdateValue = add ? true : null;
     const updateObject: { [key: string]: string | boolean | null } = {
       [`${metaGenePath}/lastModifiedBy`]: this.authStore.fullName,
       [`${metaGenePath}/lastModifiedAt`]: new Date().getTime().toString(),
     };
-    for (const uuid of uuids) {
+    for (const [uuid, uuidUpdateValue] of Object.entries(uuidUpdateObjects)) {
       updateObject[`${metaGenePath}/review/${uuid}`] = uuidUpdateValue;
-      if (!add) {
+      if (uuidUpdateValue === null) {
         const uuidParts = this.getUuidParts(uuid);
         uuidParts.forEach(uuidPart => {
           updateObject[`${metaGenePath}/review/${uuidPart}`] = uuidUpdateValue;
diff --git a/src/main/webapp/app/shared/util/firebase/firebase-utils.tsx b/src/main/webapp/app/shared/util/firebase/firebase-utils.tsx
@@ -1,4 +1,4 @@
-import { APP_EXPANDED_DATETIME_FORMAT, CURRENT_REVIEWER } from 'app/config/constants/constants';
+import { APP_EXPANDED_DATETIME_FORMAT, CURRENT_REVIEWER, NEW_NAME_UUID_VALUE } from 'app/config/constants/constants';
 import { FB_COLLECTION, FB_COLLECTION_PATH } from 'app/config/constants/firebase';
 import { NestLevelType, RemovableNestLevel } from 'app/pages/curation/collapsible/NestLevel';
 import { IDrug } from 'app/shared/model/drug.model';
@@ -84,7 +84,7 @@ export const getTxName = (drugList: readonly IDrug[], txUuidName: string | undef
 };
 
 export const geneNeedsReview = (meta: Meta | null | undefined) => {
-  return geneMetaReviewHasUuids(meta?.review);
+  return geneMetaReviewHasNonNameUuids(meta?.review);
 };
 
 export const mutationNeedsReview = (mutation: Mutation, review: MetaReview) => {
@@ -114,10 +114,10 @@ export const mutationNeedsReview = (mutation: Mutation, review: MetaReview) => {
   return false;
 };
 
-export const geneMetaReviewHasUuids = (metaReview: MetaReview | undefined) => {
+export const geneMetaReviewHasNonNameUuids = (metaReview: MetaReview | undefined) => {
   let needsReview = false;
   if (metaReview) {
-    needsReview = !!Object.keys(metaReview).find(key => isUuid(key));
+    needsReview = Object.entries(metaReview).some(([key, val]) => isUuid(key) && val !== NEW_NAME_UUID_VALUE);
   }
   return needsReview;
 };
