Revert "CM-197: change holder to institution (#43)"

This reverts commit 9a4a1d2.
openimis · Aug 8, 2023 · 2f7aa3e · 2f7aa3e
1 parent 9a4a1d2
commit 2f7aa3e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ None
 
 ## Other Modules Redux State Bindings
 * `state.core.user`, to access user info (rights,...)
+* `state.policyHolder`, to retrieve Policy Holders for their respective pickers
 
 ## Configurations Options
 None
diff --git a/src/actions.js b/src/actions.js
@@ -12,7 +12,7 @@ import {
   CLEAR, ERROR, REQUEST, SUCCESS,
 } from './util/action-type';
 
-const BENEFIT_PLAN_FULL_PROJECTION = () => [
+const BENEFIT_PLAN_FULL_PROJECTION = (modulesManager) => [
   'uuid',
   'id',
   'isDeleted',
@@ -30,7 +30,8 @@ const BENEFIT_PLAN_FULL_PROJECTION = () => [
   'ceilingPerBeneficiary',
   'beneficiaryDataSchema',
   'jsonExt',
-  'institution',
+  `holder${
+    modulesManager.getProjection('policyHolder.PolicyHolderPicker.projection')}`,
 ];
 
 const UPLOAD_HISTORY_FULL_PROJECTION = () => [
@@ -70,8 +71,8 @@ const WORKFLOWS_FULL_PROJECTION = () => [
   'group',
 ];
 
-export function fetchBenefitPlans(params) {
-  const payload = formatPageQueryWithCount('benefitPlan', params, BENEFIT_PLAN_FULL_PROJECTION);
+export function fetchBenefitPlans(modulesManager, params) {
+  const payload = formatPageQueryWithCount('benefitPlan', params, BENEFIT_PLAN_FULL_PROJECTION(modulesManager));
   return graphql(payload, ACTION_TYPE.SEARCH_BENEFIT_PLANS);
 }
 
@@ -214,7 +215,7 @@ function formatBenefitPlanGQL(benefitPlan) {
     ${benefitPlan?.code ? `code: "${formatGQLString(benefitPlan.code)}"` : ''}
     ${benefitPlan?.maxBeneficiaries ? `maxBeneficiaries: ${benefitPlan.maxBeneficiaries}` : ''}
     ${benefitPlan?.ceilingPerBeneficiary ? `ceilingPerBeneficiary: "${benefitPlan.ceilingPerBeneficiary}"` : ''}
-    ${benefitPlan?.institution ? `institution: "${formatGQLString(benefitPlan.institution)}"` : ''}
+    ${benefitPlan?.holder?.id ? `holderId: "${benefitPlan.holder.id}"` : ''}
     ${benefitPlan?.type ? `type: ${benefitPlan.type}` : ''}
     ${benefitPlan?.dateValidFrom ? `dateValidFrom: "${dateTimeToDate(benefitPlan.dateValidFrom)}"` : ''}
     ${benefitPlan?.dateValidTo ? `dateValidTo: "${dateTimeToDate(benefitPlan.dateValidTo)}"` : ''}

diff --git a/src/components/BenefitPackagePlanPanel.js b/src/components/BenefitPackagePlanPanel.js
@@ -134,10 +134,10 @@ class BenefitPackagePlanPanel extends FormPanel {
                 />
               </Grid>
               <Grid item xs={3} className={classes.item}>
-                <TextInput
+                <PublishedComponent
+                  pubRef="policyHolder.PolicyHolderPicker"
                   module="socialProtection"
-                  label="benefitPlan.institution"
-                  value={benefitPlan?.institution ?? ''}
+                  value={!!benefitPlan?.holder && benefitPlan.holder}
                   readOnly={readOnly}
                 />
               </Grid>

diff --git a/src/components/BenefitPlanHeadPanel.js b/src/components/BenefitPlanHeadPanel.js
@@ -9,7 +9,6 @@ import {
   ValidatedTextAreaInput,
   TextAreaInput,
   PublishedComponent,
-  TextInput,
 } from '@openimis/fe-core';
 import { injectIntl } from 'react-intl';
 import { withTheme, withStyles } from '@material-ui/core/styles';
@@ -141,11 +140,12 @@ class BenefitPlanHeadPanel extends FormPanel {
           />
         </Grid>
         <Grid item xs={3} className={classes.item}>
-          <TextInput
+          <PublishedComponent
+            pubRef="policyHolder.PolicyHolderPicker"
             module="socialProtection"
-            label="benefitPlan.institution"
-            onChange={(v) => this.updateAttribute('institution', v)}
-            value={benefitPlan?.institution ?? ''}
+            withNull
+            onChange={(v) => this.updateAttribute('holder', v)}
+            value={!!benefitPlan?.holder && benefitPlan.holder}
           />
         </Grid>
         <Grid item xs={3} className={classes.item}>

diff --git a/src/components/BenefitPlanSearcher.js b/src/components/BenefitPlanSearcher.js
@@ -87,7 +87,7 @@ function BenefitPlanSearcher({
     prevSubmittingMutationRef.current = submittingMutation;
   });
 
-  const fetch = (params) => fetchBenefitPlans(params);
+  const fetch = (params) => fetchBenefitPlans(modulesManager, params);
 
   const headers = () => {
     const headers = [

diff --git a/src/components/BenefitPlanSearcherForEntities.js b/src/components/BenefitPlanSearcherForEntities.js
@@ -111,7 +111,7 @@ function BenefitPlanSearcherForEntities({
     if (groupId) {
       fetchBeneficiariesGroup(modulesManager, { group_Id: groupId });
     }
-    fetchBenefitPlans(params);
+    fetchBenefitPlans(modulesManager, params);
   };
 
   const headers = () => {

diff --git a/src/reducer.js b/src/reducer.js
@@ -168,10 +168,19 @@ function reducer(
         ...state,
         fetchingBenefitPlans: false,
         fetchedBenefitPlans: true,
-        benefitPlans: parseData(action.payload.data.benefitPlan)?.map((benefitPlan) => ({
-          ...benefitPlan,
-          id: decodeId(benefitPlan.id),
-        })),
+        benefitPlans: parseData(action.payload.data.benefitPlan)?.map((benefitPlan) => {
+          const response = ({
+            ...benefitPlan,
+            id: decodeId(benefitPlan.id),
+          });
+          if (response?.holder?.id) {
+            response.holder = ({
+              ...response.holder,
+              id: decodeId(response.holder.id),
+            });
+          }
+          return response;
+        }),
         benefitPlansPageInfo: pageInfo(action.payload.data.benefitPlan),
         benefitPlansTotalCount: action.payload.data.benefitPlan ? action.payload.data.benefitPlan.totalCount : null,
         errorBenefitPlans: formatGraphQLError(action.payload),
@@ -195,10 +204,19 @@ function reducer(
         ...state,
         fetchingBenefitPlan: false,
         fetchedBenefitPlan: true,
-        benefitPlan: parseData(action.payload.data.benefitPlan)?.map((benefitPlan) => ({
-          ...benefitPlan,
-          id: decodeId(benefitPlan.id),
-        }))?.[0],
+        benefitPlan: parseData(action.payload.data.benefitPlan)?.map((benefitPlan) => {
+          const response = ({
+            ...benefitPlan,
+            id: decodeId(benefitPlan.id),
+          });
+          if (response?.holder?.id) {
+            response.holder = ({
+              ...response.holder,
+              id: decodeId(response.holder.id),
+            });
+          }
+          return response;
+        })?.[0],
         errorBenefitPlan: null,
       };
     case SUCCESS(ACTION_TYPE.SEARCH_BENEFICIARIES):

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -21,7 +21,6 @@
   "socialProtection.benefitPlan.name": "Name",
   "socialProtection.benefitPlan.type": "Type",
   "socialProtection.benefitPlan.code": "Code",
-  "socialProtection.benefitPlan.institution": "Institution",
   "socialProtection.benefitPlan.maxBeneficiaries": "Max Beneficiaries",
   "socialProtection.benefitPlan.jsonExt": "json_ext",
   "socialProtection.benefitPlan.schema": "Schema",