Merge branch 'develop' into staging

ComApp/CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## 3.2.1
+
+### Évolution - 3.2.1
+
+- Update select and select multiple fields to get list in alphabetical order
+
+## 3.1.1
+
+### Évolution - 3.1.1
+
+- Update Install and Download docs call to handle tenant changes
+
+## 3.0.1
+
+### Bug - 3.0.1
+
+- Fix sendBrochure call, put data into data axios object instead of params
+
 ## 3.0.0
 
 ### Bug - 3.0.0

ComApp/android/app/build.gradle

@@ -139,7 +139,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "3.0.0"
+        versionName "3.2.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

ComApp/package.json

@@ -58,9 +58,11 @@
     "eslint": "^7.32.0",
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.72.3",
+    "patch-package": "^8.0.0",
     "react-test-renderer": "18.1.0"
   },
   "jest": {
     "preset": "react-native"
-  }
+  },
+  "postinstall": "patch-package"
 }

ComApp/patches/react-native+0.70.6.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native/ReactAndroid/build.gradle b/node_modules/react-native/ReactAndroid/build.gradle
+index 3be8b26..3f7bba8 100644
+--- a/node_modules/react-native/ReactAndroid/build.gradle
++++ b/node_modules/react-native/ReactAndroid/build.gradle
+@@ -61,7 +61,7 @@ task createNativeDepsDirectories {
+ }
+ 
+ task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
+-    src("https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
++    src("https://archives.boost.io/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
+     onlyIfNewer(true)
+     overwrite(false)
+     dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))

ComApp/src/App/Controllers/SyncController.js

@@ -132,8 +132,10 @@ class SyncController {
       responseType: 'json',
       params: {
         token: api_token,
-        emails: brochure,
       },
+      data: {
+        emails: brochure,
+      }
     });
   }
 

ComApp/src/App/Views/ContactDetailsScreen.js

@@ -184,7 +184,7 @@ class ContactDetailsScreen extends React.Component {
       contact.email.length >= 255 ||
       !Helpers.isEmailValid(contact.email)
     ) {
-      console.debug('invalid prop email');
+      console.debug('invalid prop email', contact.email);
       error = error.concat(i18n.t('error.invalid_email_address') + '.\n');
     }
     const lockedFields = ['firstname', 'lastname', 'phone'];
@@ -1292,12 +1292,12 @@ class ContactDetailsScreen extends React.Component {
             'contact_details_s.input_select_multiple_search',
           )}
           confirmText={i18n.t('global.close')}
-          items={details.map(function (detail, detailIndex) {
-            return {
+          items={details
+            .map((detail, detailIndex) => ({
               id: detailIndex,
               name: detail,
-            };
-          })}
+            }))
+            .sort((a, b) => a.name.localeCompare(b.name))}
           IconRenderer={this.getIcon}
           uniqueKey="id"
           selectText={`${placeHolder} ${requiredStr}`}
@@ -1535,8 +1535,10 @@ class ContactDetailsScreen extends React.Component {
             label={i18n.t('contact_details_s.input_select_please_choose')}
             value={''}
           />
-          {details.map((detail, detailIndex) => (
-            <Picker.Item key={detailIndex} label={detail} value={detailIndex} />
+          {details.map((detail, index) => ({ label: detail, value: index }))
+          .sort((a, b) => a.label.localeCompare(b.label))
+          .map((item, index) => (
+            <Picker.Item key={index} label={item.label} value={item.value} />
           ))}
         </Picker>
       </View>,

ComApp/src/App/Views/InstallScreen.js

@@ -136,6 +136,7 @@ class InstallScreen extends React.Component {
         let toDL = [];
         if (response.data) {
           if (response.data.status === 'OK') {
+            const rootUrl = url.substring(0, url.lastIndexOf('/'));
             _.forEach(response.data.datas, function (value, key) {
               switch (key) {
                 case 'MainColor':
@@ -147,7 +148,7 @@ class InstallScreen extends React.Component {
                 case 'BackgroundImage':
                 case 'HomeButtonImage':
                   toDL.push({
-                    source: url + '/' + value,
+                    source: rootUrl + '/' + value,
                     dest: FileSystem.documentDirectory + key + '.png',
                   });
                   break;

ComApp/src/App/Views/SyncScreen.js

@@ -407,7 +407,10 @@ class SyncScreen extends React.Component {
     if (this.state.downloadingFile === false) {
       this.setState({ downloadingFile: true });
     }
-    const endpoint = SyncController.getUrlBo() + '/storage/docs/';
+    const tenantUrl = SyncController.getUrlBo();
+    const rootUrl = tenantUrl.substring(0, tenantUrl.lastIndexOf('/'));
+    const tenantId = tenantUrl.match(/[^\/]+$/)[0];
+    const endpoint = rootUrl + '/storage/docs/' + tenantId + "/";
     const doc = documents[i];
     this.setState({
       txtStep: