-
Notifications
You must be signed in to change notification settings - Fork 44
fix: [DHIS2-21727] program rules on enrollment+event registration page #4707
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
Open
superskip
wants to merge
10
commits into
master
Choose a base branch
from
DHIS2-21727
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
9d2ca30
fix: add missing `currentEvent` on initial rule engine run
superskip c18299f
feat: introducing `isFirstStageEventForm` and `evaluateAll`
superskip 6750a6a
fix: set `isFirstStageEventForm` on the appropriate app page
superskip 4c817b3
fix: linter errors
superskip a0feb24
test: update snapshots
superskip ac1d6e7
Merge branch 'master' into DHIS2-21727
superskip 5a9752d
style: add missing constructor parentheses
superskip e5f5ff5
Merge branch 'master' into DHIS2-21727
superskip 0a7e969
refactor: rename `isFirstStageEventForm` -> `isEnrollmentFormWithEvent`
superskip 9203827
Merge branch 'master' into DHIS2-21727
superskip File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
52 changes: 52 additions & 0 deletions
52
src/core_modules/capture-core/rules/RuleEngine/helpers/evaluateRules.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import { | ||
| RuleEngineJs, | ||
| RuleEnrollmentJs, | ||
| RuleEventJs, | ||
| RuleEngineContextJs, | ||
| } from '@dhis2/rule-engine'; | ||
|
|
||
| export const evaluateRules = ({ | ||
| ruleEngine, | ||
| enrollment, | ||
| currentEvent, | ||
| events, | ||
| executionContext, | ||
| isEnrollmentFormWithEvent, | ||
| }: { | ||
| ruleEngine: RuleEngineJs | ||
| enrollment: RuleEnrollmentJs | null, | ||
| currentEvent: RuleEventJs | null | undefined, | ||
| events: Array<RuleEventJs>, | ||
| executionContext: RuleEngineContextJs, | ||
| isEnrollmentFormWithEvent: boolean | undefined, | ||
| }) => { | ||
| if (!currentEvent) { | ||
| return ruleEngine.evaluateEnrollment( | ||
| enrollment!, | ||
| events, | ||
| executionContext, | ||
| ); | ||
| } | ||
| if (!isEnrollmentFormWithEvent) { | ||
| return ruleEngine.evaluateEvent( | ||
| currentEvent, | ||
| enrollment, | ||
| events, | ||
| executionContext, | ||
| ); | ||
| } | ||
| const duplicateActionIds = new Set<string>(); | ||
| return ruleEngine.evaluateAll(enrollment, [currentEvent], executionContext) | ||
| .flatMap(entry => entry.ruleEffects) | ||
| .filter((effect) => { | ||
| const actionId = effect.ruleAction.values.get('id'); | ||
| if (!actionId) { | ||
| return true; | ||
| } | ||
| if (duplicateActionIds.has(actionId)) { | ||
| return false; | ||
| } | ||
| duplicateActionIds.add(actionId); | ||
| return true; | ||
| }); | ||
| }; |
1 change: 1 addition & 0 deletions
1
src/core_modules/capture-core/rules/RuleEngine/helpers/index.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export { InputBuilder } from './InputBuilder'; | ||
| export { ValueProcessor } from './ValueProcessor'; | ||
| export { evaluateRules } from './evaluateRules'; | ||
| export { getRulesEffectsProcessor } from './rulesEffectsProcessor'; |
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not ideal, but since the alternative would require a big refactor, I agree with using this
fabricateFirstStageEventworkaround to serve as a dummy event during the form initialization run.