Sprint 32 (#533)

* Resolves #410
DiscipleTools · Dec 24, 2020 · 74cc570 · 74cc570
1 parent 4aced14
commit 74cc570
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 20 deletions.
diff --git a/screens/Contact/ContactsScreen.js b/screens/Contact/ContactsScreen.js
@@ -186,14 +186,18 @@ class ContactsScreen extends React.Component {
   renderFooter = () => {
     return (
       <View style={styles.loadMoreFooterText}>
-        {this.props.isConnected && !this.state.filtered && (
-          <TouchableOpacity
-            onPress={() => {
-              this.onRefresh(true);
-            }}>
-            <Text style={styles.loadMoreFooterText}>{i18n.t('notificationsScreen.loadMore')}</Text>
-          </TouchableOpacity>
-        )}
+        {this.props.isConnected &&
+          !this.state.filtered &&
+          this.state.offset + this.state.limit < this.props.totalContacts && (
+            <TouchableOpacity
+              onPress={() => {
+                this.onRefresh(true);
+              }}>
+              <Text style={styles.loadMoreFooterText}>
+                {i18n.t('notificationsScreen.loadMore')}
+              </Text>
+            </TouchableOpacity>
+          )}
       </View>
     );
   };
@@ -466,6 +470,7 @@ const mapStateToProps = (state) => ({
   contactSettings: state.contactsReducer.settings,
   isConnected: state.networkConnectivityReducer.isConnected,
   contactFilters: state.usersReducer.contactFilters,
+  totalContacts: state.contactsReducer.total,
 });
 const mapDispatchToProps = (dispatch) => ({
   getAllContacts: (domain, token, offset, limit, sort) => {

diff --git a/screens/Group/GroupsScreen.js b/screens/Group/GroupsScreen.js
@@ -165,14 +165,18 @@ class GroupsScreen extends React.Component {
   renderFooter = () => {
     return (
       <View style={styles.loadMoreFooterText}>
-        {this.props.isConnected && !this.state.filtered && (
-          <TouchableOpacity
-            onPress={() => {
-              this.onRefresh(true);
-            }}>
-            <Text style={styles.loadMoreFooterText}>{i18n.t('notificationsScreen.loadMore')}</Text>
-          </TouchableOpacity>
-        )}
+        {this.props.isConnected &&
+          !this.state.filtered &&
+          this.state.offset + this.state.limit < this.props.totalGroups && (
+            <TouchableOpacity
+              onPress={() => {
+                this.onRefresh(true);
+              }}>
+              <Text style={styles.loadMoreFooterText}>
+                {i18n.t('notificationsScreen.loadMore')}
+              </Text>
+            </TouchableOpacity>
+          )}
       </View>
     );
   };
@@ -445,6 +449,7 @@ const mapStateToProps = (state) => ({
   groupSettings: state.groupsReducer.settings,
   isConnected: state.networkConnectivityReducer.isConnected,
   groupFilters: state.usersReducer.groupFilters,
+  totalGroups: state.groupsReducer.total,
 });
 const mapDispatchToProps = (dispatch) => ({
   getAllGroups: (domain, token, offset, limit, sort) => {

diff --git a/store/reducers/contacts.reducer.js b/store/reducers/contacts.reducer.js
@@ -22,6 +22,7 @@ const initialState = {
   shareSettings: {},
   savedShare: false,
   tags: [],
+  total: 0,
 };
 
 export default function contactsReducer(state = initialState, action) {
@@ -47,9 +48,10 @@ export default function contactsReducer(state = initialState, action) {
         loading: true,
       };
     case actions.CONTACTS_GETALL_SUCCESS: {
-      let { contacts, offline } = action,
+      let { contacts, offline, offset, total } = action,
         newContacts = [],
-        currentContacts = newState.contacts ? [...newState.contacts] : [];
+        currentContacts = newState.contacts ? [...newState.contacts] : [],
+        newTotal = total ? total : newState.total;
       if (offline) {
         newContacts = [...contacts];
       } else {
@@ -68,6 +70,9 @@ export default function contactsReducer(state = initialState, action) {
           localContacts = currentContacts.filter(
             (currentContact) => !sharedTools.isNumeric(currentContact.ID),
           );
+        if (offset === 0) {
+          persistedMappedContacts = [];
+        }
         // Merge persisted contacts with db contacts
         let dataBaseContacts = [...persistedMappedContacts, ...mappedContacts].sort((a, b) => {
           // Sort contacts 'desc'
@@ -78,6 +83,7 @@ export default function contactsReducer(state = initialState, action) {
       return {
         ...newState,
         contacts: newContacts,
+        total: newTotal,
         loading: false,
       };
     }

diff --git a/store/reducers/groups.reducer.js b/store/reducers/groups.reducer.js
@@ -26,6 +26,7 @@ const initialState = {
   loadingShare: false,
   shareSettings: {},
   savedShare: false,
+  total: 0,
 };
 
 export default function groupsReducer(state = initialState, action) {
@@ -93,9 +94,10 @@ export default function groupsReducer(state = initialState, action) {
         loading: true,
       };
     case actions.GROUPS_GETALL_SUCCESS: {
-      let { groups, offline } = action,
+      let { groups, offline, offset, total } = action,
         newGroups = [],
-        currentGroups = newState.groups ? [...newState.groups] : [];
+        currentGroups = newState.groups ? [...newState.groups] : [],
+        newTotal = total ? total : newState.total;
       if (offline) {
         newGroups = [...groups];
       } else {
@@ -112,6 +114,9 @@ export default function groupsReducer(state = initialState, action) {
           localGroups = currentGroups.filter(
             (currentGroup) => !sharedTools.isNumeric(currentGroup.ID),
           );
+        if (offset === 0) {
+          persistedMappedGroups = [];
+        }
         // Merge persisted groups with db groups
         let dataBaseGroups = [...persistedMappedGroups, ...mappedGroups].sort((a, b) => {
           // Sort contacts 'desc'
@@ -122,6 +127,7 @@ export default function groupsReducer(state = initialState, action) {
       return {
         ...newState,
         groups: newGroups,
+        total: newTotal,
         loading: false,
       };
     }

diff --git a/store/sagas/contacts.sagas.js b/store/sagas/contacts.sagas.js
@@ -30,6 +30,8 @@ export function* getAll({ domain, token, offset, limit, sort }) {
           yield put({
             type: actions.CONTACTS_GETALL_SUCCESS,
             contacts: jsonData.posts,
+            offset,
+            total: parseInt(jsonData.total),
           });
         } else {
           yield put({

diff --git a/store/sagas/groups.sagas.js b/store/sagas/groups.sagas.js
@@ -30,6 +30,8 @@ export function* getAll({ domain, token, offset, limit, sort }) {
         yield put({
           type: actions.GROUPS_GETALL_SUCCESS,
           groups: jsonData.posts,
+          offset,
+          total: parseInt(jsonData.total),
         });
       } else {
         yield put({