Fix report result filter determination #2366
Merged
Conversation
This file contains 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
Use camelCase for all variables.
Filter model objects are mutable. Therefore a copy must be created to not influence other tests.
The FilterProvider is used to load and determine a filter (mostly) for list pages. In saved the current used filter at a list page in the redux store under the gmp name e.g. task. This change allows to use a different name for the filter saved in the redux store.
The page filter is already passed via redux connect and should be used for loading the report with second highest priority.
When determining the filter for loading a report and its results we need to ensure that the user settings are considered but not to use the stored filter of the results list page. Therefore use a different page name in the FilterProvider to load the report results filter. The resulting filter is passed as defaultFilter to the load function.
Codecov Report
@@ Coverage Diff @@
## gsa-20.08 #2366 +/- ##
=============================================
+ Coverage 52.76% 52.93% +0.17%
=============================================
Files 1070 1070
Lines 25789 25833 +44
Branches 7312 7359 +47
=============================================
+ Hits 13607 13675 +68
+ Misses 11058 11039 -19
+ Partials 1124 1119 -5
Continue to review full report at Codecov.
|
saberlynx
approved these changes
Aug 6, 2020
bjoernricks
commented
Aug 6, 2020
Comment on lines
+718
to
+721
| if (!hasValue(filter)) { | ||
| // use filter from store | ||
| filter = pageFilter; | ||
| } |
There was a problem hiding this comment.
I am not 100 percent sure if these lines are really necessary because the page filter will be included in the defaultFilter by the FilterProvider already. Currently this overrides a possible ?filter=... url parameter (named locationQueryFilter in FilterProvider).
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.
Don't use the current stored filter of the results list page for loading results at the report details page.
Checklist: