chore: merge master

hopetambala · Nov 11, 2020 · afa6370 · afa6370
2 parents 3ae0af6 + dfa3bfd
commit afa6370
Show file tree

Hide file tree

Showing 21 changed files with 747 additions and 466 deletions.
diff --git a/.versionrc.js b/.versionrc.js
@@ -15,5 +15,17 @@ module.exports = {
       filename: 'app.json',
       updater: require.resolve('standard-version-expo/ios'),
     }
-  ]
+  ],
+  types: [
+    { type: 'chore', section: 'Chores' },
+    { type: 'ci', section: 'Pipeline Changes' },
+    { type: 'docs', section: 'Documentation Changes' },
+    { type: 'feat', section: 'New Features' },
+    { type: 'fix', section: 'Bug fixes' },
+    { type: 'perf', hidden: true },
+    { type: 'refactor', section: 'Code Refactors' },
+    { type: 'release', hidden: true },
+    { type: 'style', hidden: true },
+    { type: 'test', hidden: true },
+  ],
 };
diff --git a/App.js b/App.js
@@ -7,7 +7,7 @@ import { Provider as StoreProvider } from 'react-redux';
 import MainNavigation from './components/MainNavigation';
 
 import configureStore from './modules/state-management/configure-store';
-// import useCachedResources from './modules/cached-resources/useCachedResources';
+import useCachedResources from './modules/cached-resources/useCachedResources';
 import { theme } from './modules/theme';
 
 const store = configureStore();
@@ -17,11 +17,11 @@ if (Platform.OS === 'android') {
 }
 
 export default function App() {
-  // const isLoadingComplete = useCachedResources();
+  const isLoadingComplete = useCachedResources();
 
-  // if (!isLoadingComplete) {
-  //   return null;
-  // }
+  if (!isLoadingComplete) {
+    return null;
+  }
   return (
     <StoreProvider store={store}>
       <PaperProvider theme={theme}>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,76 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [8.4.0](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.4...v8.4.0) (2020-11-10)
+
+
+### Bug fixes
+
+* add missing identification form fields and their translations ([a986b15](https://github.com/hopetambala/puente-reactnative-collect/commit/a986b15a8e09259abf08edbc54d86e707a2a1e4b))
+
+
+### Chores
+
+* add in all required fields for ID ([6e65760](https://github.com/hopetambala/puente-reactnative-collect/commit/6e657604ab8e45ae0449fdec10a375cb9f9e70a5))
+* linting error with map() ([31ac1fa](https://github.com/hopetambala/puente-reactnative-collect/commit/31ac1fab7aeb36a0a0d6f92fae0ed4f3a69acf8c))
+* update changelog generation ([ff9eada](https://github.com/hopetambala/puente-reactnative-collect/commit/ff9eadadfc78d81034894782f6a8a54c71d6e528))
+
+
+### Code Refactors
+
+* linting ([ecce1fb](https://github.com/hopetambala/puente-reactnative-collect/commit/ecce1fbb4dc96004f4f3b622cfd256c657415299))
+
+### [8.3.4](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.3...v8.3.4) (2020-11-09)
+
+
+### Bug fixes
+
+* stuff ([295998b](https://github.com/hopetambala/puente-reactnative-collect/commit/295998b3fe16ec42650f06074593db808151d91f))
+
+
+### Documentation changes
+
+* add ability to have better messages ([25d1d1e](https://github.com/hopetambala/puente-reactnative-collect/commit/25d1d1e3e5fa1eb5218ed51c9218bb8dab62438d))
+
+
+### Other chores
+
+* **release:** 8.3.3 ([58f73e7](https://github.com/hopetambala/puente-reactnative-collect/commit/58f73e71a2da77991516e632f31a08282a487cec))
+* readme ([d6b99c3](https://github.com/hopetambala/puente-reactnative-collect/commit/d6b99c3c66c708c6d8ceae0f225ea3ed405ee06c))
+
+### [8.3.2](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.1...v8.3.2) (2020-11-08)
+
+
+### Bug Fixes
+
+* [Android] Tab bar renders above keyboard ([10b12a7](https://github.com/hopetambala/puente-reactnative-collect/commit/10b12a7e31369af41c998d68a730c9ee0576e74f)), closes [/github.com/react-navigation/react-navigation/issues/6700#issuecomment-658893985](https://github.com/hopetambala//github.com/react-navigation/react-navigation/issues/6700/issues/issuecomment-658893985)
+
+### [8.3.1](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.0...v8.3.1) (2020-11-05)
+
+
+### Bug Fixes
+
+* add a flatlist ([32a49f5](https://github.com/hopetambala/puente-reactnative-collect/commit/32a49f56c35610606c077dcde51c0f793d562588))
+* caching records ([5997c57](https://github.com/hopetambala/puente-reactnative-collect/commit/5997c57e46b1416e26df1f68a8f91064e6fc328b))
+
+## [8.3.0](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.2.0...v8.3.0) (2020-11-05)
+
+
+### Bug Fixes
+
+* problems with caching records on splash screen ([3690467](https://github.com/hopetambala/puente-reactnative-collect/commit/3690467c67d0ed8550f80559237457d218025925))
+
+## [8.2.0](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.1.10...v8.2.0) (2020-11-04)
+
+
+### Bug Fixes
+
+* ability to create roles ([ed40e28](https://github.com/hopetambala/puente-reactnative-collect/commit/ed40e2860afa14c43bbbbe57f4c995435b50fb8d))
+* missing translations ([1716a1f](https://github.com/hopetambala/puente-reactnative-collect/commit/1716a1f502de26b8f9bef338ec8079ce70284c11))
+* remove unused tests ([afcb5e9](https://github.com/hopetambala/puente-reactnative-collect/commit/afcb5e9913222864b75e1b8360476bc950319552))
+* spanish translation for household ([81d6801](https://github.com/hopetambala/puente-reactnative-collect/commit/81d68010d8e125038a1f0c9bc89ffc63a14c6510))
+* spanish translation on GDPR page ([cdafb81](https://github.com/hopetambala/puente-reactnative-collect/commit/cdafb81912ee78a01c2e30cb613cd54ab6eb6f2b))
+
 ### [8.1.10](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.1.9...v8.1.10) (2020-10-29)
 
 

diff --git a/app.json b/app.json
@@ -7,7 +7,7 @@
       "android",
       "web"
     ],
-    "version": "8.1.10",
+    "version": "8.4.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "myapp",
@@ -23,15 +23,16 @@
     ],
     "ios": {
       "supportsTablet": true,
-      "buildNumber": "8.1.10",
+      "buildNumber": "8.4.0",
       "bundleIdentifier": "io.ionic.starter1270348"
     },
     "web": {
       "favicon": "./assets/images/favicon.png"
     },
     "android": {
-      "versionCode": 380080110,
-      "package": "io.ionic.starter1270348"
+      "versionCode": 380080400,
+      "package": "io.ionic.starter1270348",
+      "softwareKeyboardLayoutMode": "pan"
     },
     "packagerOpts": {
       "config": "metro.config.js",

diff --git a/components/FindResidents/index.js b/components/FindResidents/index.js
@@ -1,12 +1,9 @@
 import React, { useState, useEffect } from 'react';
 
-import {
-  View, FlatList
-} from 'react-native';
+import { View, FlatList } from 'react-native';
+import { Headline, Searchbar, Button } from 'react-native-paper';
 
-import {
-  Headline, Searchbar
-} from 'react-native-paper';
+import { Spinner } from 'native-base';
 
 import { residentIDQuery } from '../../services/parse/crud';
 
@@ -25,35 +22,41 @@ const FindResidents = ({
   const [data, setData] = useState([]);
   const [query, setQuery] = useState('');
   const [residents, setResidents] = useState([]);
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
-    fetchData();
-  }, []);
+    fetchAsyncData();
+  }, [organization]);
 
-  const fetchData = async () => {
-    await getData('residentData').then((residentData) => {
+  const fetchAsyncData = () => {
+    setLoading(true);
+    getData('residentData').then((residentData) => {
       if (residentData) {
         setData(residentData || []);
         setResidents(residentData.slice() || [].slice());
       }
+      setLoading(false);
     });
+  };
 
+  const fetchData = async () => {
+    setLoading(true);
     const queryParams = {
       skip: 0,
       offset: 0,
-      limit: 10000,
+      limit: 100000,
       parseColumn: 'surveyingOrganization',
       parseParam: organization,
     };
 
     let records = await residentIDQuery(queryParams);
     records = JSON.parse(JSON.stringify(records));
 
-    if (data !== records) {
-      storeData(records, 'residentData');
-      setData(records);
-      setResidents(records.slice());
-    }
+    storeData(records, 'residentData');
+
+    setData(records);
+    setResidents(records.slice());
+    setLoading(false);
   };
 
   const filterList = () => data.filter(
@@ -101,6 +104,7 @@ const FindResidents = ({
               onChangeText={onChangeSearch}
               value={query}
             />
+            <Button onPress={fetchData}>Refresh</Button>
           </>
         )}
 
@@ -113,6 +117,8 @@ const FindResidents = ({
           />
         </View>
       ))} */}
+        {loading
+          && <Spinner color="blue" />}
 
         {!selectPerson
           && (
@@ -123,6 +129,7 @@ const FindResidents = ({
             />
           )}
       </View>
+
       {selectPerson && (
         <ResidentPage
           fname={selectPerson.fname}

diff --git a/components/FormikFields/PaperInputPicker/AutoFill/index.js b/components/FormikFields/PaperInputPicker/AutoFill/index.js
@@ -79,10 +79,12 @@ export default class AutoFill extends Component {
           }}
           renderItem={({ item }) => (
             // you can change the view you want to show in suggestion from here
-            <TouchableOpacity onPress={() => {
-              this.setState({ query: item });
-              formikProps.setFieldValue(formikKey, item);
-            }}
+            <TouchableOpacity
+              key={`${item}`}
+              onPress={() => {
+                this.setState({ query: item });
+                formikProps.setFieldValue(formikKey, item);
+              }}
             >
               <Text style={styles.itemText} key={item}>
                 {item}
@@ -104,19 +106,20 @@ export default class AutoFill extends Component {
 
 const styles = StyleSheet.create({
   container: {
-    backgroundColor: '#F5FCFF',
+    // backgroundColor: '#F5FCFF',
     flex: 1,
     padding: 16,
-    marginTop: 40,
+    // marginTop: 40,
     marginBottom: 40,
   },
   autocompleteContainer: {
     backgroundColor: '#ffffff',
-    borderWidth: 0,
+    borderWidth: 0
   },
   descriptionContainer: {
     flex: 1,
     justifyContent: 'center',
+    borderRadius: 20
   },
   itemText: {
     fontSize: 15,