added Dave's suggestion

VEuPathDB · May 22, 2023 · 6d69a76 · 6d69a76
1 parent 6f83513
commit 6d69a76
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 38 deletions.
diff --git a/.../libs/eda/src/lib/core/components/visualizations/implementations/BarplotVisualization.tsx b/.../libs/eda/src/lib/core/components/visualizations/implementations/BarplotVisualization.tsx
@@ -53,7 +53,7 @@ import {
   nonUniqueWarning,
   hasIncompleteCases,
   assertValidInputVariables,
-  substituteUnselectedToken1,
+  substituteUnselectedToken,
 } from '../../../utils/visualization';
 import { VariablesByInputName } from '../../../utils/data-element-constraints';
 // use lodash instead of Math.min/max
@@ -468,7 +468,7 @@ function BarplotViz(props: VisualizationProps<Options>) {
       );
 
       return grayOutLastSeries(
-        substituteUnselectedToken1(
+        substituteUnselectedToken(
           reorderData(
             barplotResponseToData(
               response,

diff --git a/.../libs/eda/src/lib/core/components/visualizations/implementations/BoxplotVisualization.tsx b/.../libs/eda/src/lib/core/components/visualizations/implementations/BoxplotVisualization.tsx
@@ -61,7 +61,7 @@ import {
   fixVarIdLabel,
   getVariableLabel,
   assertValidInputVariables,
-  substituteUnselectedToken1,
+  substituteUnselectedToken,
 } from '../../../utils/visualization';
 import { VariablesByInputName } from '../../../utils/data-element-constraints';
 import { StudyEntity, Variable } from '../../../types/study';
@@ -537,7 +537,7 @@ function BoxplotViz(props: VisualizationProps<Options>) {
         facetVariable
       );
       return grayOutLastSeries(
-        substituteUnselectedToken1(
+        substituteUnselectedToken(
           reorderData(
             boxplotResponseToData(
               response,

diff --git a/...ibs/eda/src/lib/core/components/visualizations/implementations/HistogramVisualization.tsx b/...ibs/eda/src/lib/core/components/visualizations/implementations/HistogramVisualization.tsx
@@ -64,7 +64,7 @@ import {
   variablesAreUnique,
   nonUniqueWarning,
   assertValidInputVariables,
-  substituteUnselectedToken1,
+  substituteUnselectedToken,
 } from '../../../utils/visualization';
 import { useUpdateThumbnailEffect } from '../../../hooks/thumbnails';
 // import variable's metadata-based independent axis range utils
@@ -536,7 +536,7 @@ function HistogramViz(props: VisualizationProps<Options>) {
         facetVariable
       );
       return grayOutLastSeries(
-        substituteUnselectedToken1(
+        substituteUnselectedToken(
           reorderData(
             histogramResponseToData(
               response,

diff --git a/...libs/eda/src/lib/core/components/visualizations/implementations/LineplotVisualization.tsx b/...libs/eda/src/lib/core/components/visualizations/implementations/LineplotVisualization.tsx
@@ -85,7 +85,7 @@ import {
   vocabularyWithMissingData,
   hasIncompleteCases,
   assertValidInputVariables,
-  substituteUnselectedToken2,
+  substituteUnselectedToken,
 } from '../../../utils/visualization';
 import { gray } from '../colors';
 import {
@@ -1965,7 +1965,7 @@ export function lineplotResponseToData(
           })),
         };
   return {
-    dataSetProcess: substituteUnselectedToken2(dataSetProcess!),
+    dataSetProcess: substituteUnselectedToken(dataSetProcess!),
     // calculated y axis limits
     xMin,
     xMinPos,

diff --git a/...s/eda/src/lib/core/components/visualizations/implementations/ScatterplotVisualization.tsx b/...s/eda/src/lib/core/components/visualizations/implementations/ScatterplotVisualization.tsx
@@ -78,7 +78,7 @@ import {
   fixVarIdLabel,
   getVariableLabel,
   assertValidInputVariables,
-  substituteUnselectedToken2,
+  substituteUnselectedToken,
 } from '../../../utils/visualization';
 import { gray } from '../colors';
 import {
@@ -2236,7 +2236,7 @@ export function scatterplotResponseToData(
       );
 
     return {
-      dataSetProcess: substituteUnselectedToken2(dataSetProcess),
+      dataSetProcess: substituteUnselectedToken(dataSetProcess),
       xMin,
       xMinPos,
       xMax,

diff --git a/packages/libs/eda/src/lib/core/utils/visualization.ts b/packages/libs/eda/src/lib/core/utils/visualization.ts
@@ -80,39 +80,16 @@ type NamedSeries = {
   }[];
 };
 
-// boxplot, barplot, histogram
-export function substituteUnselectedToken1<T extends NamedSeries>(
-  data: T | MaybeFacetedSeriesWithStatistics<T>
-): T | MaybeFacetedSeriesWithStatistics<T> {
+export function substituteUnselectedToken<
+  T extends NamedSeries,
+  Data extends T | FacetedData<T> | MaybeFacetedSeriesWithStatistics<T>
+>(data: Data): Data {
   if (isFaceted(data)) {
     return {
       ...data,
       facets: data.facets.map((facet) => ({
         ...facet,
-        data: substituteUnselectedToken1(data) as T,
-      })),
-    };
-  } else {
-    return {
-      ...data,
-      series: data.series.map((s) => ({
-        ...s,
-        name: s.name === UNSELECTED_TOKEN ? UNSELECTED_DISPLAY_TEXT : s.name,
-      })),
-    };
-  }
-}
-
-// lineplot, scatterplot
-export function substituteUnselectedToken2<T extends NamedSeries>(
-  data: T | FacetedData<T>
-): T | FacetedData<T> {
-  if (isFaceted(data)) {
-    return {
-      ...data,
-      facets: data.facets.map((facet) => ({
-        ...facet,
-        data: substituteUnselectedToken2(data) as T,
+        data: substituteUnselectedToken(data) as T,
       })),
     };
   } else {