Minor refactoring to improve consistency

Also address linter complaints
openimis · Jul 23, 2024 · 309acb5 · 309acb5
1 parent b156256
commit 309acb5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/components/BenefitPlanBeneficiariesSearcher.js b/src/components/BenefitPlanBeneficiariesSearcher.js
@@ -30,8 +30,6 @@ import {
   DEFAULT_PAGE_SIZE,
   RIGHT_BENEFICIARY_SEARCH,
   ROWS_PER_PAGE_OPTIONS,
-  MODULE_NAME,
-  BENEFIT_PLAN_LABEL,
   RIGHT_BENEFICIARY_UPDATE,
 } from '../constants';
 import BenefitPlanBeneficiariesFilter from './BenefitPlanBeneficiariesFilter';

diff --git a/src/components/BenefitPlanEligibilityCriteriaPanel.js b/src/components/BenefitPlanEligibilityCriteriaPanel.js
@@ -8,7 +8,11 @@ import AddCircle from '@material-ui/icons/Add';
 import {
   Button, Divider, Grid, Paper, Typography,
 } from '@material-ui/core';
-import { CLEARED_STATE_FILTER, BENEFICIARY_STATUS } from '../constants';
+import {
+  CLEARED_STATE_FILTER,
+  BENEFICIARY_STATUS,
+  DEFAULT_BENEFICIARY_STATUS,
+} from '../constants';
 import { isBase64Encoded } from '../util/advanced-criteria-utils';
 
 const useStyles = makeStyles((theme) => ({
@@ -35,7 +39,6 @@ function BenefitPlanEligibilityCriteriaPanel({
   const { formatMessage, formatMessageWithValues } = useTranslations('socialProtection', modulesManager);
   const customFilters = useSelector((state) => state.core.customFilters);
   const [filters, setFilters] = useState([]);
-  const defaultFilterStatus = 'POTENTIAL';
 
   const status = Object.values(BENEFICIARY_STATUS).find((value) => (
     activeTab.toUpperCase().includes(value)
@@ -50,7 +53,7 @@ function BenefitPlanEligibilityCriteriaPanel({
     // For backward compatibility POTENTIAL status take on the old filters
     let criteria = jsonData?.advanced_criteria || {};
     if (Array.isArray(criteria)) {
-      criteria = { [defaultFilterStatus]: criteria };
+      criteria = { [DEFAULT_BENEFICIARY_STATUS]: criteria };
     }
 
     return criteria[status] || [];
@@ -105,8 +108,8 @@ function BenefitPlanEligibilityCriteriaPanel({
       const jsonData = JSON.parse(jsonExt);
       let advancedCriteria = jsonData?.advanced_criteria || {};
       // migrate old advanced_criteria
-      if (Array.isArray(jsonData?.advanced_criteria)) {
-        advancedCriteria = { [defaultFilterStatus]: jsonData?.advanced_criteria };
+      if (Array.isArray(advancedCriteria)) {
+        advancedCriteria = { [DEFAULT_BENEFICIARY_STATUS]: jsonData?.advanced_criteria };
       }
       const editedAdvancedCriteria = { ...advancedCriteria, [status]: filters };
       const json = { ...jsonData, advanced_criteria: editedAdvancedCriteria };

diff --git a/src/components/BenefitPlanGroupBeneficiariesSearcher.js b/src/components/BenefitPlanGroupBeneficiariesSearcher.js
@@ -31,14 +31,11 @@ import {
   RIGHT_BENEFICIARY_UPDATE,
   ROWS_PER_PAGE_OPTIONS,
   CLEARED_STATE_FILTER,
-  BENEFIT_PLAN_LABEL,
-  MODULE_NAME,
 } from '../constants';
 import BenefitPlanGroupBeneficiariesFilter from './BenefitPlanGroupBeneficiariesFilter';
 import BeneficiaryStatusPicker from '../pickers/BeneficiaryStatusPicker';
 import { applyNumberCircle } from '../util/searcher-utils';
 
-
 function BenefitPlanGroupBeneficiariesSearcher({
   rights,
   intl,

diff --git a/src/constants.js b/src/constants.js
@@ -65,6 +65,8 @@ export const BENEFICIARY_STATUS = {
   SUSPENDED: 'SUSPENDED',
 };
 
+export const DEFAULT_BENEFICIARY_STATUS = 'POTENTIAL';
+
 export const FIELD_TYPES = {
   INTEGER: 'integer',
   NUMBER: 'number',