OC customizations after December 1st, 2023

.eslintignore

@@ -15,3 +15,4 @@
 
 /packages/enketo-express/public/js/build/*
 /packages/enketo-express/**/offline-app-worker-partial.js
+/packages/enketo-express/test/client/forms/forms.js

.eslintrc.json

@@ -532,7 +532,8 @@
                     "files": [
                         "packages/enketo-express/public/**/*",
                         "packages/enketo-express/app/views/**/*.js",
-                        "packages/enketo-express/test/client/**/*.js"
+                        "packages/enketo-express/test/client/**/*.js",
+                        "packages/enketo-express/widget/**/*"
                     ],
 
                     "env": { "browser": true }

.gitignore

@@ -77,6 +77,7 @@ Thumbs.db
 /.benchmarks.md
 /examples/*/.benchmarks.md
 /packages/*/.benchmarks.md
+/packages/enketo-express/chromium-cache/*
 
 # -----------------------------------------------------------------------------
 # 5.4. Tooling - build artifacts

README.md

@@ -1,6 +1,6 @@
 # Enketo
 
-This is the Enketo web forms monorepo. Enketo is an open source project that produces web form software for the [ODK ecosystem](https://getodk.org).
+This is the OpenClinica fork of the Enketo web forms monorepo. Enketo is an open source project that produces web form software for the [ODK ecosystem](https://getodk.org).
 
 ## Packages
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "enketo",
-    "description": "Enketo Web Forms",
-    "repository": "https://github.com/enketo/enketo",
+    "description": "Enketo Web Forms Fork for OpenClinica",
+    "repository": "https://github.com/OpenClinica/enketo-oc",
     "private": true,
     "workspaces": {
         "packages": [
@@ -92,10 +92,10 @@
         "sinon-chai": "^3.7.0",
         "time-grunt": "^2.0.0",
         "typescript": "^5.2.2",
-        "vite": "^4.4.9",
-        "vite-node": "^0.34.3",
+        "vite": "^4.5.2",
+        "vite-node": "^0.34.7",
         "vite-plugin-node": "^3.0.2",
-        "vitest": "^0.34.3",
+        "vitest": "^0.34.6",
         "webpack": "^5.88.2"
     },
     "resolutions": {

packages/enketo-core/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.1.0] - 2024-01-25
+
+-   Fix: "for" attribute throws off ability to open to the right page upon load (#1286)
+-   Revert change from v7.2.0 to preserve high resolution annotated images (#1292)
+
 ## [8.0.0] - 2023-10-30
 
 -   Breaking change: in the move to a monorepo, some paths in Sass styles have been updated to reflect the new file structure. The impact should be minimal, but custom themes may need to be updated. Generally, paths which cross package boundaries (i.e. imports from Enketo Express to styles in Enketo Core, or imports of third party styles from NPM packages) should use absolute paths from the monorepo root. You may refer to existing theme styles for examples.

packages/enketo-core/package.json

@@ -2,7 +2,7 @@
     "name": "enketo-core",
     "description": "Extensible Enketo form engine",
     "homepage": "https://enketo.org",
-    "version": "8.0.0",
+    "version": "8.1.0",
     "license": "Apache-2.0",
     "os": [
         "darwin",
@@ -18,23 +18,13 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/enketo/enketo-core"
+        "url": "https://github.com/enketo/enketo"
     },
-    "author": {
-        "name": "Martijn van de Rijdt",
-        "email": "[email protected]",
-        "url": "https://www.linkedin.com/in/martijnvanderijdt"
-    },
-    "contributors": [
-        {
-            "name": "Alex Anderson"
-        }
-    ],
     "files": [
         "src/",
         "config.js"
     ],
-    "bugs": "https://github.com/enketo/enketo-core/issues",
+    "bugs": "https://github.com/enketo/enketo/issues",
     "main": "src/js/form.js",
     "scripts": {
         "build": "grunt css && grunt compile && grunt transforms && echo 'enketo-core build complete'",
@@ -72,7 +62,7 @@
         "mergexml": "1.2.3",
         "node-forge": "^1.3.1",
         "openrosa-xpath-evaluator": "3.0.0",
-        "signature_pad": "^4.1.6"
+        "signature_pad": "2.3.x"
     },
     "engines": {
         "node": ">=18 <21",

packages/enketo-core/src/js/page.js

@@ -113,12 +113,12 @@ export default {
      */
     flipToPageContaining($e) {
         const e = $e[0];
-        const closest = e.closest('[role="page"]');
+        const closestPage = e.closest('[role="page"]');
 
-        if (closest) {
-            this._flipTo(closest);
-        } else {
-            // If $e is a comment question, and it is not inside a group, there will be no closest.
+        if (closestPage) {
+            this._flipTo(closestPage);
+        } else if (e.closest('.question')) {
+            // If $e is a comment question, and it is not inside a group, there will be no closestPage.
             const referer = e.querySelector('[data-for]');
             const ancestor = e.closest('.or-repeat, form.or');
             if (referer && ancestor) {