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.

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

Entities loading #836

Merged
merged 71 commits into from
Jul 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
a369ab3
Adjust imports at cves list page
bjoernricks Jul 26, 2018
b9be65e
Extract EntitiesPage props from withEntitiesContainer HOC
bjoernricks Jul 26, 2018
08d0c69
Load cves from the redux store at cves list page
bjoernricks Jul 26, 2018
8f19390
Adjust imports at dfncerts list page
bjoernricks Jul 26, 2018
7db59c1
Extract EntitesPage props from withEntitiesContainer HOC
bjoernricks Jul 26, 2018
6d1dfe0
Use the redux store to load dfncert entities
bjoernricks Jul 26, 2018
1b0d7eb
Adjust imports for groups list page
bjoernricks Jul 26, 2018
2b4c558
Use withCapabilities HOC for group list page ToolBarIcons
bjoernricks Jul 26, 2018
4272eee
Load groups from redux store at groups list page
bjoernricks Jul 26, 2018
36fc121
Adjust imports at host list page
bjoernricks Jul 26, 2018
c69be6a
Use redux store to load host entities at its list page
bjoernricks Jul 26, 2018
74a720e
Adjust imports at notes list page
bjoernricks Jul 26, 2018
3b94362
Use withCapabilities for notes ToolBarIcons
bjoernricks Jul 26, 2018
3865274
Always load details of the notes
bjoernricks Jul 26, 2018
615735b
Move EntitiesPage params to the EntitiesPage at notes list page
bjoernricks Jul 26, 2018
8237e0a
Load notes from the redux store at notes list page
bjoernricks Jul 26, 2018
e467f09
Adjust import at nvts list page
bjoernricks Jul 26, 2018
826d91f
Don't pass EntitiesPage props through withEntitiesContainer HOC
bjoernricks Jul 26, 2018
1478b38
Fix reducer prop for nvt entities
bjoernricks Jul 26, 2018
314dbd1
Load nvts from the redux store
bjoernricks Jul 26, 2018
63dc87c
Adjust imports at os list page
bjoernricks Jul 26, 2018
70c325f
Rename os => operatingsystem
bjoernricks Jul 26, 2018
79bf358
Use redux store to load operatingsystem entities
bjoernricks Jul 26, 2018
f9ed8b2
Pass filterFilter prop to EntitiesPage directly
bjoernricks Jul 26, 2018
3a8aec6
Remove unnecessary params from Layout
bjoernricks Jul 26, 2018
c5cedb9
Rename web/pages/os into web/pages/operatingsystems
bjoernricks Jul 26, 2018
25abc60
Adjust imports for ovaldefs list page
bjoernricks Jul 26, 2018
12e2415
Pass props directly to EntitiesPage at ovaldefs list page
bjoernricks Jul 26, 2018
acd4638
Load entities from redux store for ovaldefs list page
bjoernricks Jul 26, 2018
246a813
Adjust imports at overrides list page
bjoernricks Jul 26, 2018
99b074f
Always load details for overrides
bjoernricks Jul 26, 2018
2309b06
Don't pass EntitiesPages props through withEntitiesContainer HOC
bjoernricks Jul 26, 2018
b8ade25
Use withCapabilities for override list page ToolBarIcons
bjoernricks Jul 26, 2018
b1cbdfb
Adjust imports at permissions list page
bjoernricks Jul 26, 2018
b816ef5
Load entities from redux store for permissions list page
bjoernricks Jul 26, 2018
6df69f8
Load overrides into redux store
bjoernricks Jul 26, 2018
e07cb14
Load entities from redux store at overrides list page
bjoernricks Jul 26, 2018
6b97a33
Adjust imports at results list page
bjoernricks Jul 26, 2018
16fa16b
Don't pass EntitiesPage props through withEntitisContainer HOC
bjoernricks Jul 26, 2018
76344b1
Load entities from redux store for results list page
bjoernricks Jul 26, 2018
8ba39b2
Adjust imports at roles list page
bjoernricks Jul 26, 2018
238b5c2
Pass filterFilter prop to EntitiesPage directly
bjoernricks Jul 26, 2018
036142e
Use withCapabilities HOC for roles list page ToolBarIcons
bjoernricks Jul 26, 2018
5ae7f63
Load entities from redux store for roles list page
bjoernricks Jul 26, 2018
b2d7426
Adjust imports at secinfo list page
bjoernricks Jul 27, 2018
088b183
Don't pass EntitiesPage prop through withEntitiesContainer
bjoernricks Jul 27, 2018
40bfe31
Use redux store to load secinfo entities
bjoernricks Jul 27, 2018
1396017
Adjust imports at tags list page
bjoernricks Jul 27, 2018
4a5f11f
Load entities from redux store at tags list page
bjoernricks Jul 27, 2018
41fec98
Adjust imports at users list page
bjoernricks Jul 27, 2018
8066940
Adjust formatting for users list ToolBarIcons
bjoernricks Jul 27, 2018
f00a8fa
Pass filtersFilter prop to EntitiesPage directly
bjoernricks Jul 27, 2018
b75b573
Use redux store to load entities at users list
bjoernricks Jul 27, 2018
3953fae
Get rid of wrapper element
bjoernricks Jul 27, 2018
3d68a0c
Remove obsolete visible prop from user ConfirmDeleteDialog
bjoernricks Jul 27, 2018
a86f112
Update ConfirmDeleteDialog to current SaveDialog api
bjoernricks Jul 27, 2018
02d9f12
Simplify user ConfirmDeleteDialog
bjoernricks Jul 27, 2018
4d3d752
Use redux store to load all users
bjoernricks Jul 27, 2018
e85234c
Change User delete method to camelCase api
bjoernricks Jul 27, 2018
c1bfd69
Adjust users list page to User delete api change
bjoernricks Jul 27, 2018
975cdac
Adjust imports for vulns list page
bjoernricks Jul 27, 2018
0aade5d
Extract EntitiesPage props from withEntitiesContainer HOC
bjoernricks Jul 27, 2018
24f311c
Load entities from redux store for vulns list page
bjoernricks Jul 27, 2018
b384260
Adjust imports at reports list page
bjoernricks Jul 27, 2018
0cf6e69
Replace Wrapper with React Fragment
bjoernricks Jul 27, 2018
bb96fd1
Use withGmp for reports list page
bjoernricks Jul 27, 2018
726ac5f
Pass props to EntiitesPage directly
bjoernricks Jul 27, 2018
00607e8
Remove visible props from report dialogs
bjoernricks Jul 27, 2018
43e4951
Load entities from redux store for report list page
bjoernricks Jul 27, 2018
26a95b7
Get rid of the old withEntitiesContainer HOC
bjoernricks Jul 27, 2018
2627eff
Remove old version of EntitiesContainer component
bjoernricks Jul 27, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions gsa/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ set (GSA_JS_SRC_FILES
${GSA_SRC_DIR}/src/web/components/table/table.js
${GSA_SRC_DIR}/src/web/entities/actions.js
${GSA_SRC_DIR}/src/web/entities/container.js
${GSA_SRC_DIR}/src/web/entities/container2.js
${GSA_SRC_DIR}/src/web/entities/entitynametabledata.js
${GSA_SRC_DIR}/src/web/entities/footer.js
${GSA_SRC_DIR}/src/web/entities/header.js
Expand All @@ -350,7 +349,6 @@ set (GSA_JS_SRC_FILES
${GSA_SRC_DIR}/src/web/entities/table.js
${GSA_SRC_DIR}/src/web/entities/tagsdialog.js
${GSA_SRC_DIR}/src/web/entities/withEntitiesContainer.js
${GSA_SRC_DIR}/src/web/entities/withEntitiesContainer2.js
${GSA_SRC_DIR}/src/web/entities/withRowDetails.js
${GSA_SRC_DIR}/src/web/entity/block.js
${GSA_SRC_DIR}/src/web/entity/box.js
Expand Down Expand Up @@ -528,17 +526,17 @@ set (GSA_JS_SRC_FILES
${GSA_SRC_DIR}/src/web/pages/nvts/dashboard/severityclassdisplay.js
${GSA_SRC_DIR}/src/web/pages/nvts/dashboard/qoddisplay.js
${GSA_SRC_DIR}/src/web/pages/nvts/dashboard/qodtypedisplay.js
${GSA_SRC_DIR}/src/web/pages/os/component.js
${GSA_SRC_DIR}/src/web/pages/os/detailspage.js
${GSA_SRC_DIR}/src/web/pages/os/filterdialog.js
${GSA_SRC_DIR}/src/web/pages/os/listpage.js
${GSA_SRC_DIR}/src/web/pages/os/row.js
${GSA_SRC_DIR}/src/web/pages/os/table.js
${GSA_SRC_DIR}/src/web/pages/os/dashboard/cvssdisplay.js
${GSA_SRC_DIR}/src/web/pages/os/dashboard/index.js
${GSA_SRC_DIR}/src/web/pages/os/dashboard/loaders.js
${GSA_SRC_DIR}/src/web/pages/os/dashboard/severityclassdisplay.js
${GSA_SRC_DIR}/src/web/pages/os/dashboard/vulnscoredisplay.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/component.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/detailspage.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/filterdialog.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/listpage.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/row.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/table.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/dashboard/cvssdisplay.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/dashboard/index.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/dashboard/loaders.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/dashboard/severityclassdisplay.js
${GSA_SRC_DIR}/src/web/pages/operatingsystems/dashboard/vulnscoredisplay.js
${GSA_SRC_DIR}/src/web/pages/ovaldefs/details.js
${GSA_SRC_DIR}/src/web/pages/ovaldefs/detailspage.js
${GSA_SRC_DIR}/src/web/pages/ovaldefs/filterdialog.js
Expand Down Expand Up @@ -785,8 +783,9 @@ set (GSA_JS_SRC_FILES
${GSA_SRC_DIR}/src/web/store/entities/hosts.js
${GSA_SRC_DIR}/src/web/store/entities/notes.js
${GSA_SRC_DIR}/src/web/store/entities/nvts.js
${GSA_SRC_DIR}/src/web/store/entities/os.js
${GSA_SRC_DIR}/src/web/store/entities/operatingsystems.js
${GSA_SRC_DIR}/src/web/store/entities/ovaldefs.js
${GSA_SRC_DIR}/src/web/store/entities/overrides.js
${GSA_SRC_DIR}/src/web/store/entities/permissions.js
${GSA_SRC_DIR}/src/web/store/entities/portlists.js
${GSA_SRC_DIR}/src/web/store/entities/reducers.js
Expand Down
1 change: 1 addition & 0 deletions gsa/src/gmp/commands/notes.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ class NotesCommand extends EntitiesCommand {

constructor(http) {
super(http, 'note', Note);
this.setParam('details', 1);
}

getEntitiesResponse(root) {
Expand Down
1 change: 1 addition & 0 deletions gsa/src/gmp/commands/overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ class OverridesCommand extends EntitiesCommand {

constructor(http) {
super(http, 'override', Override);
this.setParam('details', 1);
}

getEntitiesResponse(root) {
Expand Down
5 changes: 2 additions & 3 deletions gsa/src/gmp/commands/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,11 @@ class UserCommand extends EntityCommand {
return this.action(data);
}

delete({id, inheritor_id}) {
delete({id, inheritorId}) {
const data = {
cmd: 'delete_user',
id,
inheritor_id,
no_redirect: '1',
inheritor_id: inheritorId,
};
log.debug('Deleting user', data);
return this.httpPost(data);
Expand Down
Loading