fix: inability to refresh custom forms on or offline

hopetambala · Feb 4, 2021 · 21c85e9 · 21c85e9
1 parent 71eee85
commit 21c85e9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/domains/DataCollection/FormGallery/index.js b/domains/DataCollection/FormGallery/index.js
@@ -5,6 +5,7 @@ import {
 } from 'react-native';
 import {
   Button, Card,
+  IconButton,
   Paragraph, Text, Title
 } from 'react-native-paper';
 
@@ -15,7 +16,7 @@ import { layout, theme } from '../../../modules/theme';
 
 const FormGallery = (props) => {
   const {
-    navigateToNewRecord, navigateToCustomForm, puenteForms, customForms
+    navigateToNewRecord, navigateToCustomForm, puenteForms, customForms, refreshCustomForms
   } = props;
   return (
     <View>
@@ -28,7 +29,16 @@ const FormGallery = (props) => {
         />
       </View>
       <View style={layout.screenRow}>
-        <Text style={styles.header}>{I18n.t('formsGallery.customForms')}</Text>
+        <View style={{ flexDirection: 'row' }}>
+          <Text style={styles.header}>{I18n.t('formsGallery.customForms')}</Text>
+          <IconButton
+            style={{ bottom: 7 }}
+            color={theme.colors.primary}
+            size={20}
+            icon="refresh"
+            onPress={refreshCustomForms}
+          />
+        </View>
         <ScrollView horizontal>
           {customForms && customForms.map((form) => (
             <Card

diff --git a/domains/DataCollection/index.js b/domains/DataCollection/index.js
@@ -51,13 +51,12 @@ const DataCollection = ({ navigation }) => {
     getData('currentUser').then((user) => {
       setSurveyingUser(`${user.firstname || ''} ${user.lastname || ''}`);
     });
-
     getData('organization').then((org) => {
       setSurveyingOrganization(org || surveyingOrganization);
     }).catch(() => {
       setSurveyingOrganization(surveyingOrganization || '');
     });
-    customFormsQuery(surveyingOrganization).then((forms) => {
+    getData('customForms').then((forms) => {
       setCustomForms(forms);
     });
   }, [surveyingUser, surveyingOrganization]);
@@ -115,6 +114,11 @@ const DataCollection = ({ navigation }) => {
     });
   };
 
+  const refreshCustomForms = async () => {
+    customFormsQuery(surveyingOrganization).then((forms) => {
+      setCustomForms(forms);
+    });
+  };
   const logOut = () => {
     retrieveSignOutFunction().then(() => {
       navigation.navigate('Sign In');
@@ -220,6 +224,7 @@ const DataCollection = ({ navigation }) => {
                 navigateToCustomForm={navigateToCustomForm}
                 puenteForms={puenteForms}
                 customForms={customForms}
+                refreshCustomForms={refreshCustomForms}
               />
             </View>
           )}

diff --git a/modules/i18n/english/en.json b/modules/i18n/english/en.json
@@ -9,7 +9,8 @@
     "lName": "Last Name",
     "city": "City",
     "commName": "Community Name",
-    "notes": "Notes"
+    "notes": "Notes",
+    "refresh": "Refresh"
   },
   "signUp": {
     "firstName": "First Name",

diff --git a/modules/i18n/spanish/es.json b/modules/i18n/spanish/es.json
@@ -9,7 +9,8 @@
     "lName": "Apellido",
     "city": "Ciudad",
     "commName": "Nombre de comunidad",
-    "notes": "Notas"
+    "notes": "Notas",
+    "refresh": "Actualiza"
   },
   "signUp": {
     "firstName": "Nombre de verdadero",