Merge pull request #9 from openimis/hotfix/OMT_179_LGTM_fixes

LGTM fixes
openimis · May 26, 2020 · 6c7fbcd · 6c7fbcd
2 parents 7a0be26 + ec27bb7
commit 6c7fbcd
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openimis/fe-insuree",
-  "version": "1.2.0-rc1",
+  "version": "1.2.0-rc2",
   "license": "AGPL-3.0-only",
   "description": "openIMIS Frontend Insuree reference module",
   "repository": "openimis/openimis-fe-insuree_js",

diff --git a/src/components/EnquiryDialog.js b/src/components/EnquiryDialog.js
@@ -19,8 +19,6 @@ const styles = theme => ({
 
 class EnquiryDialog extends Component {
 
-    state = { loading: false }
-
     componentDidUpdate(prevProps, prevState, snapshot) {
         if (prevProps.chfid !== this.props.chfid) {
             this.props.fetchInsuree(this.props.modulesManager, this.props.chfid);

diff --git a/src/components/InsureeCappedItemServiceLink.js b/src/components/InsureeCappedItemServiceLink.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from "react";
+import React, { Component } from "react";
 import { connect } from "react-redux";
 import { injectIntl } from 'react-intl';
 import { withTheme, withStyles } from "@material-ui/core/styles";

diff --git a/src/components/InsureeFirstServicePoint.js b/src/components/InsureeFirstServicePoint.js
@@ -31,7 +31,7 @@ class InsureeFirstServicePoint extends Component {
                 </Grid>
                 <Grid item xs={12} className={classes.details}>
                     <PublishedComponent
-                        id="location.HealthFacilityFullPath"
+                        pubRef="location.HealthFacilityFullPath"
                         hfid={insuree.healthFacility.id}
                     />
                 </Grid>

diff --git a/src/components/InsureeProfileLink.js b/src/components/InsureeProfileLink.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from "react";
+import React, { Component } from "react";
 import { connect } from "react-redux";
 import { injectIntl } from 'react-intl';
 import { withTheme, withStyles } from "@material-ui/core/styles";

diff --git a/src/pickers/InsureeChfIdPicker.js b/src/pickers/InsureeChfIdPicker.js
@@ -26,27 +26,27 @@ class InsureeChfIdPicker extends Component {
 
     componentDidMount() {
         if (this.props.value) {
-            this.setState({
-                search: !!this.props.value ? this.props.value.chfId : null,
-                selected: this.props.value,
-            });
+            this.setState((state, props) => ({
+                search: !!props.value ? props.value.chfId : null,
+                selected: props.value,
+            }));
         }
     }
 
     componentDidUpdate(prevProps, prevState, snapshot) {
         if (prevProps.reset !== this.props.reset) {
-            this.setState({
+            this.setState((state, props) => ({
                 ...INIT_STATE,
-                search: !!this.props.value ? this.props.value.chfId : null,
-                selected: this.props.value
-            });
+                search: !!props.value ? props.value.chfId : null,
+                selected: props.value
+            }));
         } else if (!_.isEqual(prevProps.insuree, this.props.insuree)) {
             this.props.onChange(this.props.insuree, this.formatInsuree(this.props.insuree))
         } else if (!_.isEqual(prevProps.value, this.props.value)) {
-            this.setState({
-                search: !!this.props.value ? this.props.value.chfId : null,
-                selected: this.props.value
-            });
+            this.setState((state, props) => ({
+                search: !!props.value ? props.value.chfId : null,
+                selected: props.value
+            }));
         }
     }
 

diff --git a/src/pickers/InsureePicker.js b/src/pickers/InsureePicker.js
@@ -22,10 +22,6 @@ class RawFilter extends Component {
         chfId: "",
         lastName: "",
         otherNames: "",
-        page: 0,
-        pageSize: 0,
-        afterCursor: null,
-        beforeCursor: null,
     }
 
     stateToFilters = () => {
@@ -100,18 +96,18 @@ class InsureePicker extends Component {
 
     componentDidMount() {
         if (this.props.value) {
-            this.setState({ selected: this.props.value });
+            this.setState((state, props) => ({ selected: props.value }));
         }
     }
 
     componentDidUpdate(prevProps, prevState, snapshot) {
         if (prevProps.reset !== this.props.reset) {
-            this.setState({
+            this.setState((state, props) => ({
                 ...INIT_STATE,
-                selected: this.props.value
-            });
+                selected: props.value
+            }));
         } else if (!_.isEqual(prevProps.value, this.props.value)) {
-            this.setState({ selected: this.props.value });
+            this.setState((state, props) => ({ selected: props.value }));
         }
     }
 
@@ -162,21 +158,21 @@ class InsureePicker extends Component {
 
     onChangePage = (page, nbr) => {
         if (nbr > this.state.page) {
-            this.setState(
-                {
-                    page: this.state.page + 1,
+            this.setState((state, props) =>
+                ({
+                    page: state.page + 1,
                     beforeCursor: null,
-                    afterCursor: this.props.insureesPageInfo.endCursor,
-                },
+                    afterCursor: props.insureesPageInfo.endCursor,
+                }),
                 e => this.props.fetchInsurees(this.props.modulesManager, this.filtersToQueryParams())
             )
         } else if (nbr < this.state.page) {
-            this.setState(
-                {
-                    page: this.state.page - 1,
-                    beforeCursor: this.props.insureesPageInfo.startCursor,
+            this.setState((state, props) =>
+                ({
+                    page: state.page - 1,
+                    beforeCursor: props.insureesPageInfo.startCursor,
                     afterCursor: null,
-                },
+                }),
                 e => this.props.fetchInsurees(this.props.modulesManager, this.filtersToQueryParams())
             )
         }