Conversation
Old XForms published before PR #2961 store trigger data as strings (e.g., "${assessor}") in their JSON field. PyXForm 4.1.0 expects triggers as tuples, causing PyXFormError when processing submissions. This fix extends _get_survey() to: - Catch trigger-related PyXFormErrors - Fall back to regenerating from XLS file - Persist the workbook_json to avoid repeated XLS parsing Fixes #2992
Branch names containing `/` (e.g., `fix/issue-2992`) cause Docker build failures because `/` is invalid in Docker image tags. Changes: - Add docker/metadata-action@v5 to sanitize tags automatically - Update docker/build-push-action to v6 (latest) - Update other actions to latest versions in docker-image-build.yml - Remove redundant manual branch/version extraction steps Fixes the Trivy security check failure on branches with `/` in the name.
CodeQL Action v3 will be deprecated in December 2026. v4 runs on Node.js 24 runtime. Ref: https://github.blog/changelog/2025-10-28-upcoming-deprecation-of-codeql-action-v3/
kelvin-muchiri
approved these changes
Jan 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes / Features implemented
Extended
_get_survey()inonadata/apps/logger/models/xform.pyto handle backward compatibility for XForms published before PR #2961. Old forms store trigger data as strings (e.g.,"${assessor}") but pyxform 4.1.0 expects tuples (e.g.,("assessor",)).The fix:
PyXFormErrorexceptions in_get_survey()get_survey_and_json_from_xlsform()workbook_jsonto the database to avoid repeated XLS parsing on subsequent requestsSteps taken to verify this change does what is intended
test_get_survey_fallback_on_trigger_errorthat:workbook_jsonxform.jsontosurvey.to_json_dict()SurveyElementBuilderto raise trigger error on first callworkbook_jsonSide effects of implementing this change
workbook_jsonformat on first accessget_survey_and_json_from_xlsform()pattern already used elsewhere in the codebaseBefore submitting this PR for review, please make sure you have:
Closes #2992