Merge branch 'service_rewrite_2023' of https://github.com/e-mission/e…

…-mission-phone into screen-reader

.github/workflows/code-coverage.yml

@@ -0,0 +1,35 @@
+name: code coverage
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  run-codecov:
+    if: github.event.pull_request.draft == false
+    runs-on: macos-latest
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Setup the serve environment
+        shell: bash -l {0}
+        run: |
+          bash setup/setup_serve.sh
+
+      - name: Run Jest tests
+        shell: bash -l {0}
+        run: |
+          source setup/activate_serve.sh
+          npx jest
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./coverage/coverage-final.json
+          flags: unit
+          fail_ci_if_error: ${{ github.repository == 'e-mission/e-mission-phone' }}
+

.github/workflows/prettier.yml

@@ -7,5 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npx prettier --check www
+      - run: npx [email protected] --check www
+
 

.github/workflows/serve-install.yml

@@ -59,18 +59,6 @@ jobs:
         echo "ionic version"
         npx ionic --version
 
-    - name: Run Jest tests
-      shell: bash -l {0}
-      run: |
-        npx jest
-
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      with:
-        files: ./coverage/coverage-final.json
-        flags: unit
-        fail_ci_if_error: ${{ github.repository == 'e-mission/e-mission-phone' }}
-
 # TODO: figure out how to check that a server started correctly
 #    - name: Try starting it
 #      run: npx run serve

.gitignore

@@ -4,6 +4,7 @@
 node_modules/
 platforms/
 plugins/
+dist/
 www/lib/
 package-hooks/
 .DS_Store

.prettierignore

@@ -1,6 +1,5 @@
-# Ignore www/dist, manual_lib, json
+# Ignore www/dist, json
 www/dist
-www/manual_lib
 www/json
 
 # Ignore all HTML files:

jest.config.js

@@ -2,10 +2,10 @@ module.exports = {
   testEnvironment: 'jsdom',
   testPathIgnorePatterns: [
     "/node_modules/",
+    "/dist/",
     "/platforms/",
     "/plugins/",
     "/lib/",
-    "/manual_lib/"
   ],
   preset: 'react-native',
   transform: {

package.cordovabuild.json

@@ -28,7 +28,6 @@
     "@types/luxon": "^3.3.0",
     "@types/react": "^18.2.20",
     "babel-loader": "^9.1.2",
-    "babel-plugin-angularjs-annotate": "^0.10.0",
     "babel-plugin-optional-require": "^0.3.1",
     "concurrently": "^8.0.1",
     "cordova": "^11.1.0",
@@ -106,14 +105,7 @@
     "@react-navigation/native": "^6.1.7",
     "@react-navigation/stack": "^6.3.17",
     "@shopify/flash-list": "^1.3.1",
-    "angular": "1.6.7",
-    "angular-animate": "1.6.7",
-    "angular-local-storage": "^0.7.1",
-    "angular-sanitize": "1.6.7",
-    "angular-simple-logger": "^0.1.7",
-    "angular-translate": "^2.18.1",
-    "angular-translate-loader-static-files": "^2.18.1",
-    "angular-ui-router": "0.2.13",
+    "@types/leaflet": "^1.9.4",
     "animate.css": "^3.5.2",
     "bottleneck": "^2.19.5",
     "chart.js": "^4.3.0",
@@ -145,24 +137,19 @@
     "enketo-transformer": "^4.0.0",
     "fast-xml-parser": "^4.2.2",
     "fs-extra": "^9.0.1",
-    "i18next": "^22.5.0",
+    "humanize-duration": "^3.31.0",
+    "i18next": "^23.7.6",
     "install": "^0.13.0",
-    "ionic-datepicker": "1.2.1",
-    "ionic-toast": "^0.4.1",
-    "jquery": "^3.1.0",
     "klaw-sync": "^6.0.0",
     "leaflet": "^1.9.4",
     "luxon": "^3.3.0",
-    "moment": "^2.29.4",
-    "moment-timezone": "^0.5.43",
-    "ng-i18next": "^1.0.7",
     "npm": "^9.6.3",
     "phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner#v8.1.0",
     "prop-types": "^15.8.1",
     "react": "^18.2.*",
     "react-chartjs-2": "^5.2.0",
     "react-dom": "^18.2.*",
-    "react-i18next": "^12.3.1",
+    "react-i18next": "^13.5.0",
     "react-native-paper": "^5.8.0",
     "react-native-paper-dates": "^0.18.12",
     "react-native-safe-area-context": "^4.6.3",

package.serve.json

@@ -29,7 +29,6 @@
     "@types/react": "^18.2.20",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.2",
-    "babel-plugin-angularjs-annotate": "^0.10.0",
     "babel-plugin-optional-require": "^0.3.1",
     "concurrently": "^8.0.1",
     "cordova": "^11.1.0",
@@ -50,22 +49,15 @@
     "url-loader": "^4.1.1",
     "webpack": "^5.0.1",
     "webpack-cli": "^5.0.1",
-    "prettier": "3.0.3"
+    "prettier": "3.1.0"
   },
   "dependencies": {
     "@messageformat/core": "^3.2.0",
     "@react-navigation/native": "^6.1.7",
     "@react-navigation/stack": "^6.3.17",
     "@shopify/flash-list": "^1.3.1",
     "@types/jest": "^29.5.5",
-    "angular": "1.6.7",
-    "angular-animate": "1.6.7",
-    "angular-local-storage": "^0.7.1",
-    "angular-sanitize": "1.6.7",
-    "angular-simple-logger": "^0.1.7",
-    "angular-translate": "^2.18.1",
-    "angular-translate-loader-static-files": "^2.18.1",
-    "angular-ui-router": "0.2.13",
+    "@types/leaflet": "^1.9.4",
     "animate.css": "^3.5.2",
     "bottleneck": "^2.19.5",
     "chart.js": "^4.3.0",
@@ -76,23 +68,18 @@
     "enketo-transformer": "^4.0.0",
     "fast-xml-parser": "^4.2.2",
     "fs-extra": "^9.0.1",
-    "i18next": "^22.5.0",
+    "humanize-duration": "^3.31.0",
+    "i18next": "^23.7.6",
     "install": "^0.13.0",
-    "ionic-datepicker": "1.2.1",
-    "ionic-toast": "^0.4.1",
-    "jquery": "^3.1.0",
     "klaw-sync": "^6.0.0",
     "leaflet": "^1.9.4",
     "luxon": "^3.3.0",
-    "moment": "^2.29.4",
-    "moment-timezone": "^0.5.43",
-    "ng-i18next": "^1.0.7",
     "npm": "^9.6.3",
     "prop-types": "^15.8.1",
     "react": "^18.2.*",
     "react-chartjs-2": "^5.2.0",
     "react-dom": "^18.2.*",
-    "react-i18next": "^12.3.1",
+    "react-i18next": "^13.5.0",
     "react-native-paper": "^5.8.0",
     "react-native-paper-dates": "^0.18.12",
     "react-native-safe-area-context": "^4.6.3",

setup/setup_ios_native.sh

@@ -7,14 +7,32 @@ source setup/setup_shared.sh
 OSX_MAJOR_VERSION=`sw_vers | grep ProductVersion | cut -d ':' -f 2 | cut -d '.' -f 1`
 echo "Found OSX major version" $OSX_MAJOR_VERSION
 
+# The Homebrew pac-man is installed in different locations, depending on whether the processor
+# is an Intel or Apple Silicone chip.  Intel uses x86_64, Apple chips are amd64, so we can
+# check the chip type using these hardware platforms.
+CHIP_ARC=`uname -m`
+INTEL="x86_64"
+APPLE_SILICONE="arm64"
+WORKING_DIR=""
+
+if [ $CHIP_ARC == $INTEL ]; then
+    echo "Found "$INTEL" chip"
+    WORKING_DIR="/usr/local/"
+else 
+    if [ $CHIP_ARC == $APPLE_SILICONE ]; then
+        echo "Found "$APPLE_SILICONE" chip"
+        WORKING_DIR="/opt/homebrew/"
+    fi
+fi
+
 CURR_RUBY_VERSION=`ruby --version | cut -d ' ' -f 2 | cut -d '.' -f 1-2`
 echo "Found ruby version "$CURR_RUBY_VERSION
 
 if [ $CURR_RUBY_VERSION == $RUBY_VERSION ]; then
     echo "Found ruby version "$CURR_RUBY_VERSION" expected "$RUBY_VERSION" no need to upgrade"
 else
-    if [ -x /usr/local/bin/brew ]; then
-        echo "Found brew installation with version" `/usr/local/bin/brew --version`
+    if [ -x "${WORKING_DIR}/bin/brew" ]; then 
+        echo "Found brew installation with version" ` brew --version`
         echo "Installing ruby version to brew" $RUBY_VERSION
         brew install ruby@$RUBY_VERSION
     else
@@ -32,6 +50,6 @@ echo "Adding $RUBY_PATH to the path before the install"
 export PATH=$RUBY_PATH:$PATH
 
 echo "Installing cocoapods"
-/usr/local/opt/ruby@$RUBY_VERSION/bin/gem install --no-document --user-install cocoapods -v $COCOAPODS_VERSION
+${WORKING_DIR}/opt/ruby@$RUBY_VERSION/bin/gem install --no-document --user-install cocoapods -v $COCOAPODS_VERSION
 
 source setup/setup_shared_native.sh

tsconfig.json

@@ -4,13 +4,15 @@
     "sourceMap": true,
     "module": "es6",
     "target": "es5",
+    "strictNullChecks": true,
     "downlevelIteration": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "jsx": "react",
     "allowJs": true,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "typeRoots": ["node_modules/@types", "www/js/types"],
   },
   "include": ["www/**/*"],
-  "exclude": ["**/www/manual_lib/*", "**/node_modules/*", "**/dist/*"],
+  "exclude": ["**/node_modules/*", "**/dist/*"],
 }

webpack.config.js

@@ -13,7 +13,6 @@ module.exports = {
       {
         test: /\.(scss|css)$/,
         include: [path.resolve(__dirname, 'www/css'),
-                  path.resolve(__dirname, 'www/manual_lib'),
                   path.resolve(__dirname, 'node_modules/enketo-core'),
                   path.resolve(__dirname, 'node_modules/leaflet')],
         use: ['style-loader', 'css-loader', 'sass-loader'],
@@ -57,11 +56,8 @@ module.exports = {
     ],
   },
   plugins: [
-    // to load jQuery and moment globally
+    // to load Leaflet globally
     new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery',
-      moment: 'moment',
       L: 'leaflet',
     }),
     new webpack.DefinePlugin({

webpack.prod.js

@@ -7,23 +7,6 @@ module.exports = merge(common, {
   devtool: 'source-map',
   module: {
     rules: [
-      /* In production, Webpack minifies JS files and randomizes variable names.
-          This causes problems with AngularJS unless you use explicit annotations,
-          which we don't.
-          https://docs.angularjs.org/error/$injector/strictdi
-          (The syntax we use is like the 'bad' example: implicit annotations)
-          So rather than change every file in our codebase, I'm adding this
-          babel plugin which basically preprocesses our 'bad' code into 'good' code.
-        Only needed on production because minification doesn't happen on dev. */
-      {
-        test: /\.(js)$/,
-        include: path.resolve(__dirname, 'www'),
-        loader: 'babel-loader',
-        options: {
-          presets: ['@babel/preset-env'],
-          plugins: ["angularjs-annotate"],
-        },
-      },
       {
         test: /\.(js|jsx|ts|tsx)$/,
         loader: 'babel-loader',