Scan config dialog improvements #1624
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
bjoernricks
requested review from
swaterkamp and
timopollmeier
as code owners
swaterkamp
reviewed
Sep 13, 2019
Use camelCase name
Use new constants and parser function from ScanConfig model for the EditDialog.
* Put the calculation of the nvt family trends and selection into an own function. This will allow to move the calculation code in future. * Also fix the selection by using family maxNvtCount instead of max * Use new scanconfig constants instead of yes/no
Only pass required data from loading to the dialog to saving.
Update editing and saving default timeouts and use camel case for all nvt preferences related variables.
Version got dropped from nvts. Instead last modified is displayed now.
A user should look at the details page if he is interested in the overrides or notes. Dropping them from the dialog will simplify our requests in future.
Since we only need the nvt from this command just return the nvt model in the response data now.
Use shape to specify the expected object shape for the preference.
It is often very difficult to gather which objects in which shape must be passed to a dialog component. Therefore it is better to pass used properties as a prop to the dialogs directly.
Update edit scan config nvt dialog to pass all displayed values as props to the dialog.
Internally they are mapped to the same gsad function.
Adjust policy and scanconfig components accordingly.
Don't request overrides and notes because they aren't used anymore.
Use Object.entries in conjunction with for...of loop.
Use hooks to automatically derive the preferences values object from the preferences list.
Use a more descriptive component name.
This commit was only a leftover. The config isn't required anymore in the EditScanConfigDialog.
The prop isn't used anymore.
swaterkamp
reviewed
Sep 13, 2019
Adjust the policy component to use similar code as the scan config for editing.
The create policy dialog doesn't expect a base and scanner_id prop anymore.
Avoid proptype warning in policy details page tests.
swaterkamp
reviewed
Sep 13, 2019
| @@ -143,15 +143,15 @@ const ScannerPreferences = ({ | |||
| </Section> | |||
| ); | |||
|
|
|||
| export const ScannerPreferencePropType = PropTypes.shape({ | |||
There was a problem hiding this comment.
Same as with NvtPreferencePropType
Co-Authored-By: Steffen Waterkamp <[email protected]>
|
All in all this looks good to me. Just the failing tests need to be fixed. I don't know, if our CI can't handle .finally() or what else is wrong with it. As .then() is a working function, the failing code is not due to .get() being no Promise or so... |
It seems nodejs 8 doesn't support Promise.finally by default.
Set exact datetime fot the test.
Codecov Report
@@ Coverage Diff @@
## master #1624 +/- ##
==========================================
+ Coverage 42% 42.33% +0.33%
==========================================
Files 1044 1047 +3
Lines 23955 23988 +33
Branches 6635 6686 +51
==========================================
+ Hits 10062 10156 +94
+ Misses 12647 12593 -54
+ Partials 1246 1239 -7
Continue to review full report at Codecov.
|
swaterkamp
approved these changes
Sep 16, 2019
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.
Checklist: