Merge branch 'IPAD-479_common-tests-multimodel-multitest' into dev

abbvie-external · Feb 14, 2024 · fdd55f3 · fdd55f3
2 parents 00c513f + 578c28b
commit fdd55f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/components/Differential/Differential.jsx b/src/components/Differential/Differential.jsx
@@ -698,6 +698,7 @@ class Differential extends Component {
               differentialModel,
               differentialModelsAndTests,
               multiModelMappingFirstKey,
+              differentialTestIdsCommon,
             );
             // hotfix for multiModel_boxplot_pro until logic is clarified
             if (plot.plotID === 'multiModel_boxplot_pro') {
@@ -815,6 +816,7 @@ class Differential extends Component {
                 differentialModel,
                 differentialModelsAndTests,
                 multiModelMappingFirstKey,
+                differentialTestIdsCommon,
               );
               // hotfix for multiModel_boxplot_pro until logic is clarified
               if (plot.plotID === 'multiModel_boxplot_pro') {
@@ -986,6 +988,7 @@ class Differential extends Component {
               differentialModel,
               differentialModelsAndTests,
               multiModelMappingFirstKey,
+              differentialTestIdsCommon,
             );
             // handle plotly differently than static plot svgs
             if (multifeaturePlot[0].plotType.includes('plotly')) {
@@ -1066,6 +1069,7 @@ class Differential extends Component {
               differentialModel,
               differentialModelsAndTests,
               multiModelMappingFirstKey,
+              differentialTestIdsCommon,
             );
             // handle plotly differently than static plot svgs
             if (multifeaturePlot[i].plotType.includes('plotly')) {
@@ -1293,6 +1297,7 @@ class Differential extends Component {
         differentialModel,
         differentialModelsAndTests,
         multiModelMappingFirstKey,
+        differentialTestIdsCommon,
       );
       try {
         const promise = omicNavigatorService.plotStudyReturnSvg(

diff --git a/src/components/Shared/helpers.jsx b/src/components/Shared/helpers.jsx
@@ -686,8 +686,9 @@ export function getModelsArg(
   differentialModel,
   differentialModelsAndTests,
   multiModelMappingFirstKey,
-  multiModelMappingArrays,
+  differentialTestIdsCommon,
 ) {
+  debugger;
   // if plotType does not include 'multiModel', return the model
   if (!plotType.includes('multiModel')) {
     return differentialModel;
@@ -708,7 +709,7 @@ export function getModelsArg(
       // 'multiTest': vector of each model,
       // with the currently selected model moved to the first index
       // repeated n times,
-      // where n is the number of tests present under the currently selected model
+      // where n is the number of tests (that are a member of ALL models) repeated under the currently selected model
       let models = [];
       const currentDifferentialModelsAndTestsIndex = [
         ...differentialModelsAndTests,
@@ -724,7 +725,10 @@ export function getModelsArg(
           : differentialModelsAndTests;
       currentDifferentialModelsAndTestsMoved.forEach((cdmtm) => {
         cdmtm.tests.forEach((test) => {
-          models.push(cdmtm.modelID);
+          // check if test id is a member of ALL models
+          if (differentialTestIdsCommon?.includes(test.testID)) {
+            models.push(cdmtm.modelID);
+          }
         });
       });
       return models;