Add Harness.loadContactForm method

.vscode/launch.json

@@ -10,7 +10,7 @@
       "name": "Build Assets (test collateral)",
       "program": "${workspaceFolder}/project-explorer/build-assets.js",
       "args": [
-        "--appSettingPath=${workspaceFolder}/test/collateral/project-without-source",
+        "--path=${workspaceFolder}/test/collateral/project-without-source",
         "--formPath=${workspaceFolder}/test/collateral"
       ]
     },

all-chts-bundle.js

@@ -1,60 +1,15 @@
 
 module.exports = {
-  '3.9': {
-    ddocs: require('./build/cht-core-3-9-ddocs.json'),
-    RegistrationUtils: require('cht-core-3-9/shared-libs/registration-utils'),
-    CalendarInterval: require('cht-core-3-9/shared-libs/calendar-interval'),
-    RulesEngineCore: require('cht-core-3-9/shared-libs/rules-engine'),
-    RulesEmitter: require('cht-core-3-9/shared-libs/rules-engine/src/rules-emitter'),
-    nootils: require('cht-core-3-9/shared-libs/rules-engine/node_modules/medic-nootils'),
-    Lineage: require('cht-core-3-9/shared-libs/lineage'),
-  },
-  '3.10': {
-    ddocs: require('./build/cht-core-3-10-ddocs.json'),
-    RegistrationUtils: require('cht-core-3-10/shared-libs/registration-utils'),
-    CalendarInterval: require('cht-core-3-10/shared-libs/calendar-interval'),
-    RulesEngineCore: require('cht-core-3-10/shared-libs/rules-engine'),
-    RulesEmitter: require('cht-core-3-10/shared-libs/rules-engine/src/rules-emitter'),
-    nootils: require('cht-core-3-10/shared-libs/rules-engine/node_modules/medic-nootils'),
-    Lineage: require('cht-core-3-10/shared-libs/lineage'),
-  },
-  '3.11': {
-    ddocs: require('./build/cht-core-3-11-ddocs.json'),
-    RegistrationUtils: require('cht-core-3-11/shared-libs/registration-utils'),
-    CalendarInterval: require('cht-core-3-11/shared-libs/calendar-interval'),
-    RulesEngineCore: require('cht-core-3-11/shared-libs/rules-engine'),
-    RulesEmitter: require('cht-core-3-11/shared-libs/rules-engine/src/rules-emitter'),
-    nootils: require('cht-core-3-11/shared-libs/rules-engine/node_modules/medic-nootils'),
-    Lineage: require('cht-core-3-11/shared-libs/lineage'),
-  },
-  '3.12': {
-    ddocs: require('./build/cht-core-3-12-ddocs.json'),
-    RegistrationUtils: require('cht-core-3-12/shared-libs/registration-utils'),
-    CalendarInterval: require('cht-core-3-12/shared-libs/calendar-interval'),
-    RulesEngineCore: require('cht-core-3-12/shared-libs/rules-engine'),
-    RulesEmitter: require('cht-core-3-12/shared-libs/rules-engine/src/rules-emitter'),
-    nootils: require('cht-core-3-12/shared-libs/rules-engine/node_modules/medic-nootils'),
-    Lineage: require('cht-core-3-12/shared-libs/lineage'),
-    ChtScriptApi: require('cht-core-3-12/shared-libs/cht-script-api'),
-  },
-  '3.13': {
-    ddocs: require('./build/cht-core-3-13-ddocs.json'),
-    RegistrationUtils: require('cht-core-3-13/shared-libs/registration-utils'),
-    CalendarInterval: require('cht-core-3-13/shared-libs/calendar-interval'),
-    RulesEngineCore: require('cht-core-3-13/shared-libs/rules-engine'),
-    RulesEmitter: require('cht-core-3-13/shared-libs/rules-engine/src/rules-emitter'),
-    nootils: require('cht-core-3-13/shared-libs/rules-engine/node_modules/medic-nootils'),
-    Lineage: require('cht-core-3-13/shared-libs/lineage'),
-    ChtScriptApi: require('cht-core-3-13/shared-libs/cht-script-api'),
+  '4.0': {
+    ddocs: require('./build/cht-core-4-0-ddocs.json'),
+    RegistrationUtils: require('cht-core-4-0/shared-libs/registration-utils'),
+    CalendarInterval: require('cht-core-4-0/shared-libs/calendar-interval'),
+    RulesEngineCore: require('cht-core-4-0/shared-libs/rules-engine'),
+    RulesEmitter: require('cht-core-4-0/shared-libs/rules-engine/src/rules-emitter'),
+    nootils: require('cht-core-4-0/shared-libs/rules-engine/node_modules/cht-nootils'),
+    Lineage: require('cht-core-4-0/shared-libs/lineage'),
+    ChtScriptApi: require('cht-core-4-0/shared-libs/cht-script-api'),
+
+    convertFormXmlToXFormModel: require('cht-core-4-0/api/src/services/generate-xform.js').generate,
   },
-  '3.14': {
-    ddocs: require('./build/cht-core-3-14-ddocs.json'),
-    RegistrationUtils: require('cht-core-3-14/shared-libs/registration-utils'),
-    CalendarInterval: require('cht-core-3-14/shared-libs/calendar-interval'),
-    RulesEngineCore: require('cht-core-3-14/shared-libs/rules-engine'),
-    RulesEmitter: require('cht-core-3-14/shared-libs/rules-engine/src/rules-emitter'),
-    nootils: require('cht-core-3-14/shared-libs/rules-engine/node_modules/cht-nootils'),
-    Lineage: require('cht-core-3-14/shared-libs/lineage'),
-    ChtScriptApi: require('cht-core-3-14/shared-libs/cht-script-api'),
-  }
 };

build.sh

@@ -12,17 +12,30 @@ trap exit_on_error EXIT
 
 npm ci
 rm -Rf dist build
-rm -Rf node_modules/enketo-core/node_modules/
-patch -f node_modules/enketo-core/src/js/Form.js < node_modules/cht-core-3-13/webapp/patches/enketo-inputs-always-relevant.patch
-patch -f node_modules/enketo-core/src/js/page.js < patches/enketo-handle-no-active-pages.patch
 node ./compile-ddocs.js
 
 dirs=($(find node_modules/cht-* -maxdepth 0 -type d))
 for dir in "${dirs[@]}"; do
-  (cd "$dir"/shared-libs/rules-engine && npm ci --production)
+  (cd "$dir"/webapp && npm ci --production)
+  (cd "$dir"/api && npm ci --production)
+  (cd "$dir"/shared-libs/rules-engine && npm ci)
+  (cd "$dir"/shared-libs/phone-number && npm ci --production)
+
+  # patch the daterangepicker for responsiveness
+  # https://github.com/dangrossman/bootstrap-daterangepicker/pull/437
+  (cd "$dir" && patch -f webapp/node_modules/bootstrap-daterangepicker/daterangepicker.js < webapp/patches/bootstrap-daterangepicker.patch)
+
+  # patch enketo to always mark the /inputs group as relevant
+  (cd "$dir" && patch -f webapp/node_modules/enketo-core/src/js/form.js < webapp/patches/enketo-inputs-always-relevant_form.patch)
+  (cd "$dir" && patch -f webapp/node_modules/enketo-core/src/js/relevant.js < webapp/patches/enketo-inputs-always-relevant_relevant.patch)
+
+  # patch enketo to fix repeat name collision bug - this should be removed when upgrading to a new version of enketo-core
+  # https://github.com/enketo/enketo-core/issues/815
+  (cd "$dir" && patch -f webapp/node_modules/enketo-core/src/js/calculate.js < webapp/patches/enketo-repeat-name-collision.patch)
+
+  # patch messageformat to add a default plural function for languages not yet supported by make-plural #5705
+  (cd "$dir" && patch -f webapp/node_modules/messageformat/lib/plurals.js < webapp/patches/messageformat-default-plurals.patch)
 done
 
 npx webpack
-cp ext/inbox.css dist
-
-printf "\033[0;32m== BUILD SUCCESSFUL ==\n"
+printf "\033[0;32m== BUILD SUCCESSFUL ==\n"