Merge gsa-20.08 into master #2426
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.
Revert 60ec7eb and PR greenbone#2358 because it doesn't fix the cause of the original problem.
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.
…filter-determination Fix report result filter determination
Improve error message for undefined report formats on report detailspage
Use the loaded results counts not the result counts from the report. The results are loaded independently of the report now and therefore the result counts from the report doesn't fit anymore.
greenbone#2335 tried to fix that but broke the report results pagination.
…-report-results Fix pagination for report results tab
[20.08] Updated references in docs / manpages.
Minor textual improvement to explain which feed should be synced.
Change the daemon name to lowercase in feedstatuspage.js test.
Both urls are not available yet but will be in future.
…ed when appropriate
Increase age for feed being too old
…ty_20.08 fix missing oval def subsections
Disable feed object editing using <predefined> and adjust feed status page filters
Add option for "Start task" on "new secinfo arrived" for alerts
Codecov Report
@@ Coverage Diff @@
## master #2426 +/- ##
==========================================
- Coverage 54.96% 54.95% -0.01%
==========================================
Files 1094 1094
Lines 26573 26573
Branches 7537 7538 +1
==========================================
- Hits 14605 14603 -2
Misses 10862 10862
- Partials 1106 1108 +2
Continue to review full report at Codecov.
|
bjoernricks
approved these changes
Aug 28, 2020
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.
What:
Why:
Merge 20.08 into master to prevent too much divergence between the two branches.
How:
Checklist: