Fix for loading

client/src/scenes/IncidentsReport/index.js

@@ -5,26 +5,50 @@ import { Container } from 'semantic-ui-react';
 import MainMenu from '../../components/MainMenu';
 import DateRangePicker from '../../components/DateRangePicker';
 import MemberIncidentsTables from '../../components/MemberIncidentsTables';
+import GenerateFeesInORDButton from '../../components/GenerateFeesInORDButton';
 
-import { fetchIncidents } from '../../store/actions';
+import { fetchIncidents, addFeesToOrd } from '../../store/actions';
 
 class IncidentsReport extends Component {
-    onDatesUpdate(dateRange) {
+    state = {dateRange: null};
+
+    onDatesUpdate = (dateRange) => {
         const { fetchIncidents } = this.props;
+
+        this.setState({dateRange});
         fetchIncidents(dateRange);
-    }
+    };
 
     render () {
-        const { pendingIncidents, incidents } = this.props;
+        const { pendingIncidents, incidents, pendingAddFeesStatus } = this.props;
+        const { dateRange } = this.state;
+
+        const loading = pendingIncidents || pendingAddFeesStatus;
+
+        const membersMap = {};
+        if (incidents && Array.isArray(incidents)) {
+            incidents.forEach((incident) => {
+                membersMap[incident.memberId] = true;
+            });
+        }
+        const memberIds = Object.keys(membersMap) || [];
 
         return (
             <Container>
                 <MainMenu/>
                 <h3>Incidents Report</h3>
                 <hr/>
-                <DateRangePicker buttonLabel="Show report" onDatesUpdate={this.onDatesUpdate.bind(this)} />
+                <DateRangePicker buttonLabel="Show report" onDatesUpdate={this.onDatesUpdate} inlineButton />
                 <br/>
-                <MemberIncidentsTables pendingIncidents={pendingIncidents} incidents={incidents} />
+                <GenerateFeesInORDButton
+                    memberIds={memberIds}
+                    disabled={loading}
+                    dateRange={dateRange}
+                />
+                <br/><br/>
+                <hr/>
+                <br/>
+                <MemberIncidentsTables pendingIncidents={loading} incidents={incidents} />
             </Container>
         );
     }
@@ -33,10 +57,12 @@ class IncidentsReport extends Component {
 const mapStateToProps = (state) => ({
     pendingIncidents: state.incidentsReport.pending,
     incidents: state.incidentsReport.result,
+    pendingAddFeesStatus: state.addFeesStatus.pending,
 });
 
 const mapDispatchToProps = (dispatch) => ({
     fetchIncidents: (dateRange) => fetchIncidents(dispatch, dateRange),
+    addFeesToOrd: (dateRange, memberIds) => addFeesToOrd(dispatch, dateRange, memberIds),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(IncidentsReport);