From 43fd63917f4d210d77805083d145b3be7dc07a87 Mon Sep 17 00:00:00 2001
From: Jan <j.dolkowski@soldevelo.com>
Date: Tue, 3 Oct 2023 11:30:39 +0200
Subject: [PATCH] CM-333: filter individuals by group id

---
 src/components/GroupIndividualFilter.js   | 11 ++++--
 src/components/GroupIndividualSearcher.js | 41 +++++++++++++----------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/components/GroupIndividualFilter.js b/src/components/GroupIndividualFilter.js
index 4488909..02362e3 100644
--- a/src/components/GroupIndividualFilter.js
+++ b/src/components/GroupIndividualFilter.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { injectIntl } from 'react-intl';
 import { TextInput, PublishedComponent, formatMessage } from '@openimis/fe-core';
 import { Grid } from '@material-ui/core';
@@ -9,7 +9,7 @@ import { defaultFilterStyles } from '../util/styles';
 import GroupIndividualRolePicker from '../pickers/GroupIndividualRolePicker';
 
 function GroupIndividualFilter({
-  intl, classes, filters, onChangeFilters,
+  intl, classes, filters, onChangeFilters, groupId,
 }) {
   const debouncedOnChangeFilters = _debounce(onChangeFilters, DEFAULT_DEBOUNCE_TIME);
 
@@ -37,6 +37,13 @@ function GroupIndividualFilter({
     }
   };
 
+  const handleGroupId = onChangeStringFilter('group_Id');
+  useEffect(() => {
+    if (filters?.group_Id?.value !== groupId) {
+      handleGroupId(groupId);
+    }
+  }, [groupId]);
+
   return (
     <Grid container className={classes.form}>
       <Grid item xs={2} className={classes.item}>
diff --git a/src/components/GroupIndividualSearcher.js b/src/components/GroupIndividualSearcher.js
index c7ce451..fbe9ce8 100644
--- a/src/components/GroupIndividualSearcher.js
+++ b/src/components/GroupIndividualSearcher.js
@@ -1,41 +1,38 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { injectIntl } from 'react-intl';
 import {
-  withModulesManager,
+  clearConfirm,
+  coreConfirm,
+  downloadExport,
+  formatDateFromISO,
   formatMessage,
   formatMessageWithValues,
-  Searcher,
-  formatDateFromISO,
-  coreConfirm,
-  clearConfirm,
+  historyPush,
   journalize,
+  Searcher,
   withHistory,
-  historyPush,
-  downloadExport,
+  withModulesManager,
 } from '@openimis/fe-core';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import {
-  IconButton, Tooltip, Button,
-  Dialog,
-  DialogActions,
-  DialogTitle,
+  Button, Dialog, DialogActions, DialogTitle, IconButton, Tooltip,
 } from '@material-ui/core';
 import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
 import {
-  fetchGroupIndividuals,
-  deleteGroupIndividual,
   clearGroupIndividualExport,
+  deleteGroupIndividual,
   downloadGroupIndividuals,
+  fetchGroupIndividuals,
   updateGroupIndividual,
 } from '../actions';
 import {
   DEFAULT_PAGE_SIZE,
-  ROWS_PER_PAGE_OPTIONS,
   EMPTY_STRING,
-  RIGHT_GROUP_INDIVIDUAL_UPDATE,
   RIGHT_GROUP_INDIVIDUAL_DELETE,
+  RIGHT_GROUP_INDIVIDUAL_UPDATE,
+  ROWS_PER_PAGE_OPTIONS,
 } from '../constants';
 import GroupIndividualFilter from './GroupIndividualFilter';
 import GroupIndividualRolePicker from '../pickers/GroupIndividualRolePicker';
@@ -255,11 +252,21 @@ function GroupIndividualSearcher({
     return filters;
   };
 
+  const groupBeneficiaryFilter = (props) => (
+    <GroupIndividualFilter
+      intl={props.intl}
+      classes={props.classes}
+      filters={props.filters}
+      onChangeFilters={props.onChangeFilters}
+      groupId={groupId}
+    />
+  );
+
   return (
     <div>
       <Searcher
         module="individual"
-        FilterPane={GroupIndividualFilter}
+        FilterPane={groupBeneficiaryFilter}
         fetch={fetch}
         items={groupIndividuals}
         itemsPageInfo={groupIndividualsPageInfo}