Merge branch 'develop'

Author: mark-prins

.gitignore

@@ -1,2 +1,7 @@
 .DS_Store
+# common location for local config file containing connection credentials
+server/report_builder/config.yaml
 .vscode/*
+
+# Temp export files
+server/data

README.md

@@ -1,7 +1,7 @@
 # Open mSupply
 
 This is the home of an open source version of the popular [mSupply](https://msupply.org.nz/) - providing pharmaceutical supply chain management and dispensing, all the way from national warehouses to remote clinics, on servers, laptops and mobile.
-Used in over 30 countries and for over 20 years and now becoming open source.
+Used in over 30 countries and for over 20 years and now becoming open source software.
 
 The code is separated into two main areas, the client and server:
 

build/windows/omsupply-build.bat

@@ -13,10 +13,20 @@ xcopy "build\windows\*.*" "omSupply" /c
 xcopy "build\windows\demo" "omSupply\demo" /c /y /i
 copy "version.txt" "omSupply\version.txt"
 
-@cd "build\windows"
-start /b /wait omsupply-prepare.bat
-start /b /wait omsupply-sqlite-build.bat
-start /b /wait omsupply-postgres-build.bat
-start /b /wait omsupply-desktop-build.bat
-cd "..\..\server"
-start /wait cargo build --release && copy "target\release\remote_server.exe" "..\omSupply\Server\omSupply-server-sqlite.exe"
+start /wait /b build\windows\omsupply-prepare.bat
+@if %errorlevel% neq 0 exit /b %errorlevel%
+
+@ECHO ##### Building omsupply for the sqlite #####
+cd "server" && cargo build --release --bin omsupply_service && copy "target\release\omsupply_service.exe" "..\omSupply\Server\omSupply-sqlite.exe"
+@if %errorlevel% neq 0 exit /b %errorlevel%
+
+@ECHO ##### Building omsupply for the postgres #####
+cd "server" && cargo build --release --bin omsupply_service --features postgres && copy "target\release\omsupply_service.exe" "..\omSupply\Server\omSupply-postgres.exe"
+@if %errorlevel% neq 0 exit /b %errorlevel%
+
+@ECHO ##### Building omSupply for the desktop #####
+cd "client" && yarn electron:build && xcopy "packages\electron\out\open mSupply-win32-x64\**" "..\omSupply\Desktop\" /e /h /c /i
+@if %errorlevel% neq 0 exit /b %errorlevel%
+
+cd "server" && cargo build --release && copy "target\release\remote_server.exe" "..\omSupply\Server\omSupply-server-sqlite.exe"
+@if %errorlevel% neq 0 exit /b %errorlevel%

build/windows/omsupply-desktop-build.bat

@@ -1,2 +1,3 @@
-@ECHO ##### Prepare omsupply build #####
-cd "..\..\client" && yarn install --force --frozen-lockfile && yarn build
+ECHO ##### Prepare omsupply build #####
+cd "client" && yarn install --force --frozen-lockfile && yarn build
+if %errorlevel% neq 0 exit /b %errorlevel%

build/windows/omsupply-postgres-build.bat

@@ -30,10 +30,17 @@ module.exports = {
   plugins: ['react', , '@typescript-eslint'],
   rules: {
     camelcase: ['error', { allow: ['_ONLY_FOR_TESTING'] }],
-    'require-jsdoc': 0,
+    'require-jsdoc': 'off',
+    'valid-jsdoc': 'off',
     'react/display-name': 'off',
     'no-unused-vars': 'off',
-    '@typescript-eslint/no-unused-vars': 'error',
+    '@typescript-eslint/no-unused-vars': [
+      'error',
+      {
+        argsIgnorePattern: '^_',
+        caughtErrorsIgnorePattern: '^_',
+      },
+    ],
     'react/prop-types': 'off',
     '@typescript-eslint/no-empty-function': 'off',
     'spaced-comment': [

build/windows/omsupply-prepare.bat

@@ -72,6 +72,7 @@ client
 │  ├─ host
 │  ├─ inventory
 │  ├─ invoices
+│  ├─ programs
 │  ├─ requisitions
 │  └─ system
 ```
@@ -174,7 +175,6 @@ and you will see the keys being referenced in other hooks, like so:
   useQuery(api.keys.paramList(queryParams), ...
 ```
 
-
 where the file `hooks/index.ts` has something like this in it:
 
 ```

build/windows/omsupply-sqlite-build.bat

@@ -1,5 +1,8 @@
 {
   "version": "0.0.0",
   "npmClient": "yarn",
-  "useWorkspaces": true
+  "useWorkspaces": true,
+  "packages": [
+    "packages/*"
+  ]
 }

client/.eslintrc.js

@@ -13,12 +13,12 @@
     "serve": "lerna run --scope @openmsupply-client/* --parallel serve",
     "clean": "lerna run --scope @openmsupply-client/* --parallel clean",
     "compile": "lerna run --scope @openmsupply-client/* --parallel tsc --since HEAD -- --noEmit",
+    "compile-full": "lerna run --scope @openmsupply-client/* --parallel tsc",
     "prepare": "cd .. && husky install client/.husky",
     "pre-commit-lint": "yarn compile && yarn lint-staged",
     "test": "jest --config ./jest.config.js --maxWorkers=50% --env=jsdom",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build",
-    "//": "The sed command here is a temporary workaround to fix an issue in graphql-codegen",
     "generate": "cd ../server && cargo run --bin remote_server_cli -- export-graphql-schema && cd ../client && graphql-codegen --config codegen.yml",
     "android:run": "npx cap run android",
     "android:build:server": "yarn build && lerna run --scope @openmsupply-client/android build:server --stream",

client/README.md

@@ -1,9 +1,9 @@
 # Mobile App with Discovery
 
 The Android app can run as standalone site with a local server, as a client connecting to another server or as a server for other clients.
-On android, the server always starts and this allows for one mobile app for both client and client/server. 
-The mobile app will broadcast via dns sd and will be reachable by both Mobile and Electron clients on the local network. 
-We are using Capacitor to make use of existing optimisations and large library of native plugins. 
+On android, the server always starts and this allows for one mobile app for both client and client/server.
+The mobile app will broadcast via dns sd and will be reachable by both Mobile and Electron clients on the local network.
+We are using Capacitor to make use of existing optimisations and large library of native plugins.
 UI is not bundled within Capacitor, it is served by the server the client connect to, and discovery UI is always served by local bundled server.
 
 ## Getting started
@@ -18,7 +18,7 @@ Next step is to open this directory in Android Studio, this will engage gradle s
 
 It's recommended to use Android Studio for debugging and running Android App, there is a lot of functionality that cannot be replicated in Visual Studio Code (although there are some extensions for Visual Studio Code they are quite limited).
 
-Debugging native code is straight forward, breakpoint in Android Studio and press debug. 
+Debugging native code is straight forward, breakpoint in Android Studio and press debug.
 
 Debugging web app code is done by opening `chrome://inspect`, you should see Web View when app is running in emulator. When bundled is served from remote server (default setup), js bundle is minimised and this makes debugging very hard, however we can run the bundle from webpack server by commenting out plugins section in `capacitor.config.ts` and entering your local ip in the debugUrl field and running `yarn apply-config`. Please make sure that you start front end server with `yarn start-local` from 'client' directory for this to work.
 
@@ -28,7 +28,7 @@ When running the Android app in an emulator the service discovery will not work
 
 ## Scripts
 
-The following scripts are available 
+The following scripts are available
 
 ```bash
 # Builds remote server binaries for android and copies them to android package
@@ -41,7 +41,7 @@ yarn build:release
 yarn apply-config
 ```
 
-As per earlier comment, please make sure to build front end with `yarn build` from client directory prior to runner the above or run `yarn android:{command here}` from client directory to do both with one command. 
+As per earlier comment, please make sure to build front end with `yarn build` from client directory prior to runner the above or run `yarn android:{command here}` from client directory to do both with one command.
 
 ### Know script issues
 
@@ -81,10 +81,10 @@ A few configuration/modifications were made to make sure we can serve Android bu
 
 1. capacitor.config.ts (see comment in that file)
 2. Capacitor `proxies` inject some pre-requisite <scripts> into the target webpage.
-Since the mSupply servers uses self signed certs, fetching the target webpage fails and the pre-requisite scripts are not inserted.
-For this reason `ExtendedWebViewClient` was created to manually inject the required <script> tags.
-[Discussion](https://github.com/ionic-team/capacitor/discussions/6166) was made on capacitor github to see if there is another way to overcome this.
-3. Base url is loaded manually in `handleOnStart()` method in `NativeApi.java` 
+   Since the mSupply servers uses self signed certs, fetching the target webpage fails and the pre-requisite scripts are not inserted.
+   For this reason `ExtendedWebViewClient` was created to manually inject the required <script> tags.
+   [Discussion](https://github.com/ionic-team/capacitor/discussions/6166) was made on capacitor github to see if there is another way to overcome this.
+3. Base url is loaded manually in `handleOnStart()` method in `NativeApi.java`
 
 ## Extra
 
@@ -96,11 +96,11 @@ The cert plugin (`app/src/main/java/org/openmsupply/client/certplugin/CertPlugin
 
 Capacitor comes with cli, we mainly use `npx cap copy` (or `yarn apply-config`), this moves bundled assets to app/src/main/assets/public. Usually capacitor would bundle web app within the APK, since we are serving front end bundle with server we don't need to move them (you will not that in capacitor.config.ts `webDir` is pointed to a non-existant directory). Capacitor also moves pre requisites to cordova plugins to that folder, which is automatically injected into served `html`. Another task of `npx cap copy` is to copy configuration files `capacitor.config.ts` is translated to JSON file and moved to app/src/main/assets
 
-`app/src/main/assets/public` directory is typically not committed, but since it's only going to have cordova artifacts, it is in our case (to reduce setup). 
+`app/src/main/assets/public` directory is typically not committed, but since it's only going to have cordova artifacts, it is in our case (to reduce setup).
 
 `npx cap copy` or `yarn apply-config` should only be run when cordova plugins are added or updated or when updating capacitor.config.ts
 
-When adding plugins - add them to the android package; if they are not here, then `npx cap sync` does not detect them. You should see 
+When adding plugins - add them to the android package; if they are not here, then `npx cap sync` does not detect them. You should see
 
 ```
 ✔ Updating Android plugins in 2.09ms
@@ -111,24 +111,30 @@ When adding plugins - add them to the android package; if they are not here, the
 [info] Found 1 Cordova plugin for android:
        [email protected]
 ```
-
+       
 with the new plugin showing up under the Cordova or Capacitor plugins sections.
+Also, add the plugin to `onPageStarted` in `ExtendedWebViewClient` - see the other plugins for details.
 If you require the plugin to be used in other packages, then you can also install in the root, or in individual packages, to make it available for use elsewhere.
 
 You can check the plugins using `npx cap ls` or the configuration generally with `npx cap doctor`
 
-If you are having gradle issues, open the project (packages/android folder) in Android Studio and then click on the "Sync Project with Gradle Files" button in the top right of Android Studio (the icon looks like an elephant). 
+If you are having gradle issues, open the project (packages/android folder) in Android Studio and then click on the "Sync Project with Gradle Files" button in the top right of Android Studio (the icon looks like an elephant).
 
 ## Self signed cert SSL security
 
 To avoid an error being thrown by the native web view when the server certificate is self-signed, we override the web view certificate error listener and allow connection when:
-* In debug mode
-* The connection is local after verifying the certificate against the local `cert.pem` file : this is for discovery or when connecting to a local server
-*The stored SSL fingerprint matches the server fingerprint
 
-For the above to work we store the SSL fingerprint when we first connect to the server and then check that fingerprint on consecutive connections. 
+- In debug mode
+- The connection is local after verifying the certificate against the local `cert.pem` file : this is for discovery or when connecting to a local server
+  \*The stored SSL fingerprint matches the server fingerprint
+
+For the above to work we store the SSL fingerprint when we first connect to the server and then check that fingerprint on consecutive connections.
 The SSL fingerprint is stored in app data and is associated with the `hardwareId` and `port` of the server.
 This works very similar to ssh client, but we associate fingerprint with hardwareId and port instead of domain or ip since local ip can change for the server.
 
 App data would need to be cleared if the local certificate was changed.
 
+## Log files on Android
+
+Go to `browse files` in device manager, then navigate to `data/org.openmsupply.client/files/(log_name).log` to view log, logs that have exceeded the max file size is compressed and saved as a `.gz` zip.
+Alternatively when using an emulator, navigate to `data/user/0/org.openmsupply.client/files/(log_name).log`.

client/lerna.json

@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-barcode-scanner')
     implementation project(':capacitor-community-keep-awake')
+    implementation project(':capacitor-app')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-preferences')
     implementation "com.android.support:support-v4:28.+"

client/package.json

@@ -7,6 +7,10 @@
     "pkg": "@capacitor-community/keep-awake",
     "classpath": "com.getcapacitor.community.keepawake.KeepAwakePlugin"
   },
+  {
+    "pkg": "@capacitor/app",
+    "classpath": "com.capacitorjs.plugins.app.AppPlugin"
+  },
   {
     "pkg": "@capacitor/keyboard",
     "classpath": "com.capacitorjs.plugins.keyboard.KeyboardPlugin"

client/packages/android/README.MD

@@ -39,7 +39,8 @@ public void onPageStarted(WebView webView,
             bridge.getPlugin("WebView"),
             bridge.getPlugin("BarcodeScanner"),
             bridge.getPlugin("Preferences"),
-            bridge.getPlugin("KeepAwake")
+            bridge.getPlugin("KeepAwake"),
+            bridge.getPlugin("App")
         );
 
         try {

client/packages/android/app/capacitor.build.gradle

@@ -282,7 +282,7 @@ public void connectToServer(PluginCall call) throws MalformedURLException {
                 response.put("success", true);
             } else {
                 response.put("success", false);
-                response.put("error", "Connecting to server: response code="+ status);
+                response.put("error", "Connecting to server: response code=" + status);
             }
         } catch (SSLHandshakeException e) {
             // server is running and responding with an SSL error
@@ -383,6 +383,7 @@ private void addLocalServerToDiscovery() {
         }
     }
 
+
     private String parseAttribute(NsdServiceInfo serviceInfo, String name) {
         byte[] attributeBytes = serviceInfo.getAttributes().get(name);
         if (attributeBytes == null) {
@@ -469,7 +470,7 @@ public void saveFile(@NonNull PluginCall call) {
         /** Helper class to get access to the JS FrontEndHost data */
     public class FrontEndHost {
         JSObject data;
-        
+
         public FrontEndHost(JSObject data) {
             this.data = data;
         }
@@ -491,7 +492,7 @@ public String getConnectionUrl() {
             if (data.getString("path") != null) {
                 path = "/" + data.getString("path");
             }
-            return getUrl()  + path;
+            return getUrl() + path;
         }
 
         public boolean isLocal() {

client/packages/android/app/src/main/assets/capacitor.plugins.json

@@ -8,6 +8,9 @@ project(':capacitor-community-barcode-scanner').projectDir = new File('../../nod
 include ':capacitor-community-keep-awake'
 project(':capacitor-community-keep-awake').projectDir = new File('../../node_modules/@capacitor-community/keep-awake/android')
 
+include ':capacitor-app'
+project(':capacitor-app').projectDir = new File('../../node_modules/@capacitor/app/android')
+
 include ':capacitor-keyboard'
 project(':capacitor-keyboard').projectDir = new File('../../node_modules/@capacitor/keyboard/android')
 

client/packages/android/app/src/main/java/org/openmsupply/client/ExtendedWebViewClient.java

@@ -4,6 +4,8 @@
   "private": true,
   "devDependencies": {
     "@capacitor-community/barcode-scanner": "^3.0.3",
+    "@capacitor-community/keep-awake": "^3.0.0",
+    "@capacitor/app": "^4.1.1",
     "@capacitor/cli": "^4.7.1",
     "@capacitor/keyboard": "^4.1.1",
     "@capacitor/preferences": "^4.0.2",

client/packages/android/app/src/main/java/org/openmsupply/client/NativeApi.java

@@ -13,11 +13,14 @@
   "dependencies": {
     "@bugsnag/js": "^7.14.1",
     "@capacitor-community/barcode-scanner": "^3.0.3",
+    "@capacitor/app": "^4.1.1",
+    "@capacitor/core": "^4.7.0",
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
     "@mui/lab": "^5.0.0-alpha.59",
     "@mui/material": "^5.11.13",
     "@openmsupply-client/config": "^0.0.0",
+    "autosuggest-highlight": "^3.3.4",
     "currency.js": "^2.0.4",
     "date-fns": "^2.27.0",
     "dompurify": "^3.0.1",
@@ -48,6 +51,7 @@
     "zustand": "^4.3.6"
   },
   "devDependencies": {
+    "@types/autosuggest-highlight": "^3.2.0",
     "@types/css-mediaquery": "^0.1.1",
     "@types/dompurify": "^3.0.0",
     "@types/js-cookie": "^3.0.1",

client/packages/android/capacitor.settings.gradle

@@ -1,4 +1,4 @@
-import { IntlUtils } from '@common/intl';
+import { useIntlUtils } from '@common/intl';
 import { AuthCookie, AuthError, setAuthCookie } from '../../AuthContext';
 import { useGetAuthToken } from './useGetAuthToken';
 import {
@@ -10,7 +10,7 @@ import {
   useLocalStorage,
   useQueryClient,
 } from '@openmsupply-client/common';
-import { UserNode } from '@common/types';
+import { LanguageType, UserNode } from '@common/types';
 
 import { DefinitionNode, DocumentNode, OperationDefinitionNode } from 'graphql';
 
@@ -43,7 +43,7 @@ export const useLogin = (
   setCookie: React.Dispatch<React.SetStateAction<AuthCookie | undefined>>
 ) => {
   const { mutateAsync, isLoading: isLoggingIn } = useGetAuthToken();
-  const changeLanguage = IntlUtils.useChangeLanguage();
+  const { changeLanguage, getLocaleCode, getUserLocale } = useIntlUtils();
   const { setHeader, setSkipRequest } = useGql();
   const { mutateAsync: getUserDetails } = useGetUserDetails();
   const queryClient = useQueryClient();
@@ -119,9 +119,9 @@ export const useLogin = (
       },
     };
 
-    const userLocale = IntlUtils.getUserLocale(username);
+    const userLocale = getUserLocale(username);
     if (userLocale === undefined) {
-      changeLanguage(userDetails?.language);
+      changeLanguage(getLocaleCode(userDetails?.language as LanguageType));
     }
     setMRUCredentials({ username, store });
     setAuthCookie(authCookie);