Merge branch 'service_rewrite_2023' into metrics-services-rewrite

jest.config.js

@@ -12,9 +12,10 @@ module.exports = {
     "^.+\\.(ts|tsx|js|jsx)$": "babel-jest"
   },
   transformIgnorePatterns: [
-    "node_modules/(?!((jest-)?react-native(-.*)?|@react-native(-community)?)/)"
+    "node_modules/(?!((enketo-transformer/dist/enketo-transformer/web)|(jest-)?react-native(-.*)?|@react-native(-community)?)/)",
   ],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   moduleDirectories: ["node_modules", "src"],
+  globals: {"__DEV__": false},
   collectCoverage: true,
 };

package.cordovabuild.json

@@ -102,6 +102,7 @@
   },
   "dependencies": {
     "@havesource/cordova-plugin-push": "git+https://github.com/havesource/cordova-plugin-push.git#4.0.0-dev.0",
+    "@messageformat/core": "^3.2.0",
     "@react-navigation/native": "^6.1.7",
     "@react-navigation/stack": "^6.3.17",
     "@shopify/flash-list": "^1.3.1",
@@ -141,6 +142,7 @@
     "cordova-plugin-x-socialsharing": "6.0.4",
     "core-js": "^2.5.7",
     "enketo-core": "^6.1.7",
+    "enketo-transformer": "^4.0.0",
     "fast-xml-parser": "^4.2.2",
     "fs-extra": "^9.0.1",
     "i18next": "^22.5.0",
@@ -151,7 +153,6 @@
     "klaw-sync": "^6.0.0",
     "leaflet": "^1.9.4",
     "luxon": "^3.3.0",
-    "messageformat": "^2.3.0",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
     "ng-i18next": "^1.0.7",

package.serve.json

@@ -53,6 +53,7 @@
     "prettier": "3.0.3"
   },
   "dependencies": {
+    "@messageformat/core": "^3.2.0",
     "@react-navigation/native": "^6.1.7",
     "@react-navigation/stack": "^6.3.17",
     "@shopify/flash-list": "^1.3.1",
@@ -72,6 +73,7 @@
     "chartjs-plugin-annotation": "^3.0.1",
     "core-js": "^2.5.7",
     "enketo-core": "^6.1.7",
+    "enketo-transformer": "^4.0.0",
     "fast-xml-parser": "^4.2.2",
     "fs-extra": "^9.0.1",
     "i18next": "^22.5.0",
@@ -82,7 +84,6 @@
     "klaw-sync": "^6.0.0",
     "leaflet": "^1.9.4",
     "luxon": "^3.3.0",
-    "messageformat": "^2.3.0",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
     "ng-i18next": "^1.0.7",

webpack.config.js

@@ -79,7 +79,12 @@ module.exports = {
       /* Enketo expects its per-app configuration to be available as 'enketo-config',
         so we have to alias it here.
       https://github.com/enketo/enketo-core#global-configuration */
-      'enketo/config': path.resolve(__dirname, 'www/js/config/enketo-config')
+      'enketo/config': path.resolve(__dirname, 'www/js/config/enketo-config'),
+      /* enketo-transformer has 'libxslt' as an optional peer dependency.
+        We don't need it since we are only doing client-side transformations via
+          enketo-transformer/web (https://github.com/enketo/enketo-transformer#web).
+        So, we can tell webpack it's ok to ignore libxslt by aliasing it to false. */
+      'libxslt': false,
     },
     extensions: ['.web.js', '.jsx', '.tsx', '.ts', '.js'],
   },

www/__mocks__/cordovaMocks.ts

@@ -35,7 +35,7 @@ export const mockFile = () => {
 //for consent document
 const _storage = {};
 
-export const mockBEMUserCache = () => {
+export const mockBEMUserCache = (config?) => {
   const _cache = {};
   const messages = [];
   const mockBEMUserCache = {
@@ -101,13 +101,11 @@ export const mockBEMUserCache = () => {
       );
     },
     getDocument: (key: string, withMetadata?: boolean) => {
-      // this was mocked specifically for enketoHelper's use, could be expanded if needed
-      const fakeSurveyConfig = fakeConfig;
-
+      //returns the config provided as a paramenter to this mock!
       if (key == 'config/app_ui_config') {
         return new Promise<any>((rs, rj) =>
           setTimeout(() => {
-            rs(fakeSurveyConfig);
+            rs(config || fakeConfig);
           }, 100),
         );
       } else {
@@ -129,6 +127,20 @@ export const mockBEMUserCache = () => {
         return false;
       }
     },
+    getAllTimeQuery: () => {
+      return { key: 'write_ts', startTs: 0, endTs: Date.now() / 1000 };
+    },
+    getSensorDataForInterval: (key, tq, withMetadata) => {
+      if (key == `manual/demographic_survey`) {
+        return new Promise<any>((rs, rj) =>
+          setTimeout(() => {
+            rs({ metadata: { write_ts: '1699897723' }, data: 'completed', time: '01/01/2001' });
+          }, 100),
+        );
+      } else {
+        return undefined;
+      }
+    },
   };
   window['cordova'] ||= {};
   window['cordova'].plugins ||= {};

www/__mocks__/messageFormatMocks.ts

@@ -0,0 +1,29 @@
+//call signature MessageFormat.compile(templage)(vars);
+//in - template an vars -- {... pca: 0, ...}
+//out - 1 Personal Care,
+
+export default class MessageFormat {
+  constructor(locale: string) {}
+
+  compile(message: string) {
+    return (vars: {}) => {
+      let label = '';
+      const brokenList = message.split('}{');
+      console.log(brokenList);
+
+      for (let key in vars) {
+        brokenList.forEach((item) => {
+          let brokenItem = item.split(',');
+          if (brokenItem[0] == key) {
+            let getLabel = brokenItem[2].split('#');
+            console.log(getLabel);
+            label = vars[key] + ' ' + getLabel[1];
+            return label;
+          }
+        });
+      }
+    };
+  }
+}
+
+exports.MessageFormat = MessageFormat;