feat: define and use FILTERS as enumeration options

uc-cdis · Jan 31, 2025 · a613c16 · a613c16
1 parent 6a8d79c
commit a613c16
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/Analysis/GWASApp/Components/Covariates/ContinuousCovariates.jsx b/src/Analysis/GWASApp/Components/Covariates/ContinuousCovariates.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Covariates from './Covariates';
 import PhenotypeHistogram from '../Diagrams/PhenotypeHistogram/PhenotypeHistogram';
 import './Covariates.css';
+import FILTERS from '../../../SharedUtils/FiltersEnumeration';
 
 const ContinuousCovariates = ({
   dispatch,
@@ -36,14 +37,14 @@ const ContinuousCovariates = ({
       const filters = prevSelected.filters ? [...prevSelected.filters] : [];
 
       // Find the index of the ">=" filter
-      const minFilterIndex = filters.findIndex((filter) => filter.type === ">=");
+      const minFilterIndex = filters.findIndex((filter) => filter.type === FILTERS.greaterThanOrEqualTo);
 
       if (minFilterIndex !== -1) {
         // Update the existing ">=" filter
-        filters[minFilterIndex] = { type: ">=", value: minOutlierCutoff };
+        filters[minFilterIndex] = { type: FILTERS.greaterThanOrEqualTo, value: minOutlierCutoff };
       } else {
         // Add a new ">=" filter
-        filters.push({ type: ">=", value: minOutlierCutoff });
+        filters.push({ type: FILTERS.greaterThanOrEqualTo, value: minOutlierCutoff });
       }
 
       return { ...prevSelected, filters };
@@ -56,14 +57,14 @@ const ContinuousCovariates = ({
       const filters = prevSelected.filters ? [...prevSelected.filters] : [];
 
       // Find the index of the "<=" filter
-      const maxFilterIndex = filters.findIndex((filter) => filter.type === "<=");
+      const maxFilterIndex = filters.findIndex((filter) => filter.type === FILTERS.lessThanOrEqualTo);
 
       if (maxFilterIndex !== -1) {
         // Update the existing "<=" filter
-        filters[maxFilterIndex] = { type: "<=", value: maxOutlierCutoff };
+        filters[maxFilterIndex] = { type: FILTERS.lessThanOrEqualTo, value: maxOutlierCutoff };
       } else {
         // Add a new "<=" filter
-        filters.push({ type: "<=", value: maxOutlierCutoff });
+        filters.push({ type: FILTERS.lessThanOrEqualTo, value: maxOutlierCutoff });
       }
 
       return { ...prevSelected, filters };

diff --git a/src/Analysis/GWASApp/Components/Diagrams/PhenotypeHistogram/PhenotypeHistogram.jsx b/src/Analysis/GWASApp/Components/Diagrams/PhenotypeHistogram/PhenotypeHistogram.jsx
@@ -9,6 +9,7 @@ import Histogram from '../../../../SharedUtils/DataViz/Histogram/Histogram';
 import { useSourceContext } from '../../../Utils/Source';
 import ACTIONS from '../../../Utils/StateManagement/Actions';
 import { MESSAGES } from '../../../Utils/constants';
+import FILTERS from '../../../../SharedUtils/FiltersEnumeration';
 
 const PhenotypeHistogram = ({
   dispatch,
@@ -87,8 +88,8 @@ const PhenotypeHistogram = ({
     xAxisLegend: selectedContinuousItem.concept_name,
     yAxisLegend: 'Persons',
     useAnimation,
-    minCutoff: selectedContinuousItem.filters?.find(filter => filter.type === '>=')?.value ?? undefined,
-    maxCutoff: selectedContinuousItem.filters?.find(filter => filter.type === '<=')?.value ?? undefined,
+    minCutoff: selectedContinuousItem.filters?.find(filter => filter.type === FILTERS.greaterThanOrEqualTo)?.value ?? undefined,
+    maxCutoff: selectedContinuousItem.filters?.find(filter => filter.type === FILTERS.lessThanOrEqualTo)?.value ?? undefined,
   };
   return (
     <React.Fragment>

diff --git a/src/Analysis/SharedUtils/FiltersEnumeration.js b/src/Analysis/SharedUtils/FiltersEnumeration.js
@@ -0,0 +1,9 @@
+const FILTERS = {
+  greaterThanOrEqualTo: '>=',
+  lessThanOrEqualTo: '<=',
+  equalTo: '=',
+  differentFrom: '!=',
+  in: 'in',
+};
+
+export default FILTERS;