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.

Sign up for GitHub

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

Jump to bottom

Fix rules engine sort resources function #2547

Merged
merged 4 commits into from
Jul 7, 2023
Merged

Fix rules engine sort resources function #2547

merged 4 commits into from
Jul 7, 2023

Conversation

ellykits
Copy link
Collaborator

@ellykits ellykits commented Jul 7, 2023 •
edited by pld
Loading

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #2542

Engineer Checklist

  • I have written Unit tests for any new feature(s) and edge cases for bug fixes
  • I have added any strings visible on UI components to the strings.xml file
  • I have updated the CHANGELOG.md file for any notable changes to the codebase
  • I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
  • I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
  • I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

  • I have verified Unit tests have been written for any new feature(s) and edge cases
  • I have verified any strings visible on UI components are in the strings.xml file
  • I have verifed the CHANGELOG.md file has any notable changes to the codebase
  • I have verified the solution has been implemented in a configurable and generic way for reuseable components
  • I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

ellykits added 3 commits July 7, 2023 16:39
@ellykits
Upgrade JEXL version to v3.2.1
8b165a1 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Fix sorting resources via rules engine
c650644 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@ellykits
Merge branch 'main' into fix-rules-engine-sort-resources-function
d230484
pld
pld previously approved these changes Jul 7, 2023
View reviewed changes
@ellykits
Exclude transitive dependency apache-commons-logging
c637f66 
Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
@codecov
Copy link

codecov bot commented Jul 7, 2023

Codecov Report

Merging #2547 (c637f66) into main (2ea8fa1) will increase coverage by 7.6%.
The diff coverage is 64.0%.

Impacted file tree graph

@@            Coverage Diff            @@
##              main   #2547     +/-   ##
=========================================
+ Coverage     64.8%   72.5%   +7.6%     
+ Complexity    1050     570    -480     
=========================================
  Files          209     111     -98     
  Lines         9156    3851   -5305     
  Branches      1805     741   -1064     
=========================================
- Hits          5942    2794   -3148     
+ Misses        2059     632   -1427     
+ Partials      1155     425    -730
Flag Coverage Δ
engine 73.1% <64.0%> (+<0.1%) ⬆️
geowidget 63.2% <ø> (ø)
quest ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...core/engine/configuration/view/ColumnProperties.kt 100.0% <ø> (ø)
...ore/engine/configuration/view/DividerProperties.kt 0.0% <0.0%> (ø)
...ngine/configuration/view/PersonalDataProperties.kt 0.0% <0.0%> (ø)
...hircore/engine/configuration/view/RowProperties.kt 0.0% <ø> (ø)
...ine/configuration/view/ViewPropertiesSerializer.kt 23.8% <0.0%> (-2.6%) ⬇️
...e/engine/ui/bottomsheet/RegisterBottomSheetView.kt 51.2% <0.0%> (-2.5%) ⬇️
...rtregister/fhircore/engine/sync/SyncBroadcaster.kt 33.3% <6.6%> (+13.3%) ⬆️
...rcore/engine/configuration/view/ImageProperties.kt 34.6% <34.6%> (ø)
...core/engine/configuration/view/ButtonProperties.kt 48.8% <50.0%> (-3.4%) ⬇️
...ter/fhircore/engine/sync/OpenSrpDownloadManager.kt 42.8% <50.0%> (-1.6%) ⬇️
... and 23 more

... and 100 files with indirect coverage changes

@ellykits ellykits merged commit 269bd84 into main Jul 7, 2023
@ellykits ellykits deleted the fix-rules-engine-sort-resources-function branch July 7, 2023 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dubdabasoduba dubdabasoduba dubdabasoduba approved these changes

@pld pld pld left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[OpenSRP 2] Update the sort config to be able to update the correct Due
3 participants
@ellykits @pld @dubdabasoduba