Merge branch 'develop'

Author: mark-prins

README.md

@@ -22,18 +22,37 @@ See [https://docs.msupply.foundation/en:cold_chain:start](https://docs.msupply.f
 - Install Android Studio and SDK tools: https://developer.android.com/studio.
 - Install SDKMAN for managing Java versions: https://sdkman.io/.
 
+The application is using java v1.8 you may need to target a specific java version in order to run the app locally.
+
 #### React Native
 
 - Install nvm for managing Node versions: https://github.com/nvm-sh/nvm.
 - Install yarn for managing Node packages: https://yarnpkg.com/lang/en/.
 - Install React Native: https://reactnative.dev/docs/environment-setup. Follow the steps listed under "Building Projects with Native Code" and set Target OS as "Android".
 
+The node version should be >= 12.8.4.
+
 ### Installing
 
 - Clone the repo: `git clone https://github.com/openmsupply/mobile.git`.
 - Setup local node environment as specified in `.nvmrc`: `nvm install && nvm use`.
 - Install/update app dependencies: `yarn install`.
 
+### Building
+
+Simply run `yarn build` to build the app. 
+If you have the following error:
+`A problem occurred starting process 'command 'node''`
+
+try editing `android/app/build.gradle` and adding the `nodeExecutableAndArgs` value, specific to your environment:
+
+```
+project.ext.react = [
+    nodeExecutableAndArgs: ["/usr/local/bin/node"]
+    ...other entries
+]
+```
+
 ## Contributors
 
 We welcome contributions from external developers!

android/app/build.gradle

@@ -83,8 +83,8 @@ import groovy.json.JsonSlurper
 project.ext.react = [
     entryFile: "index.ts",
     enableHermes: true,  // clean and rebuild if changing
-    extraPackagerArgs: ['--minify=false']
-    
+    extraPackagerArgs: ['--minify=false'],
+    // nodeExecutableAndArgs: ["/usr/local/bin/node"]
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"

android/app/release/mSupplyColdChain-0_5_0-rc3-armeabi-v7a-release.apk

@@ -1,6 +1,6 @@
 {
   "name": "mSupplyColdChain",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Cold chain temperature monitoring",
   "author": "mSupply Foundation",
   "main": "index.ts",
@@ -92,7 +92,7 @@
     "react-native-gesture-handler": "1.6.1",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "1.4.0",
-    "react-native-mail": "^6.1.0",
+    "react-native-mail": "^6.1.1",
     "react-native-modal": "^11.10.0",
     "react-native-permissions": "^2.2.2",
     "react-native-pin-view": "^3.0.1",

android/app/src/main/assets/fonts/Feather.ttf

@@ -3,12 +3,9 @@ export const BLUETOOTH_SETTING = {
 };
 
 export const SYNC_SETTING = {
-  AUTH_URL: 'authUrl',
+  SERVER_URL: 'serverUrl',
   AUTH_USERNAME: 'authUsername',
   AUTH_PASSWORD: 'authPassword',
-  SENSOR_URL: 'sensorUrl',
-  TEMPERATURE_LOG_URL: 'temperatureLogUrl',
-  TEMPERATURE_BREACH_URL: 'temperatureBreachUrl',
   LAST_SYNC: 'lastSync',
   IS_PASSIVE_SYNC_ENABLED: 'isPassiveSyncEnabled',
   IS_INTEGRATING: 'isIntegrating',

android/app/src/main/assets/fonts/MaterialIcons.ttf

@@ -88,18 +88,9 @@
   "CONNECTING": "Setting up sensor..",
   "AGO": "ago",
   "BETWEEN": "between",
-  "LOGIN": "Login",
-  "LOGIN_URL": "Login URL",
-  "EDIT_LOGIN_URL": "Edit login URL",
-  "SENSORS": "Sensors",
-  "SENSOR_URL": "Sensor URL",
-  "EDIT_SENSOR_URL": "Edit sensor URL",
-  "TEMPERATURES": "Temperatures",
-  "TEMPERATURE_URL": "Temperature URL",
-  "EDIT_TEMPERATURE_URL": "Edit temperature URL",
-  "TEMPERATURE_BREACHES": "Temperature Breaches",
-  "TEMPERATURE_BREACHES_URL": "Temperature breaches URL",
-  "EDIT_TEMPERATURE_BREACHES_URL": "Edit temperature breaches URL",
+  "SERVER": "Server",
+  "SERVER_URL": "Server URL",
+  "EDIT_SERVER_URL": "Edit server URL (Enter just the server URL and port, if necessary. e.g. https://demo.msupply.org:8080)",
   "CREDENTIALS": "Store credentials",
   "USERNAME": "Username",
   "EDIT_USERNAME": "Edit username",

package.json

@@ -9,12 +9,9 @@ interface Setting {
 }
 
 const SettingKeys = [
-  'authUrl',
+  'serverUrl',
   'authUsername',
   'authPassword',
-  'sensorUrl',
-  'temperatureLogUrl',
-  'temperatureBreachUrl',
   'lastSync',
   'isPassiveSyncEnabled',
   'isIntegrating',
@@ -24,25 +21,19 @@ const SettingKeys = [
 export type SettingKey = typeof SettingKeys[number];
 
 export enum SettingType {
-  authUrl = 'string',
+  serverUrl = 'string',
   authUsername = 'string',
   authPassword = 'string',
-  sensorUrl = 'string',
-  temperatureLogUrl = 'string',
-  temperatureBreachUrl = 'string',
   lastSync = 'number',
   defaultLogInterval = 'number',
   isPassiveSyncEnabled = 'bool',
   isIntegrating = 'bool',
 }
 
 export interface SettingMap {
-  authUrl: string;
+  serverUrl: string;
   authUsername: string;
   authPassword: string;
-  sensorUrl: string;
-  temperatureLogUrl: string;
-  temperatureBreachUrl: string;
   lastSync: number;
   isPassiveSyncEnabled: boolean;
   isIntegrating: boolean;
@@ -99,13 +90,11 @@ export class SettingManager {
       this.getSetting(key as SettingKey).then(result => ({ key, value: result }))
     );
     const settings = await Promise.all(getSettingPromises);
+
     return settings.reduce((acc, value) => ({ ...acc, [value.key]: value.value }), {
-      authUrl: '',
+      serverUrl: '',
       authUsername: '',
       authPassword: '',
-      sensorUrl: '',
-      temperatureLogUrl: '',
-      temperatureBreachUrl: '',
       lastSync: 0,
       isPassiveSyncEnabled: false,
       isIntegrating: false,
@@ -119,25 +108,13 @@ export class SettingManager {
   };
 
   getSyncSettings = async (): Promise<SyncSettingMap> => {
-    const {
-      authUrl,
-      authUsername,
-      authPassword,
-      sensorUrl,
-      temperatureLogUrl,
-      temperatureBreachUrl,
-      lastSync,
-      isPassiveSyncEnabled,
-      isIntegrating,
-    } = await this.getSettings();
+    const { serverUrl, authUsername, authPassword, lastSync, isPassiveSyncEnabled, isIntegrating } =
+      await this.getSettings();
 
     return {
-      authUrl,
+      serverUrl,
       authUsername,
       authPassword,
-      sensorUrl,
-      temperatureLogUrl,
-      temperatureBreachUrl,
       lastSync,
       isPassiveSyncEnabled,
       isIntegrating,

src/common/constants/Setting.ts

@@ -10,12 +10,9 @@ type SettingStateShape = SettingMap;
 
 const initialState: SettingStateShape = {
   defaultLogInterval: 0,
-  authUrl: '',
+  serverUrl: '',
   authUsername: '',
   authPassword: '',
-  sensorUrl: '',
-  temperatureLogUrl: '',
-  temperatureBreachUrl: '',
   lastSync: 0,
   isPassiveSyncEnabled: false,
   isIntegrating: false,
@@ -73,6 +70,7 @@ const { actions: SettingAction, reducer: SettingReducer } = createSlice({
 const getSettings = (rootState: RootState): SettingStateShape => {
   const { entities } = rootState;
   const { setting } = entities;
+
   return setting;
 };
 
@@ -81,9 +79,9 @@ const getDefaultLogInterval = (rootState: RootState): number => {
   return defaultLogInterval;
 };
 
-const getAuthUrl = (rootState: RootState): string => {
-  const { authUrl } = getSettings(rootState);
-  return authUrl;
+const getServerUrl = (rootState: RootState): string => {
+  const { serverUrl } = getSettings(rootState);
+  return serverUrl;
 };
 
 const getAuthUsername = (rootState: RootState): string | null => {
@@ -96,30 +94,12 @@ const getAuthPassword = (rootState: RootState): string => {
   return authPassword;
 };
 
-const getSensorUrl = (rootState: RootState): string => {
-  const { sensorUrl } = getSettings(rootState);
-  return sensorUrl;
-};
-
-const getTemperatureLogUrl = (rootState: RootState): string => {
-  const { temperatureLogUrl } = getSettings(rootState);
-  return temperatureLogUrl;
-};
-
-const getTemperatureBreachUrl = (rootState: RootState): string => {
-  const { temperatureBreachUrl } = getSettings(rootState);
-  return temperatureBreachUrl;
-};
-
 const SettingSelector = {
   getSettings,
   getDefaultLogInterval,
-  getAuthUrl,
+  getServerUrl,
   getAuthUsername,
   getAuthPassword,
-  getSensorUrl,
-  getTemperatureLogUrl,
-  getTemperatureBreachUrl,
 };
 
 function* fetchAll(): SagaIterator {