Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#3725] Add invalid forms (configuration and logic rules) to the email digest #4198

Merged

Conversation

vaszig
Copy link
Contributor

@vaszig vaszig commented Apr 18, 2024

Fixes #3725 partially

@vaszig vaszig marked this pull request as draft April 18, 2024 10:50
@vaszig
Copy link
Contributor Author

vaszig commented Apr 18, 2024

This should wait for #4163 to be approved because it also touches some files from there.
This was merged.

Copy link

codecov bot commented Apr 18, 2024

Codecov Report

Attention: Patch coverage is 98.97959% with 1 line in your changes missing coverage. Please review.

Project coverage is 96.24%. Comparing base (4734c03) to head (8ef40fb).
Report is 741 commits behind head on master.

Files Patch % Lines
src/openforms/emails/digest.py 98.88% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4198      +/-   ##
==========================================
+ Coverage   96.14%   96.24%   +0.09%     
==========================================
  Files         731      731              
  Lines       23604    23683      +79     
  Branches     2773     2790      +17     
==========================================
+ Hits        22695    22793      +98     
+ Misses        643      622      -21     
- Partials      266      268       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vaszig vaszig force-pushed the feature/3725-add-invalid-forms-to-email-digest branch from 49781f7 to ec44fc2 Compare April 19, 2024 13:24
@vaszig vaszig marked this pull request as ready for review April 19, 2024 13:41
src/openforms/emails/digest.py Show resolved Hide resolved
src/openforms/emails/digest.py Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/tests/test_tasks.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/forms/utils.py Outdated Show resolved Hide resolved
@vaszig vaszig force-pushed the feature/3725-add-invalid-forms-to-email-digest branch from aac469a to aee06ea Compare April 24, 2024 14:30
src/openforms/emails/digest.py Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
Copy link
Member

@sergei-maertens sergei-maertens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this raises some questions too:

  • Should we block JSON logic like {"var": {"var": "a"}}? This seems awfully complex for the sort of things we'd like to support. Blocking it allows us to build a logic evaluation dependency tree.

src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/tests/test_tasks.py Outdated Show resolved Hide resolved
@vaszig vaszig force-pushed the feature/3725-add-invalid-forms-to-email-digest branch 5 times, most recently from 8968b9d to 1c807d2 Compare May 14, 2024 07:50
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/templates/emails/admin_digest.html Outdated Show resolved Hide resolved
src/openforms/utils/json_logic/datastructures.py Outdated Show resolved Hide resolved
src/openforms/logging/logevent.py Outdated Show resolved Hide resolved
Copy link
Member

@sergei-maertens sergei-maertens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there!

src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/digest.py Outdated Show resolved Hide resolved
src/openforms/emails/tests/test_digest_functions.py Outdated Show resolved Hide resolved
@vaszig vaszig force-pushed the feature/3725-add-invalid-forms-to-email-digest branch from 7b60e65 to 6274d01 Compare May 21, 2024 07:48
@vaszig vaszig force-pushed the feature/3725-add-invalid-forms-to-email-digest branch from 6274d01 to bfda2d5 Compare May 21, 2024 08:22
@vaszig vaszig force-pushed the feature/3725-add-invalid-forms-to-email-digest branch from bfda2d5 to 8ef40fb Compare May 21, 2024 08:34
Comment on lines +390 to +393
form_logics_vars += [
var
for var in introspect_json_logic(expression).get_input_keys()
]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(no need to fix this, just for the future)

the list comprehension isn't necessary, get_inputs_keys() already returns a list of input vars:

Suggested change
form_logics_vars += [
var
for var in introspect_json_logic(expression).get_input_keys()
]
form_logics_vars += introspect_json_logic(expression).get_input_keys()

@sergei-maertens sergei-maertens merged commit d2ba32a into master May 22, 2024
26 of 27 checks passed
@sergei-maertens sergei-maertens deleted the feature/3725-add-invalid-forms-to-email-digest branch May 22, 2024 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Detect more problems and add them to the email digest
3 participants