UIU-1407 and UIU-1408 - Fees Fines check-all checkboxes not working. (#…

…1099) * add rowUpdater to warning modal * add rowUpdater to fee fine listing
folio-org · Jan 6, 2020 · 71717cf · 71717cf
1 parent bd2002d
commit 71717cf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/components/Accounts/Actions/WarningModal.js b/src/components/Accounts/Actions/WarningModal.js
@@ -119,6 +119,11 @@ class WarningModal extends React.Component {
     };
   }
 
+  rowUpdater = (a) => {
+    const { checkedAccounts } = this.state;
+    return !!(checkedAccounts[a.id]);
+  }
+
   onClickContinue() {
     const { checkedAccounts } = this.state;
     const values = Object.values(checkedAccounts);
@@ -201,6 +206,7 @@ class WarningModal extends React.Component {
               sortOrder={sortOrder[0]}
               sortDirection={`${sortDirection[0]}ending`}
               contentData={accountOrdered}
+              rowUpdater={this.rowUpdater}
             />
           </Col>
         </Row>

diff --git a/src/components/Accounts/ViewFeesFines/ViewFeesFines.js b/src/components/Accounts/ViewFeesFines/ViewFeesFines.js
@@ -204,7 +204,7 @@ class ViewFeesFines extends React.Component {
     return {
       '  ': f => (
         <input
-          checked={accounts.find(a => a.id === f.id)}
+          checked={(accounts.findIndex(a => a.id === f.id) !== -1)}
           onClick={e => this.toggleItem(e, f)}
           type="checkbox"
         />
@@ -286,6 +286,12 @@ class ViewFeesFines extends React.Component {
     }));
   }
 
+  rowUpdater = (f) => {
+    const accounts = this.props.selectedAccounts;
+    return this.state.allChecked ||
+    (accounts.findIndex(a => a.id === f.id) !== -1);
+  };
+
   handleOptionsChange(itemMeta, e) {
     e.preventDefault();
     e.stopPropagation();
@@ -439,6 +445,7 @@ class ViewFeesFines extends React.Component {
         sortOrder={sortOrder[0]}
         sortDirection={`${sortDirection[0]}ending`}
         onRowClick={this.onRowClick}
+        rowUpdater={this.rowUpdater}
       />
     );
   }