Merge pull request mngoe#166 from Y-Note-SAS/feature-33173

disable unecessary field in searcher OP-2554

Author: zikani03

.gitignore

@@ -21,3 +21,4 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 yarn.lock
+coverage

README.md

@@ -104,4 +104,9 @@ None
   the current user as the enrolment officer during family or insuree creation. If 'True', the officer is inferred from session; if 'False', manual selection remains available. (default: 'False)
 - `isDefaultFetchInsureeActivated`, manage default fetch behavior of insuree searcher ; default: true
 - `isDefaultFetchFamilyActivated`, manage default fetch behavior of family searcher ; default: true
+- `searcherColumnsConfig`, manage columns visibility in searcher ; default: {}, e.g {email : "H", phone : "H"}
+the default value of the configuration is an empty object, which means that all columns are visible.
+   
+  
+
 

src/components/FamilyFilter.js

@@ -34,6 +34,7 @@ class FamilyFilter extends Component {
 
   constructor(props) {
     super(props);
+    this.columns = props.modulesManager.getConf("fe-insuree", "columns", {});
     this.filterFamiliesOnMembers = props.modulesManager.getConf("fe-insuree", "filterFamiliesOnMembers", true);
     this.renderLastNameFirst = props.modulesManager.getConf(
       "fe-insuree",
@@ -204,6 +205,7 @@ class FamilyFilter extends Component {
             </Grid>
           }
         />
+        {!this.columns?.email === "H" && (
         <ControlledField
           module="insuree"
           id={`FamilyFilter.${anchor}.email`}
@@ -227,6 +229,7 @@ class FamilyFilter extends Component {
             </Grid>
           }
         />
+        )}
         <ControlledField
           module="insuree"
           id={`FamilyFilter.${anchor}.dob`}
@@ -350,6 +353,7 @@ class FamilyFilter extends Component {
             </Grid>
           }
         />
+        {this.columns?.confirmationNo !== "H" && (
         <ControlledField
           module="insuree"
           id="FamilyFilter.confirmationNo"
@@ -373,6 +377,7 @@ class FamilyFilter extends Component {
             </Grid>
           }
         />
+        )}
         <ControlledField
           module="insuree"
           id="PolicyFilter.officer"

src/components/FamilySearcher.js

@@ -37,6 +37,7 @@ class FamilySearcher extends Component {
       "familyFilter.rowsPerPageOptions",
       [10, 20, 50, 100],
     );
+    this.columns = props.modulesManager.getConf("fe-insuree", "searcherColumnsConfig", {});
     this.defaultPageSize = props.modulesManager.getConf("fe-insuree", "familyFilter.defaultPageSize", 10);
     this.locationLevels = this.props.modulesManager.getConf("fe-location", "location.Location.MaxLevels", 4);
     this.renderLastNameFirst = props.modulesManager.getConf(
@@ -116,16 +117,16 @@ class FamilySearcher extends Component {
       "insuree.familySummaries.insuranceNo",
       this.renderLastNameFirst ? "insuree.familySummaries.lastName" : "insuree.familySummaries.otherNames",
       !this.renderLastNameFirst ? "insuree.familySummaries.lastName" : "insuree.familySummaries.otherNames",
-      "insuree.familySummaries.email",
+      this.columns.email !== "H" ? "insuree.familySummaries.email" : null,
       "insuree.familySummaries.phone",
       "insuree.familySummaries.dob",
     ];
     for (var i = 0; i < this.locationLevels; i++) {
       h.push(`location.locationType.${i}`);
     }
     h.push(
-      "insuree.familySummaries.poverty",
-      "insuree.familySummaries.confirmationNo",
+      this.columns.poverty !== "H" ? "insuree.familySummaries.poverty" : null,
+      this.columns.confirmationNo !== "H" ? "insuree.familySummaries.confirmationNo" : null,
       filters?.showHistory?.value ? "insuree.familySummaries.validityFrom" : null,
       filters?.showHistory?.value ? "insuree.familySummaries.validityTo" : null,
       "insuree.familySummaries.openNewTab",
@@ -194,7 +195,7 @@ class FamilySearcher extends Component {
         (family.headInsuree && !this.renderLastNameFirst
           ? family.headInsuree.lastName
           : family.headInsuree.otherNames) || "",
-      (family) => (!!family.headInsuree ? family.headInsuree.email : ""),
+      this.columns.email !== "H" ? (family) => (!!family.headInsuree ? family.headInsuree.email : "") : null,
       (family) => (!!family.headInsuree ? family.headInsuree.phone : ""),
       (family) =>
         !!family.headInsuree
@@ -207,8 +208,8 @@ class FamilySearcher extends Component {
       formatters.push((family) => this.parentLocation(family.location, j));
     }
     formatters.push(
-      (family) => <Checkbox color="primary" checked={family.poverty} readOnly />,
-      (family) => family.confirmationNo,
+      this.columns.poverty !== "H" ? (family) => <Checkbox color="primary" checked={family.poverty} readOnly /> : null,
+      this.columns.confirmationNo !== "H" ? (family) => family.confirmationNo : null,
       filters?.showHistory?.value
         ? (family) => formatDateFromISO(this.props.modulesManager, this.props.intl, family.validityFrom)
         : null,

src/components/InsureeFilter.js

@@ -32,6 +32,7 @@ const INSUREE_FILTER_CONTRIBUTION_KEY = "insuree.Filter";
 class InsureeFilter extends Component {
   constructor(props) {
     super(props);
+    this.columns = props.modulesManager.getConf("fe-insuree", "columns", {});
     this.renderLastNameFirst = props.modulesManager.getConf(
       "fe-insuree",
       "renderLastNameFirst",
@@ -222,6 +223,7 @@ class InsureeFilter extends Component {
             />
           </Grid>
         </Grid>
+        {this.columns?.email !== "H" && (
         <ControlledField
           module="insuree"
           id="InsureeFilter.email"
@@ -245,6 +247,7 @@ class InsureeFilter extends Component {
             </Grid>
           }
         />
+        )}
         <ControlledField
           module="insuree"
           id="InsureeFilter.phone"
@@ -388,4 +391,8 @@ class InsureeFilter extends Component {
   }
 }
 
+const mapStateToProps = (state) => ({
+  rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
+});
+
 export default withModulesManager(injectIntl(withTheme(withStyles(styles)(InsureeFilter))));

src/components/InsureeSearcher.js

@@ -47,6 +47,8 @@ class InsureeSearcher extends Component {
       "insureeFilter.rowsPerPageOptions",
       [10, 20, 50, 100],
     );
+    this.columns = props.modulesManager.getConf("fe-insuree", "columns", {});
+    this.fields = props.modulesManager.getConf("fe-insuree", "fields", {});
     this.defaultPageSize = props.modulesManager.getConf("fe-insuree", "insureeFilter.defaultPageSize", 10);
     this.locationLevels = this.props.modulesManager.getConf("fe-location", "location.Location.MaxLevels", 4);
     this.renderLastNameFirst = props.modulesManager.getConf(
@@ -130,7 +132,7 @@ class InsureeSearcher extends Component {
       !this.renderLastNameFirst ? "insuree.insureeSummaries.lastName" : "insuree.insureeSummaries.otherNames",
       "insuree.insureeSummaries.maritalStatus",
       "insuree.insureeSummaries.gender",
-      "insuree.insureeSummaries.email",
+      this.columns.email !== "H" ? "insuree.insureeSummaries.email" : null,
       "insuree.insureeSummaries.phone",
       "insuree.insureeSummaries.dob",
       ...Array.from(Array(this.locationLevels)).map((_, i) => (`location.locationType.${i}`)),
@@ -217,7 +219,7 @@ class InsureeSearcher extends Component {
               value={!!insuree.gender ? insuree.gender.code : null}
             />
           ),
-      (insuree) => insuree.email,
+      this.columns.email !== "H" ? (insuree) => insuree.email : null,
       (insuree) => insuree.phone,
       (insuree) => formatDateFromISO(this.props.modulesManager, this.props.intl, insuree.dob),
     ];