CM-812: updated benefit plan picker, added code of group for benefit …

…group
openimis · May 23, 2024 · 539f631 · 539f631
1 parent 47d5796
commit 539f631
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -52,7 +52,7 @@ const BENEFICIARY_FULL_PROJECTION = () => [
 
 const GROUP_BENEFICIARY_FULL_PROJECTION = () => [
   'id',
-  'group {id}',
+  'group {id, code}',
   'status',
 ];
 

diff --git a/src/components/BenefitPlanGroupBeneficiariesFilter.js b/src/components/BenefitPlanGroupBeneficiariesFilter.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { injectIntl } from 'react-intl';
 import { Grid } from '@material-ui/core';
 import { withTheme, withStyles } from '@material-ui/core/styles';
-import { formatMessage } from '@openimis/fe-core';
+import { formatMessage, TextInput } from '@openimis/fe-core';
 import { defaultFilterStyles } from '../util/styles';
 import BeneficiaryStatusPicker from '../pickers/BeneficiaryStatusPicker';
 
@@ -13,6 +13,20 @@ function BenefitPlanBeneficiariesFilter({
 
   return (
     <Grid container className={classes.form}>
+      <Grid item xs={2} className={classes.item}>
+        <TextInput
+          module="socialProtection"
+          label="group.code"
+          value={filterValue('code')}
+          onChange={(value) => onChangeFilters([
+            {
+              id: 'code',
+              value,
+              filter: `group_Code_Icontains: "${value}"`,
+            },
+          ])}
+        />
+      </Grid>
       <Grid item xs={2} className={classes.item}>
         <BeneficiaryStatusPicker
           label="beneficiary.beneficiaryStatusPicker"

diff --git a/src/components/BenefitPlanGroupBeneficiariesSearcher.js b/src/components/BenefitPlanGroupBeneficiariesSearcher.js
@@ -60,7 +60,7 @@ function BenefitPlanGroupBeneficiariesSearcher({
   const fetch = (params) => fetchGroupBeneficiaries(params);
 
   const headers = () => [
-    'socialProtection.groupBeneficiary.id',
+    'socialProtection.groupBeneficiary.code',
     'socialProtection.groupBeneficiary.status',
   ];
 
@@ -99,7 +99,7 @@ function BenefitPlanGroupBeneficiariesSearcher({
 
   const itemFormatters = () => {
     const result = [
-      (groupBeneficiary) => groupBeneficiary.group.id,
+      (groupBeneficiary) => groupBeneficiary.group.code,
       (groupBeneficiary) => (rights.includes(RIGHT_BENEFICIARY_UPDATE) ? (
         <BeneficiaryStatusPicker
           withLabel={false}

diff --git a/src/pickers/BenefitPlanPicker.js b/src/pickers/BenefitPlanPicker.js
@@ -20,6 +20,7 @@ function BenefitPlanPicker(props) {
     onChange,
     filter,
     filterSelectedOptions,
+    type = 'INDIVIDUAL',
   } = props;
 
   const modulesManager = useModulesManager();
@@ -38,6 +39,7 @@ function BenefitPlanPicker(props) {
             id
             code
             name
+            type
             jsonExt
           }
         }
@@ -48,7 +50,9 @@ function BenefitPlanPicker(props) {
     { skip: true },
   );
 
-  const benefitPlans = data?.benefitPlan?.edges.map((edge) => edge.node) ?? [];
+  const benefitPlans = data?.benefitPlan?.edges
+    .map((edge) => edge.node)
+    .filter((node) => node.type === type) ?? [];
   const shouldShowTooltip = benefitPlans?.length >= BENEFIT_PLANS_QUANTITY_LIMIT && !value && !currentString;
 
   return (

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -135,5 +135,7 @@
   "socialProtection.benefitPlan.searcherResultsTitleHistory": "{benefitPlansHistoryTotalCount} Historical Records Found",
   "socialProtection.benefitPlan.benefitPlanSchema.label": "Benefit Plan Schema",
   "socialProtection.benefitPlan.schema.showSchema": "Show Schema",
-  "socialProtection.benefitPlanTasks.label": "Tasks"
+  "socialProtection.benefitPlanTasks.label": "Tasks",
+  "socialProtection.group.code": "Code",
+  "socialProtection.groupBeneficiary.code": "Code"
 }